From 0e8b6dfdf4642ea53769f0e2631665b3a11f57ba Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 25 Feb 2015 16:03:03 -0800 Subject: [PATCH 001/251] Support for 'export default' with expressions --- src/compiler/checker.ts | 32 ++++++++----------- src/compiler/emitter.ts | 14 ++++---- src/compiler/parser.ts | 23 +++++++++---- src/compiler/types.ts | 3 +- src/services/breakpoints.ts | 2 +- .../externalModules/exportAssignDottedName.ts | 2 +- .../exportAssignNonIdentifier.ts | 14 ++++---- 7 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5c371e7a344..bc1a7882361 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -693,9 +693,14 @@ module ts { // The two types of exports are mutually exclusive. error(node, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); } - if (node.exportName.text) { - var meaning = SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace; - var exportSymbol = resolveName(node, node.exportName.text, meaning, Diagnostics.Cannot_find_name_0, node.exportName); + if (node.expression.kind === SyntaxKind.Identifier && (node.expression).text) { + var exportSymbol = resolveName(node, (node.expression).text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, + Diagnostics.Cannot_find_name_0, node.expression); + } + else { + var exportSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "*default*"); + exportSymbol.parent = containerSymbol; + (exportSymbol).type = checkExpression(node.expression); } symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; } @@ -9537,19 +9542,6 @@ module ts { if (!isInAmbientContext(node) && node.name.kind === SyntaxKind.StringLiteral) { grammarErrorOnNode(node.name, Diagnostics.Only_ambient_modules_can_use_quoted_names); } - else if (node.name.kind === SyntaxKind.Identifier && node.body.kind === SyntaxKind.ModuleBlock) { - var statements = (node.body).statements; - for (var i = 0, n = statements.length; i < n; i++) { - var statement = statements[i]; - - // TODO: AndersH: No reason to do a separate pass over the statements for this check, we should - // just fold it into checkExportAssignment. - if (statement.kind === SyntaxKind.ExportAssignment) { - // Export assignments are not allowed in an internal module - grammarErrorOnNode(statement, Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); - } - } - } } checkCollisionWithCapturedThisVariable(node, node.name); @@ -9704,11 +9696,14 @@ module ts { } function checkExportAssignment(node: ExportAssignment) { + if (node.parent.kind === SyntaxKind.ModuleBlock && (node.parent.parent).name.kind === SyntaxKind.Identifier) { + error(node, Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); + return; + } // Grammar checking if (!checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) { grammarErrorOnFirstToken(node, Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; if (container.kind !== SyntaxKind.SourceFile) { // In a module, the immediate parent will be a block, so climb up one more parent @@ -9906,6 +9901,7 @@ module ts { case SyntaxKind.ClassDeclaration: case SyntaxKind.EnumDeclaration: case SyntaxKind.EnumMember: + case SyntaxKind.ExportAssignment: case SyntaxKind.SourceFile: forEachChild(node, checkFunctionExpressionBodies); break; @@ -10165,7 +10161,7 @@ module ts { } if (nodeOnRightSide.parent.kind === SyntaxKind.ExportAssignment) { - return (nodeOnRightSide.parent).exportName === nodeOnRightSide && nodeOnRightSide.parent; + return (nodeOnRightSide.parent).expression === nodeOnRightSide && nodeOnRightSide.parent; } return undefined; diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 3247b5ff1d1..5d90b2245e5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -700,8 +700,8 @@ module ts { } function emitExportAssignment(node: ExportAssignment) { - write("export = "); - writeTextOfNode(currentSourceFile, node.exportName); + write(node.isExportEquals ? "export = " : "export default "); + writeTextOfNode(currentSourceFile, node.expression); write(";"); writeLine(); } @@ -4759,15 +4759,14 @@ module ts { emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(/*newLine*/ true); + // TODO: Handle export default expressions var exportName = resolver.getExportAssignmentName(node); if (exportName) { writeLine(); var exportAssignment = getFirstExportAssignment(node); emitStart(exportAssignment); write("return "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emit(exportAssignment.expression); write(";"); emitEnd(exportAssignment); } @@ -4780,15 +4779,14 @@ module ts { emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(/*newLine*/ true); + // TODO: Handle export default expressions var exportName = resolver.getExportAssignmentName(node); if (exportName) { writeLine(); var exportAssignment = getFirstExportAssignment(node); emitStart(exportAssignment); write("module.exports = "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emit(exportAssignment.expression); write(";"); emitEnd(exportAssignment); } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 9dc8a475527..abccfb96ffa 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -278,7 +278,7 @@ module ts { visitNode(cbNode, (node).name); case SyntaxKind.ExportAssignment: return visitNodes(cbNodes, node.modifiers) || - visitNode(cbNode, (node).exportName); + visitNode(cbNode, (node).expression); case SyntaxKind.TemplateExpression: return visitNode(cbNode, (node).head) || visitNodes(cbNodes, (node).templateSpans); case SyntaxKind.TemplateSpan: @@ -1500,6 +1500,10 @@ module ts { } if (token === SyntaxKind.ExportKeyword) { nextToken(); + if (token === SyntaxKind.DefaultKeyword) { + nextToken(); + return token === SyntaxKind.ClassKeyword || token === SyntaxKind.FunctionKeyword; + } return token !== SyntaxKind.AsteriskToken && token !== SyntaxKind.OpenBraceToken && canFollowModifier(); } nextToken(); @@ -4828,10 +4832,17 @@ module ts { return finishNode(node); } - function parseExportAssignmentTail(fullStart: number, modifiers: ModifiersArray): ExportAssignment { + function parseExportAssignment(fullStart: number, modifiers: ModifiersArray): ExportAssignment { var node = createNode(SyntaxKind.ExportAssignment, fullStart); setModifiers(node, modifiers); - node.exportName = parseIdentifier(); + if (parseOptional(SyntaxKind.EqualsToken)) { + node.isExportEquals = true; + } + else { + parseExpected(SyntaxKind.DefaultKeyword); + } + //node.exportName = parseIdentifier(); + node.expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); return finishNode(node); } @@ -4898,7 +4909,7 @@ module ts { function nextTokenCanFollowExportKeyword() { nextToken(); return token === SyntaxKind.EqualsToken || token === SyntaxKind.AsteriskToken || - token === SyntaxKind.OpenBraceToken || isDeclarationStart(); + token === SyntaxKind.OpenBraceToken || token === SyntaxKind.DefaultKeyword || isDeclarationStart(); } function nextTokenIsDeclarationStart() { @@ -4915,8 +4926,8 @@ module ts { var modifiers = parseModifiers(); if (token === SyntaxKind.ExportKeyword) { nextToken(); - if (parseOptional(SyntaxKind.EqualsToken)) { - return parseExportAssignmentTail(fullStart, modifiers); + if (token === SyntaxKind.DefaultKeyword || token === SyntaxKind.EqualsToken) { + return parseExportAssignment(fullStart, modifiers); } if (token === SyntaxKind.AsteriskToken || token === SyntaxKind.OpenBraceToken) { return parseExportDeclaration(fullStart, modifiers); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5e5993fe4a2..bf022786f81 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -933,7 +933,8 @@ module ts { export type ExportSpecifier = ImportOrExportSpecifier; export interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + isExportEquals?: boolean; + expression: Expression; } export interface FileReference extends TextRange { diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index a4943705e72..e3dd15a8f88 100644 --- a/src/services/breakpoints.ts +++ b/src/services/breakpoints.ts @@ -174,7 +174,7 @@ module ts.BreakpointResolver { case SyntaxKind.ExportAssignment: // span on export = id - return textSpan(node, (node).exportName); + return textSpan(node, (node).expression); case SyntaxKind.ImportEqualsDeclaration: // import statement without including semicolon diff --git a/tests/cases/conformance/externalModules/exportAssignDottedName.ts b/tests/cases/conformance/externalModules/exportAssignDottedName.ts index 8499681a9a8..2d0783a6361 100644 --- a/tests/cases/conformance/externalModules/exportAssignDottedName.ts +++ b/tests/cases/conformance/externalModules/exportAssignDottedName.ts @@ -5,4 +5,4 @@ export function x(){ // @Filename: foo2.ts import foo1 = require('./foo1'); -export = foo1.x; // Error, export assignment must be identifier only +export = foo1.x; // Ok diff --git a/tests/cases/conformance/externalModules/exportAssignNonIdentifier.ts b/tests/cases/conformance/externalModules/exportAssignNonIdentifier.ts index 882fd16252f..c624cee8405 100644 --- a/tests/cases/conformance/externalModules/exportAssignNonIdentifier.ts +++ b/tests/cases/conformance/externalModules/exportAssignNonIdentifier.ts @@ -1,25 +1,25 @@ // @Filename: foo1.ts var x = 10; -export = typeof x; // Error +export = typeof x; // Ok // @Filename: foo2.ts -export = "sausages"; // Error +export = "sausages"; // Ok // @Filename: foo3.ts -export = class Foo3 {}; // Error +export = class Foo3 {}; // Error, not an expression // @Filename: foo4.ts -export = true; // Error +export = true; // Ok // @Filename: foo5.ts export = undefined; // Valid. undefined is an identifier in JavaScript/TypeScript // @Filename: foo6.ts -export = void; // Error +export = void; // Error, void operator requires an argument // @Filename: foo7.ts -export = Date || String; // Error +export = Date || String; // Ok // @Filename: foo8.ts -export = null; // Error +export = null; // Ok From 84760c298fc1153eb91b223ddb829b1e4a0c857e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 25 Feb 2015 16:03:51 -0800 Subject: [PATCH 002/251] Accepting new baselines --- .../baselines/reference/APISample_compile.js | 3 +- .../reference/APISample_compile.types | 9 ++-- tests/baselines/reference/APISample_linter.js | 3 +- .../reference/APISample_linter.types | 9 ++-- .../reference/APISample_transform.js | 3 +- .../reference/APISample_transform.types | 9 ++-- .../baselines/reference/APISample_watcher.js | 3 +- .../reference/APISample_watcher.types | 9 ++-- .../exportAssignDottedName.errors.txt | 10 +--- .../reference/exportAssignDottedName.js | 5 +- .../exportAssignNonIdentifier.errors.txt | 50 ++++++------------- .../reference/exportAssignNonIdentifier.js | 30 +++++------ ...ortAssignmentWithoutIdentifier1.errors.txt | 14 ------ .../exportAssignmentWithoutIdentifier1.js | 2 +- .../exportAssignmentWithoutIdentifier1.types | 21 ++++++++ .../parserExportAssignment3.errors.txt | 4 +- .../reference/parserExportAssignment3.js | 1 + .../parserExportAssignment4.errors.txt | 4 +- .../reference/parserExportAssignment4.js | 1 + .../parserExportAssignment5.errors.txt | 5 +- ...InInvalidContextsExternalModule.errors.txt | 9 ++-- .../thisInInvalidContextsExternalModule.js | 2 +- 22 files changed, 100 insertions(+), 106 deletions(-) delete mode 100644 tests/baselines/reference/exportAssignmentWithoutIdentifier1.errors.txt create mode 100644 tests/baselines/reference/exportAssignmentWithoutIdentifier1.types diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index f906533da0a..130283d7e6d 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -756,7 +756,8 @@ declare module "typescript" { type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 970562a7b65..43dbf041de7 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -2304,9 +2304,12 @@ declare module "typescript" { >Statement : Statement >ModuleElement : ModuleElement - exportName: Identifier; ->exportName : Identifier ->Identifier : Identifier + isExportEquals?: boolean; +>isExportEquals : boolean + + expression: Expression; +>expression : Expression +>Expression : Expression } interface FileReference extends TextRange { >FileReference : FileReference diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index d4708039de0..2271902eb5c 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -787,7 +787,8 @@ declare module "typescript" { type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 6f5c1f3e91b..3693938dba7 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -2450,9 +2450,12 @@ declare module "typescript" { >Statement : Statement >ModuleElement : ModuleElement - exportName: Identifier; ->exportName : Identifier ->Identifier : Identifier + isExportEquals?: boolean; +>isExportEquals : boolean + + expression: Expression; +>expression : Expression +>Expression : Expression } interface FileReference extends TextRange { >FileReference : FileReference diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index d63d954288d..f976b1ac822 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -788,7 +788,8 @@ declare module "typescript" { type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 7ffc3a11f1f..e291f074937 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -2400,9 +2400,12 @@ declare module "typescript" { >Statement : Statement >ModuleElement : ModuleElement - exportName: Identifier; ->exportName : Identifier ->Identifier : Identifier + isExportEquals?: boolean; +>isExportEquals : boolean + + expression: Expression; +>expression : Expression +>Expression : Expression } interface FileReference extends TextRange { >FileReference : FileReference diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 4cd76682393..4b93c8554ec 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -825,7 +825,8 @@ declare module "typescript" { type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 52385d9f70a..af90a31bebb 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -2573,9 +2573,12 @@ declare module "typescript" { >Statement : Statement >ModuleElement : ModuleElement - exportName: Identifier; ->exportName : Identifier ->Identifier : Identifier + isExportEquals?: boolean; +>isExportEquals : boolean + + expression: Expression; +>expression : Expression +>Expression : Expression } interface FileReference extends TextRange { >FileReference : FileReference diff --git a/tests/baselines/reference/exportAssignDottedName.errors.txt b/tests/baselines/reference/exportAssignDottedName.errors.txt index 264e32c9cad..a540a07f3a7 100644 --- a/tests/baselines/reference/exportAssignDottedName.errors.txt +++ b/tests/baselines/reference/exportAssignDottedName.errors.txt @@ -1,15 +1,9 @@ tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/externalModules/foo2.ts(2,14): error TS1005: ';' expected. -tests/cases/conformance/externalModules/foo2.ts(2,15): error TS2304: Cannot find name 'x'. -==== tests/cases/conformance/externalModules/foo2.ts (2 errors) ==== +==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== import foo1 = require('./foo1'); - export = foo1.x; // Error, export assignment must be identifier only - ~ -!!! error TS1005: ';' expected. - ~ -!!! error TS2304: Cannot find name 'x'. + export = foo1.x; // Ok ==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== export function x(){ diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js index 48b06273c17..5784f9116f1 100644 --- a/tests/baselines/reference/exportAssignDottedName.js +++ b/tests/baselines/reference/exportAssignDottedName.js @@ -7,7 +7,7 @@ export function x(){ //// [foo2.ts] import foo1 = require('./foo1'); -export = foo1.x; // Error, export assignment must be identifier only +export = foo1.x; // Ok //// [foo1.js] @@ -17,5 +17,4 @@ function x() { exports.x = x; //// [foo2.js] var foo1 = require('./foo1'); -x; // Error, export assignment must be identifier only -module.exports = foo1; +module.exports = foo1.x; diff --git a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt index 31ca1be2011..9c9f1aa6874 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt +++ b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt @@ -1,55 +1,37 @@ tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/externalModules/foo1.ts(2,10): error TS1003: Identifier expected. -tests/cases/conformance/externalModules/foo2.ts(1,10): error TS1003: Identifier expected. -tests/cases/conformance/externalModules/foo3.ts(1,10): error TS1003: Identifier expected. -tests/cases/conformance/externalModules/foo4.ts(1,10): error TS1003: Identifier expected. -tests/cases/conformance/externalModules/foo6.ts(1,10): error TS1003: Identifier expected. +tests/cases/conformance/externalModules/foo3.ts(1,10): error TS1109: Expression expected. tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression expected. -tests/cases/conformance/externalModules/foo7.ts(1,15): error TS1005: ';' expected. -tests/cases/conformance/externalModules/foo8.ts(1,10): error TS1003: Identifier expected. -==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ==== +==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== var x = 10; - export = typeof x; // Error - ~~~~~~~~ + export = typeof x; // Ok + ~~~~~~~~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. - ~~~~~~ -!!! error TS1003: Identifier expected. -==== tests/cases/conformance/externalModules/foo2.ts (1 errors) ==== - export = "sausages"; // Error - ~~~~~~~~~~ -!!! error TS1003: Identifier expected. +==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== + export = "sausages"; // Ok ==== tests/cases/conformance/externalModules/foo3.ts (1 errors) ==== - export = class Foo3 {}; // Error + export = class Foo3 {}; // Error, not an expression ~~~~~ -!!! error TS1003: Identifier expected. +!!! error TS1109: Expression expected. -==== tests/cases/conformance/externalModules/foo4.ts (1 errors) ==== - export = true; // Error - ~~~~ -!!! error TS1003: Identifier expected. +==== tests/cases/conformance/externalModules/foo4.ts (0 errors) ==== + export = true; // Ok ==== tests/cases/conformance/externalModules/foo5.ts (0 errors) ==== export = undefined; // Valid. undefined is an identifier in JavaScript/TypeScript -==== tests/cases/conformance/externalModules/foo6.ts (2 errors) ==== - export = void; // Error - ~~~~ -!!! error TS1003: Identifier expected. +==== tests/cases/conformance/externalModules/foo6.ts (1 errors) ==== + export = void; // Error, void operator requires an argument ~ !!! error TS1109: Expression expected. -==== tests/cases/conformance/externalModules/foo7.ts (1 errors) ==== - export = Date || String; // Error - ~~ -!!! error TS1005: ';' expected. +==== tests/cases/conformance/externalModules/foo7.ts (0 errors) ==== + export = Date || String; // Ok -==== tests/cases/conformance/externalModules/foo8.ts (1 errors) ==== - export = null; // Error - ~~~~ -!!! error TS1003: Identifier expected. +==== tests/cases/conformance/externalModules/foo8.ts (0 errors) ==== + export = null; // Ok \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js index aaefca034cb..a22caca3689 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.js +++ b/tests/baselines/reference/exportAssignNonIdentifier.js @@ -2,51 +2,51 @@ //// [foo1.ts] var x = 10; -export = typeof x; // Error +export = typeof x; // Ok //// [foo2.ts] -export = "sausages"; // Error +export = "sausages"; // Ok //// [foo3.ts] -export = class Foo3 {}; // Error +export = class Foo3 {}; // Error, not an expression //// [foo4.ts] -export = true; // Error +export = true; // Ok //// [foo5.ts] export = undefined; // Valid. undefined is an identifier in JavaScript/TypeScript //// [foo6.ts] -export = void; // Error +export = void; // Error, void operator requires an argument //// [foo7.ts] -export = Date || String; // Error +export = Date || String; // Ok //// [foo8.ts] -export = null; // Error +export = null; // Ok //// [foo1.js] var x = 10; -typeof x; // Error +module.exports = typeof x; //// [foo2.js] -"sausages"; // Error +module.exports = "sausages"; //// [foo3.js] var Foo3 = (function () { function Foo3() { } return Foo3; })(); -; // Error +; // Error, not an expression +module.exports = ; //// [foo4.js] -true; // Error +module.exports = true; //// [foo5.js] module.exports = undefined; //// [foo6.js] -void ; // Error +module.exports = void ; //// [foo7.js] - || String; // Error -module.exports = Date; +module.exports = Date || String; //// [foo8.js] -null; // Error +module.exports = null; diff --git a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.errors.txt b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.errors.txt deleted file mode 100644 index ff21d304e40..00000000000 --- a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts(7,10): error TS1003: Identifier expected. - - -==== tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts (1 errors) ==== - function Greeter() { - //... - } - Greeter.prototype.greet = function () { - //... - } - export = new Greeter(); - ~~~ -!!! error TS1003: Identifier expected. - \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js index a90e17d790e..4929eaffd6b 100644 --- a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js +++ b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js @@ -15,4 +15,4 @@ function Greeter() { Greeter.prototype.greet = function () { //... }; -new Greeter(); +module.exports = new Greeter(); diff --git a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.types b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.types new file mode 100644 index 00000000000..56da73abd9d --- /dev/null +++ b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/exportAssignmentWithoutIdentifier1.ts === +function Greeter() { +>Greeter : () => void + + //... +} +Greeter.prototype.greet = function () { +>Greeter.prototype.greet = function () { //...} : () => void +>Greeter.prototype.greet : any +>Greeter.prototype : any +>Greeter : () => void +>prototype : any +>greet : any +>function () { //...} : () => void + + //... +} +export = new Greeter(); +>new Greeter() : any +>Greeter : () => void + diff --git a/tests/baselines/reference/parserExportAssignment3.errors.txt b/tests/baselines/reference/parserExportAssignment3.errors.txt index d02c6d20182..9836671be1e 100644 --- a/tests/baselines/reference/parserExportAssignment3.errors.txt +++ b/tests/baselines/reference/parserExportAssignment3.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,9): error TS1003: Identifier expected. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,9): error TS1109: Expression expected. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (2 errors) ==== @@ -7,4 +7,4 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm ~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. -!!! error TS1003: Identifier expected. \ No newline at end of file +!!! error TS1109: Expression expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment3.js b/tests/baselines/reference/parserExportAssignment3.js index 13e04c3607a..02a65d82817 100644 --- a/tests/baselines/reference/parserExportAssignment3.js +++ b/tests/baselines/reference/parserExportAssignment3.js @@ -2,3 +2,4 @@ export = //// [parserExportAssignment3.js] +module.exports = ; diff --git a/tests/baselines/reference/parserExportAssignment4.errors.txt b/tests/baselines/reference/parserExportAssignment4.errors.txt index 06563ac1195..b6815753962 100644 --- a/tests/baselines/reference/parserExportAssignment4.errors.txt +++ b/tests/baselines/reference/parserExportAssignment4.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,10): error TS1003: Identifier expected. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,10): error TS1109: Expression expected. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (2 errors) ==== @@ -7,4 +7,4 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm ~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. ~ -!!! error TS1003: Identifier expected. \ No newline at end of file +!!! error TS1109: Expression expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment4.js b/tests/baselines/reference/parserExportAssignment4.js index 7cfd8206dbe..f5d5ebab609 100644 --- a/tests/baselines/reference/parserExportAssignment4.js +++ b/tests/baselines/reference/parserExportAssignment4.js @@ -2,3 +2,4 @@ export = ; //// [parserExportAssignment4.js] +module.exports = ; diff --git a/tests/baselines/reference/parserExportAssignment5.errors.txt b/tests/baselines/reference/parserExportAssignment5.errors.txt index b463034f621..8444cdbce64 100644 --- a/tests/baselines/reference/parserExportAssignment5.errors.txt +++ b/tests/baselines/reference/parserExportAssignment5.errors.txt @@ -1,12 +1,9 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS1063: An export assignment cannot be used in an internal module. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS2304: Cannot find name 'A'. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts (1 errors) ==== module M { export = A; ~~~~~~~~~~~ !!! error TS1063: An export assignment cannot be used in an internal module. - ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'A'. } \ No newline at end of file diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index fae5e8eacff..0453d3ed315 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -6,10 +6,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,10): error TS1003: Identifier expected. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (8 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -72,7 +71,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod } export = this; // Should be an error - ~~~~~~~~ -!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. - ~~~~ -!!! error TS1003: Identifier expected. \ No newline at end of file + ~~~~~~~~~~~~~~ +!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index ee1c5add921..e9fddd380bf 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -108,4 +108,4 @@ var SomeEnum; SomeEnum[SomeEnum["A"] = this] = "A"; SomeEnum[SomeEnum["B"] = this.spaaaace] = "B"; // Also should not be allowed })(SomeEnum || (SomeEnum = {})); -this; // Should be an error +module.exports = this; From 751054464ffcb068f1e2432084ce800d73e88e37 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Feb 2015 21:24:28 +0100 Subject: [PATCH 003/251] Fixed VSDevMode.ps1 parameter info --- scripts/VSDevMode.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/VSDevMode.ps1 b/scripts/VSDevMode.ps1 index df34c9e7787..47694286edc 100644 --- a/scripts/VSDevMode.ps1 +++ b/scripts/VSDevMode.ps1 @@ -2,7 +2,7 @@ .SYNOPSIS Run this PowerShell script to enable dev mode and/or a custom script for the TypeScript language service, e.g. -PS C:\> .\scripts\VSDevMode.ps1 -enableDevMode -tsScript C:\src\TypeScript\built\local\typescriptServices.js +PS C:\> .\scripts\VSDevMode.ps1 -enableDevMode -tsScript C:\src\TypeScript\built\local\ Note: If you get security errors, try running powershell as an Administrator and with the "-executionPolicy remoteSigned" switch @@ -13,7 +13,7 @@ Set to "12" for Dev12 (VS2013) or "14" (the default) for Dev14 (VS2015) Pass this switch to enable attaching a debugger to the language service .PARAMETER tsScript -The path to a custom language service script to use, e.g. "C:\src\TypeScript\built\local\typescriptServices.js" +The path to a directory containing a custom language service script to use (typescriptServices.js), e.g. "C:\src\TypeScript\built\local\" #> Param( [int]$vsVersion = 14, From 234358e6c6da54084ed78f27182f4946016f3bcb Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 2 Mar 2015 12:17:05 -0800 Subject: [PATCH 004/251] Unifying ES6 and TypeScript external modules Export assignments are now equivalent to export of member named "default" Export assignments and exports defaults collected by binder Export * declarations collected by binder Simplified logic for marking import symbols as referenced Removed "location" parameter from resolveEntityName Improved error position reporting in resolveEntityName --- src/compiler/binder.ts | 34 ++-- src/compiler/checker.ts | 351 +++++++++++++++++++--------------------- src/compiler/emitter.ts | 45 +++--- src/compiler/types.ts | 26 ++- 4 files changed, 223 insertions(+), 233 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index c26d3369f3f..8541c3b36b3 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -112,6 +112,10 @@ module ts { return "__new"; case SyntaxKind.IndexSignature: return "__index"; + case SyntaxKind.ExportAssignment: + return "default"; + case SyntaxKind.ExportDeclaration: + return "__export"; } } @@ -137,9 +141,9 @@ module ts { : Diagnostics.Duplicate_identifier_0; forEach(symbol.declarations, declaration => { - file.bindDiagnostics.push(createDiagnosticForNode(declaration.name, message, getDisplayName(declaration))); + file.bindDiagnostics.push(createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); - file.bindDiagnostics.push(createDiagnosticForNode(node.name, message, getDisplayName(node))); + file.bindDiagnostics.push(createDiagnosticForNode(node.name || node, message, getDisplayName(node))); symbol = createSymbol(0, name); } @@ -310,13 +314,6 @@ module ts { } } - function bindExportDeclaration(node: ExportDeclaration) { - if (!node.exportClause) { - ((container).exportStars || ((container).exportStars = [])).push(node); - } - bindChildren(node, 0, /*isBlockScopeContainer*/ false); - } - function bindFunctionOrConstructorType(node: SignatureDeclaration) { // For a given function symbol "<...>(...) => T" we want to generate a symbol identical // to the one we would get for: { <...>(...): T } @@ -478,9 +475,6 @@ module ts { case SyntaxKind.ExportSpecifier: bindDeclaration(node, SymbolFlags.Import, SymbolFlags.ImportExcludes, /*isBlockScopeContainer*/ false); break; - case SyntaxKind.ExportDeclaration: - bindExportDeclaration(node); - break; case SyntaxKind.ImportClause: if ((node).name) { bindDeclaration(node, SymbolFlags.Import, SymbolFlags.ImportExcludes, /*isBlockScopeContainer*/ false); @@ -489,6 +483,22 @@ module ts { bindChildren(node, 0, /*isBlockScopeContainer*/ false); } break; + case SyntaxKind.ExportDeclaration: + if (!(node).exportClause) { + // All export * declarations are collected in an __export symbol + declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.ExportStar, 0); + } + bindChildren(node, 0, /*isBlockScopeContainer*/ false); + break; + case SyntaxKind.ExportAssignment: + if ((node).expression.kind === SyntaxKind.Identifier) { + declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Import, SymbolFlags.ImportExcludes); + } + else { + declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + } + bindChildren(node, 0, /*isBlockScopeContainer*/ false); + break; case SyntaxKind.SourceFile: if (isExternalModule(node)) { bindAnonymousDeclaration(node, SymbolFlags.ValueModule, '"' + removeFileExtension((node).fileName) + '"', /*isBlockScopeContainer*/ true); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index bc1a7882361..7699f333d54 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -465,7 +465,8 @@ module ts { node.kind === SyntaxKind.ImportClause && !!(node).name || node.kind === SyntaxKind.NamespaceImport || node.kind === SyntaxKind.ImportSpecifier || - node.kind === SyntaxKind.ExportSpecifier; + node.kind === SyntaxKind.ExportSpecifier || + node.kind === SyntaxKind.ExportAssignment; } function getDeclarationOfImportSymbol(symbol: Symbol): Declaration { @@ -518,7 +519,11 @@ module ts { function getTargetOfExportSpecifier(node: ExportSpecifier): Symbol { return (node.parent.parent).moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : - resolveEntityName(node, node.propertyName || node.name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); + resolveEntityName(node.propertyName || node.name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); + } + + function getTargetOfExportAssignment(node: ExportAssignment): Symbol { + return resolveEntityName(node.expression, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); } function getTargetOfImportDeclaration(node: Declaration): Symbol { @@ -533,6 +538,8 @@ module ts { return getTargetOfImportSpecifier(node); case SyntaxKind.ExportSpecifier: return getTargetOfExportSpecifier(node); + case SyntaxKind.ExportAssignment: + return getTargetOfExportAssignment(node); } } @@ -556,6 +563,31 @@ module ts { return links.target; } + function markExportAsReferenced(node: ImportEqualsDeclaration | ExportAssignment | ExportSpecifier) { + var symbol = getSymbolOfNode(node); + var target = resolveImport(symbol); + if (target && target !== unknownSymbol && target.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(target)) { + markImportSymbolAsReferenced(symbol); + } + } + + function markImportSymbolAsReferenced(symbol: Symbol) { + var links = getSymbolLinks(symbol); + if (!links.referenced) { + links.referenced = true; + var node = getDeclarationOfImportSymbol(symbol); + if (node.kind === SyntaxKind.ExportAssignment) { + checkExpressionCached((node).expression); + } + else if (node.kind === SyntaxKind.ExportSpecifier) { + checkExpressionCached((node).propertyName || (node).name); + } + else if (isInternalModuleImportEqualsDeclaration(node)) { + checkExpressionCached((node).moduleReference); + } + } + } + // This function is only for imports with entity names function getSymbolOfPartOfRightHandSideOfImportEquals(entityName: EntityName, importDeclaration?: ImportEqualsDeclaration): Symbol { if (!importDeclaration) { @@ -573,13 +605,13 @@ module ts { } // Check for case 1 and 3 in the above example if (entityName.kind === SyntaxKind.Identifier || entityName.parent.kind === SyntaxKind.QualifiedName) { - return resolveEntityName(importDeclaration, entityName, SymbolFlags.Namespace); + return resolveEntityName(entityName, SymbolFlags.Namespace); } else { // Case 2 in above example // entityName.kind could be a QualifiedName or a Missing identifier Debug.assert(entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration); - return resolveEntityName(importDeclaration, entityName, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); + return resolveEntityName(entityName, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); } } @@ -588,28 +620,28 @@ module ts { } // Resolves a qualified name and any involved import aliases - function resolveEntityName(location: Node, name: EntityName, meaning: SymbolFlags): Symbol { + function resolveEntityName(name: EntityName, meaning: SymbolFlags): Symbol { if (getFullWidth(name) === 0) { return undefined; } - if (name.kind === SyntaxKind.Identifier) { - var symbol = resolveName(location,(name).text, meaning, Diagnostics.Cannot_find_name_0, name); + var symbol = resolveName(name, (name).text, meaning, Diagnostics.Cannot_find_name_0, name); if (!symbol) { - return; + return undefined; } } else if (name.kind === SyntaxKind.QualifiedName) { - var namespace = resolveEntityName(location,(name).left, SymbolFlags.Namespace); - if (!namespace || namespace === unknownSymbol || getFullWidth((name).right) === 0) return; - var symbol = getSymbol(getExportsOfSymbol(namespace), (name).right.text, meaning); + var namespace = resolveEntityName((name).left, SymbolFlags.Namespace); + if (!namespace || namespace === unknownSymbol || getFullWidth((name).right) === 0) { + return undefined; + } + var right = (name).right; + var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning); if (!symbol) { - error(location, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), - declarationNameToString((name).right)); - return; + error(right, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), declarationNameToString(right)); + return undefined; } } - Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); return symbol.flags & meaning ? symbol : resolveImport(symbol); } @@ -658,6 +690,10 @@ module ts { error(moduleReferenceLiteral, Diagnostics.Cannot_find_external_module_0, moduleName); } + function getExportAssignmentSymbol(moduleSymbol: Symbol): Symbol { + return moduleSymbol.exports["default"]; + } + function getResolvedExportAssignmentSymbol(moduleSymbol: Symbol): Symbol { var symbol = getExportAssignmentSymbol(moduleSymbol); if (symbol) { @@ -670,64 +706,6 @@ module ts { } } - function getExportAssignmentSymbol(symbol: Symbol): Symbol { - checkTypeOfExportAssignmentSymbol(symbol); - return getSymbolLinks(symbol).exportAssignmentSymbol; - } - - function checkTypeOfExportAssignmentSymbol(containerSymbol: Symbol): void { - var symbolLinks = getSymbolLinks(containerSymbol); - if (!symbolLinks.exportAssignmentChecked) { - var exportInformation = collectExportInformationForSourceFileOrModule(containerSymbol); - if (exportInformation.exportAssignments.length) { - if (exportInformation.exportAssignments.length > 1) { - // TypeScript 1.0 spec (April 2014): 11.2.4 - // It is an error for an external module to contain more than one export assignment. - forEach(exportInformation.exportAssignments, node => error(node, Diagnostics.A_module_cannot_have_more_than_one_export_assignment)); - } - var node = exportInformation.exportAssignments[0]; - if (exportInformation.hasExportedMember) { - // TypeScript 1.0 spec (April 2014): 11.2.3 - // If an external module contains an export assignment it is an error - // for the external module to also contain export declarations. - // The two types of exports are mutually exclusive. - error(node, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); - } - if (node.expression.kind === SyntaxKind.Identifier && (node.expression).text) { - var exportSymbol = resolveName(node, (node.expression).text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, - Diagnostics.Cannot_find_name_0, node.expression); - } - else { - var exportSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "*default*"); - exportSymbol.parent = containerSymbol; - (exportSymbol).type = checkExpression(node.expression); - } - symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; - } - symbolLinks.exportAssignmentChecked = true; - } - } - - function collectExportInformationForSourceFileOrModule(symbol: Symbol) { - var seenExportedMember = false; - var result: ExportAssignment[] = []; - forEach(symbol.declarations, declaration => { - var block = (declaration.kind === SyntaxKind.SourceFile ? declaration : (declaration).body); - forEach(block.statements, node => { - if (node.kind === SyntaxKind.ExportAssignment) { - result.push(node); - } - else { - seenExportedMember = seenExportedMember || (node.flags & NodeFlags.Export) !== 0; - } - }); - }); - return { - hasExportedMember: seenExportedMember, - exportAssignments: result - }; - } - function getExportsOfSymbol(symbol: Symbol): SymbolTable { return symbol.flags & SymbolFlags.Module ? getExportsOfModule(symbol) : symbol.exports; } @@ -738,6 +716,14 @@ module ts { } function getExportsForModule(moduleSymbol: Symbol): SymbolTable { + if (compilerOptions.target < ScriptTarget.ES6) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + return { + "default": defaultSymbol + }; + } + } var result: SymbolTable; var visitedSymbols: Symbol[] = []; visit(moduleSymbol); @@ -752,13 +738,12 @@ module ts { } extendSymbolTable(result, symbol.exports); } - forEach(symbol.declarations, node => { - if (node.kind === SyntaxKind.SourceFile || node.kind === SyntaxKind.ModuleDeclaration) { - forEach((node).exportStars, exportStar => { - visit(resolveExternalModuleName(exportStar, exportStar.moduleSpecifier)); - }); - } - }); + var exportStars = symbol.exports["__export"]; + if (exportStars) { + forEach(exportStars.declarations, node => { + visit(resolveExternalModuleName(node, (node).moduleSpecifier)); + }); + } } } } @@ -2001,6 +1986,10 @@ module ts { if (declaration.kind === SyntaxKind.CatchClause) { return links.type = anyType; } + // Handle export default expressions + if (declaration.kind === SyntaxKind.ExportAssignment) { + return links.type = checkExpression((declaration).expression); + } // Handle variable, parameter or property links.type = resolvingType; var type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true); @@ -3055,7 +3044,7 @@ module ts { function getTypeFromTypeReferenceNode(node: TypeReferenceNode): Type { var links = getNodeLinks(node); if (!links.resolvedType) { - var symbol = resolveEntityName(node, node.typeName, SymbolFlags.Type); + var symbol = resolveEntityName(node.typeName, SymbolFlags.Type); if (symbol) { var type: Type; if ((symbol.flags & SymbolFlags.TypeParameter) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { @@ -5001,22 +4990,6 @@ module ts { } } - /*Transitively mark all linked imports as referenced*/ - function markLinkedImportsAsReferenced(node: ImportEqualsDeclaration): void { - if (node) { - var nodeLinks = getNodeLinks(node); - while (nodeLinks.importOnRightSide) { - var rightSide = nodeLinks.importOnRightSide; - nodeLinks.importOnRightSide = undefined; - - getSymbolLinks(rightSide).referenced = true; - Debug.assert((rightSide.flags & SymbolFlags.Import) !== 0); - - nodeLinks = getNodeLinks(getDeclarationOfKind(rightSide, SyntaxKind.ImportEqualsDeclaration)) - } - } - } - function checkIdentifier(node: Identifier): Type { var symbol = getResolvedSymbol(node); @@ -5030,44 +5003,8 @@ module ts { error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & SymbolFlags.Import) { - - //var symbolLinks = getSymbolLinks(symbol); - //if (!symbolLinks.referenced) { - // if (!isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol))) { - // symbolLinks.referenced = true; - // } - //} - - // TODO: AndersH: This needs to be simplified. In an import of the form "import x = a.b.c;" we only need - // to resolve "a" and mark it as referenced. If "b" and/or "c" are aliases, we would be able to access them - // unless they're exported, and in that case they're already implicitly referenced. - - var symbolLinks = getSymbolLinks(symbol); - if (!symbolLinks.referenced) { - var importOrExportAssignment = getLeftSideOfImportEqualsOrExportAssignment(node); - - // decision about whether import is referenced can be made now if - // - import that are used anywhere except right side of import declarations - // - imports that are used on the right side of exported import declarations - // for other cases defer decision until the check of left side - if (!importOrExportAssignment || - (importOrExportAssignment.flags & NodeFlags.Export) || - (importOrExportAssignment.kind === SyntaxKind.ExportAssignment)) { - // Mark the import as referenced so that we emit it in the final .js file. - // exception: identifiers that appear in type queries, const enums, modules that contain only const enums - symbolLinks.referenced = !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol)); - } - else { - var nodeLinks = getNodeLinks(importOrExportAssignment); - Debug.assert(!nodeLinks.importOnRightSide); - nodeLinks.importOnRightSide = symbol; - } - } - - if (symbolLinks.referenced) { - markLinkedImportsAsReferenced(getDeclarationOfKind(symbol, SyntaxKind.ImportEqualsDeclaration)); - } + if (symbol.flags & SymbolFlags.Import && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol))) { + markImportSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); @@ -9081,7 +9018,7 @@ module ts { var staticBaseType = getTypeOfSymbol(baseType.symbol); checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, baseTypeNode.typeName, SymbolFlags.Value)) { + if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, SymbolFlags.Value)) { error(baseTypeNode, Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); } @@ -9656,30 +9593,25 @@ module ts { function checkImportEqualsDeclaration(node: ImportEqualsDeclaration) { checkGrammarModifiers(node); - if (isInternalModuleImportEqualsDeclaration(node)) { + if (isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); - if (target !== unknownSymbol) { - if (target.flags & SymbolFlags.Value) { - // Target is a value symbol, check that it is not hidden by a local declaration with the same name and - // ensure it can be evaluated as an expression - var moduleName = getFirstIdentifier(node.moduleReference); - if (resolveEntityName(node, moduleName, SymbolFlags.Value | SymbolFlags.Namespace).flags & SymbolFlags.Namespace) { - checkExpressionOrQualifiedName(node.moduleReference); - } - else { - error(moduleName, Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, declarationNameToString(moduleName)); - } - } - if (target.flags & SymbolFlags.Type) { - checkTypeNameIsReserved(node.name, Diagnostics.Import_name_cannot_be_0); - } + if (node.flags & NodeFlags.Export) { + markExportAsReferenced(node); } - } - else { - if (checkExternalImportOrExportDeclaration(node)) { - checkImportBinding(node); + if (isInternalModuleImportEqualsDeclaration(node)) { + var target = resolveImport(getSymbolOfNode(node)); + if (target !== unknownSymbol) { + if (target.flags & SymbolFlags.Value) { + // Target is a value symbol, check that it is not hidden by a local declaration with the same name + var moduleName = getFirstIdentifier(node.moduleReference); + if (!(resolveEntityName(moduleName, SymbolFlags.Value | SymbolFlags.Namespace).flags & SymbolFlags.Namespace)) { + error(moduleName, Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, declarationNameToString(moduleName)); + } + } + if (target.flags & SymbolFlags.Type) { + checkTypeNameIsReserved(node.name, Diagnostics.Import_name_cannot_be_0); + } + } } } } @@ -9690,13 +9622,21 @@ module ts { } if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { if (node.exportClause) { - forEach(node.exportClause.elements, checkImportSymbol); + forEach(node.exportClause.elements, checkExportSpecifier); } } } + function checkExportSpecifier(node: ExportSpecifier) { + checkImportSymbol(node); + if (!(node.parent.parent).moduleSpecifier) { + markExportAsReferenced(node); + } + } + function checkExportAssignment(node: ExportAssignment) { - if (node.parent.kind === SyntaxKind.ModuleBlock && (node.parent.parent).name.kind === SyntaxKind.Identifier) { + var container = node.parent.kind === SyntaxKind.SourceFile ? node.parent : node.parent.parent; + if (container.kind === SyntaxKind.ModuleDeclaration && (container).name.kind === SyntaxKind.Identifier) { error(node, Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); return; } @@ -9704,12 +9644,64 @@ module ts { if (!checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) { grammarErrorOnFirstToken(node, Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; - if (container.kind !== SyntaxKind.SourceFile) { - // In a module, the immediate parent will be a block, so climb up one more parent - container = container.parent; + if (node.expression.kind === SyntaxKind.Identifier) { + markExportAsReferenced(node); + } + else { + checkExpressionCached(node.expression); + } + checkExternalModuleExports(container); + } + + function getModuleStatements(node: Declaration): ModuleElement[] { + 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) { + var declarations = moduleSymbol.declarations; + for (var i = 0; i < declarations.length; i++) { + var statements = getModuleStatements(declarations[i]); + for (var j = 0; j < statements.length; j++) { + var node = statements[j]; + if (node.kind === SyntaxKind.ExportDeclaration) { + var exportClause = (node).exportClause; + if (!exportClause) { + return true; + } + var specifiers = exportClause.elements; + for (var k = 0; k < specifiers.length; k++) { + var specifier = specifiers[k]; + if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) { + return true; + } + } + } + else if (node.kind !== SyntaxKind.ExportAssignment && node.flags & NodeFlags.Export) { + return true; + } + } + } + } + + function checkExternalModuleExports(node: SourceFile | ModuleDeclaration) { + var moduleSymbol = getSymbolOfNode(node); + var links = getSymbolLinks(moduleSymbol); + if (!links.exportsChecked) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + if (hasExportedMembers(moduleSymbol)) { + var declaration = getDeclarationOfImportSymbol(defaultSymbol); + error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); + } + } + links.exportsChecked = true; } - checkTypeOfExportAssignmentSymbol(getSymbolOfNode(container)); } function checkSourceElement(node: Node): void { @@ -9928,13 +9920,7 @@ module ts { checkFunctionExpressionBodies(node); if (isExternalModule(node)) { - var symbol = getExportAssignmentSymbol(node.symbol); - if (symbol && symbol.flags & SymbolFlags.Import) { - // Mark the import as referenced so that we emit it in the final .js file. - getSymbolLinks(symbol).referenced = true; - // mark any import declarations that depend upon this import as referenced - markLinkedImportsAsReferenced(getDeclarationOfKind(symbol, SyntaxKind.ImportEqualsDeclaration)) - } + checkExternalModuleExports(node); } if (potentialThisCollisions.length) { @@ -10182,7 +10168,7 @@ module ts { } if (entityName.parent.kind === SyntaxKind.ExportAssignment) { - return resolveEntityName(/*location*/ entityName.parent.parent, entityName, + return resolveEntityName(entityName, /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Import); } @@ -10207,7 +10193,7 @@ module ts { // Include Import in the meaning, this ensures that we do not follow aliases to where they point and instead // return the alias symbol. var meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Import; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } else if (entityName.kind === SyntaxKind.PropertyAccessExpression) { var symbol = getNodeLinks(entityName).resolvedSymbol; @@ -10229,7 +10215,7 @@ module ts { // Include Import in the meaning, this ensures that we do not follow aliases to where they point and instead // return the alias symbol. meaning |= SymbolFlags.Import; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } // Do we want to return undefined here? @@ -10301,7 +10287,7 @@ module ts { // This is necessary as an identifier in short-hand property assignment can contains two meaning: // property name and property value. if (location && location.kind === SyntaxKind.ShorthandPropertyAssignment) { - return resolveEntityName(location, (location).name, SymbolFlags.Value); + return resolveEntityName((location).name, SymbolFlags.Value); } return undefined; } @@ -10567,9 +10553,9 @@ module ts { } } - function getExportAssignmentName(node: SourceFile): string { - var symbol = getExportAssignmentSymbol(getSymbolOfNode(node)); - return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol) ? symbolToString(symbol): undefined; + function hasExportDefaultValue(node: SourceFile): boolean { + var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node)); + return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol); } function isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean { @@ -10596,11 +10582,6 @@ module ts { if (getSymbolLinks(symbol).referenced) { return true; } - // logic below will answer 'true' for exported import declaration in a nested module that itself is not exported. - // As a consequence this might cause emitting extra. - if (node.kind === SyntaxKind.ImportEqualsDeclaration && node.flags & NodeFlags.Export && isImportResolvedToValue(symbol)) { - return true; - } } return forEachChild(node, isReferencedImportDeclaration); } @@ -10676,7 +10657,7 @@ module ts { return { getGeneratedNameForNode, getExpressionNameSubstitution, - getExportAssignmentName, + hasExportDefaultValue, isReferencedImportDeclaration, getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName, diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 5d90b2245e5..8551d8301e7 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1580,6 +1580,7 @@ module ts { var tempParameters: Identifier[]; var externalImports: ExternalImportInfo[]; var exportSpecifiers: Map; + var exportDefault: ExportAssignment | ExportSpecifier; /** write emitted output to disk*/ var writeEmittedFiles = writeJavaScriptFile; @@ -3446,7 +3447,7 @@ module ts { } function emitExportMemberAssignments(name: Identifier) { - if (exportSpecifiers && hasProperty(exportSpecifiers, name.text)) { + if (!exportDefault && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) { forEach(exportSpecifiers[name.text], specifier => { writeLine(); emitStart(specifier.name); @@ -4665,13 +4666,20 @@ module ts { function createExternalModuleInfo(sourceFile: SourceFile) { externalImports = []; exportSpecifiers = {}; + exportDefault = undefined; forEach(sourceFile.statements, node => { if (node.kind === SyntaxKind.ExportDeclaration && !(node).moduleSpecifier) { forEach((node).exportClause.elements, specifier => { + if (specifier.name.text === "default") { + exportDefault = exportDefault || specifier; + } var name = (specifier.propertyName || specifier.name).text; (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier); }); } + else if (node.kind === SyntaxKind.ExportAssignment) { + exportDefault = exportDefault || node; + } else { var info = createExternalImportInfo(node); if (info) { @@ -4759,17 +4767,7 @@ module ts { emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(/*newLine*/ true); - // TODO: Handle export default expressions - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { - writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("return "); - emit(exportAssignment.expression); - write(";"); - emitEnd(exportAssignment); - } + emitExportDefault(node, /*emitAsReturn*/ true); decreaseIndent(); writeLine(); write("});"); @@ -4779,16 +4777,22 @@ module ts { emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(/*newLine*/ true); - // TODO: Handle export default expressions - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { + emitExportDefault(node, /*emitAsReturn*/ false); + } + + function emitExportDefault(sourceFile: SourceFile, emitAsReturn: boolean) { + if (exportDefault && resolver.hasExportDefaultValue(sourceFile)) { writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("module.exports = "); - emit(exportAssignment.expression); + emitStart(exportDefault); + write(emitAsReturn ? "return " : "module.exports = "); + if (exportDefault.kind === SyntaxKind.ExportAssignment) { + emit((exportDefault).expression); + } + else { + emit((exportDefault).propertyName); + } write(";"); - emitEnd(exportAssignment); + emitEnd(exportDefault); } } @@ -4845,6 +4849,7 @@ module ts { else { externalImports = undefined; exportSpecifiers = undefined; + exportDefault = undefined; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(/*newLine*/ true); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index bf022786f81..5115fd0d25c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -863,11 +863,7 @@ module ts { members: NodeArray; } - export interface ExportContainer { - exportStars?: ExportDeclaration[]; // List of 'export *' statements (initialized by binding) - } - - export interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + export interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -912,7 +908,7 @@ module ts { name: Identifier; } - export interface ExportDeclaration extends Statement, ModuleElement { + export interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -932,7 +928,7 @@ module ts { export type ImportSpecifier = ImportOrExportSpecifier; export type ExportSpecifier = ImportOrExportSpecifier; - export interface ExportAssignment extends Statement, ModuleElement { + export interface ExportAssignment extends Declaration, ModuleElement { isExportEquals?: boolean; expression: Expression; } @@ -946,7 +942,7 @@ module ts { } // Source files are declarations when they are external modules. - export interface SourceFile extends Declaration, ExportContainer { + export interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; @@ -1191,7 +1187,7 @@ module ts { export interface EmitResolver { getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; + hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; @@ -1227,11 +1223,9 @@ module ts { Signature = 0x00020000, // Call, construct, or index signature TypeParameter = 0x00040000, // Type parameter TypeAlias = 0x00080000, // Type alias - - // Export markers (see comment in declareModuleMember in binder) - ExportValue = 0x00100000, // Exported value marker - ExportType = 0x00200000, // Exported type marker - ExportNamespace = 0x00400000, // Exported namespace marker + ExportValue = 0x00100000, // Exported value marker (see comment in declareModuleMember in binder) + ExportType = 0x00200000, // Exported type marker (see comment in declareModuleMember in binder) + ExportNamespace = 0x00400000, // Exported namespace marker (see comment in declareModuleMember in binder) Import = 0x00800000, // Import Instantiated = 0x01000000, // Instantiated symbol Merged = 0x02000000, // Merged symbol (created during program binding) @@ -1239,6 +1233,7 @@ module ts { Prototype = 0x08000000, // Prototype property (no source representation) UnionProperty = 0x10000000, // Property in union type Optional = 0x20000000, // Optional property + ExportStar = 0x40000000, // Export * declaration Enum = RegularEnum | ConstEnum, Variable = FunctionScopedVariable | BlockScopedVariable, @@ -1306,10 +1301,9 @@ module ts { declaredType?: Type; // Type of class, interface, enum, or type parameter mapper?: TypeMapper; // Type mapper for instantiation alias referenced?: boolean; // True if alias symbol has been referenced as a value - exportAssignmentChecked?: boolean; // True if export assignment was checked - exportAssignmentSymbol?: Symbol; // Symbol exported from external module unionType?: UnionType; // Containing union type for union property resolvedExports?: SymbolTable; // Resolved exports of module + exportsChecked?: boolean; // True if exports of external module have been checked } export interface TransientSymbol extends Symbol, SymbolLinks { } From 43af8716d0dbfd9a38df54ada7c52023f4ba1120 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 2 Mar 2015 12:21:53 -0800 Subject: [PATCH 005/251] Accepting new baselines --- .../baselines/reference/APISample_compile.js | 17 +- .../reference/APISample_compile.types | 42 +-- tests/baselines/reference/APISample_linter.js | 17 +- .../reference/APISample_linter.types | 42 +-- .../reference/APISample_transform.js | 17 +- .../reference/APISample_transform.types | 42 +-- .../baselines/reference/APISample_watcher.js | 17 +- .../reference/APISample_watcher.types | 42 +-- .../reference/ExportAssignment7.errors.txt | 8 +- .../reference/ExportAssignment8.errors.txt | 6 +- tests/baselines/reference/aliasBug.errors.txt | 4 +- .../reference/aliasErrors.errors.txt | 16 +- .../classExtendingQualifiedName.errors.txt | 4 +- .../reference/complicatedPrivacy.errors.txt | 4 +- ...torWithIncompleteTypeAnnotation.errors.txt | 4 +- ...FileImportModuleWithExportAssignment.types | 14 +- ...ernalModuleWithExportAssignedFundule.types | 2 +- .../declareFileExportAssignment.types | 14 +- ...signmentWithVarFromVariableStatement.types | 14 +- .../declareModifierOnImport1.errors.txt | 4 +- .../duplicateExportAssignments.errors.txt | 44 +-- .../exportAssignClassAndModule.types | 4 +- .../reference/exportAssignNonIdentifier.js | 1 - .../reference/exportEqualNamespaces.types | 2 +- .../reference/extBaseClass2.errors.txt | 4 +- .../genericFunduleInModule.errors.txt | 4 +- .../genericFunduleInModule2.errors.txt | 4 +- ...eReferenceWithoutTypeArgument.d.errors.txt | 4 +- ...peReferenceWithoutTypeArgument2.errors.txt | 8 +- ...peReferenceWithoutTypeArgument3.errors.txt | 4 +- ...ReturnTypeAndFunctionClassMerge.errors.txt | 4 +- .../reference/importAnImport.errors.txt | 4 +- .../importDeclWithClassModifiers.errors.txt | 18 +- .../importDeclWithDeclareModifier.errors.txt | 6 +- .../importDeclWithExportModifier.errors.txt | 4 +- ...portModifierAndExportAssignment.errors.txt | 4 +- .../importedModuleAddToGlobal.errors.txt | 2 +- .../reference/innerAliases.errors.txt | 4 +- .../instantiateTypeParameter.errors.txt | 2 +- ...lModuleWithoutExportAccessError.errors.txt | 4 +- ...lModuleWithoutExportAccessError.errors.txt | 4 +- .../invalidImportAliasIdentifiers.errors.txt | 16 +- .../invalidInstantiatedModule.errors.txt | 2 +- .../moduleClassArrayCodeGenTest.errors.txt | 4 +- .../reference/moduleImport.errors.txt | 9 +- .../reference/moduleNewExportBug.errors.txt | 4 +- .../moduleVisibilityTest2.errors.txt | 8 +- .../moduleVisibilityTest3.errors.txt | 8 +- .../multipleExportAssignments.errors.txt | 8 +- ...AssignmentsInAmbientDeclaration.errors.txt | 8 +- .../reference/parser519458.errors.txt | 4 +- .../parserExportAssignment1.errors.txt | 4 +- .../parserExportAssignment2.errors.txt | 4 +- .../reference/parserExportAssignment3.js | 1 - .../reference/parserExportAssignment4.js | 1 - .../parserExportAssignment6.errors.txt | 4 +- .../parserExportAssignment7.errors.txt | 8 +- .../parserExportAssignment8.errors.txt | 6 +- .../parserGenericConstraint2.errors.txt | 2 +- .../parserGenericConstraint3.errors.txt | 2 +- .../parserGenericConstraint4.errors.txt | 2 +- .../parserGenericConstraint5.errors.txt | 2 +- .../parserGenericConstraint6.errors.txt | 2 +- .../parserGenericConstraint7.errors.txt | 2 +- ...GenericsInInterfaceDeclaration1.errors.txt | 2 +- .../parserGenericsInTypeContexts1.errors.txt | 16 +- .../parserGenericsInTypeContexts2.errors.txt | 16 +- ...rGenericsInVariableDeclaration1.errors.txt | 12 +- .../parserImportDeclaration1.errors.txt | 4 +- .../parserMissingLambdaOpenBrace1.errors.txt | 4 +- .../reference/parserRealSource14.errors.txt | 288 +++++++++--------- .../parserSkippedTokens20.errors.txt | 2 +- ...nfinishedTypeNameBeforeKeyword1.errors.txt | 5 +- .../parserUnterminatedGeneric1.errors.txt | 4 +- .../parserUnterminatedGeneric2.errors.txt | 4 +- .../parserVariableDeclaration3.errors.txt | 2 +- .../reference/parserharness.errors.txt | 88 +++--- .../reference/parserindenter.errors.txt | 8 +- .../parservoidInQualifiedName2.errors.txt | 2 +- .../primaryExpressionMods.errors.txt | 2 +- ...ssignmentOnExportedGenericInterface1.types | 4 +- .../noDefaultLib/amd/noDefaultLib.errors.txt | 2 +- .../noDefaultLib/node/noDefaultLib.errors.txt | 2 +- .../reference/protoAssignment.errors.txt | 2 +- ...-does-not-affect-class-heritage.errors.txt | 4 +- ...siveExportAssignmentAndFindAliasedType4.js | 3 +- ...siveExportAssignmentAndFindAliasedType5.js | 6 +- ...siveExportAssignmentAndFindAliasedType6.js | 9 +- .../recursiveTypeComparison2.errors.txt | 2 +- .../scannerImportDeclaration1.errors.txt | 4 +- .../reference/sourceMapSample.errors.txt | 4 +- .../reference/undeclaredBase.errors.txt | 4 +- .../reference/unknownSymbols2.errors.txt | 4 +- 93 files changed, 513 insertions(+), 572 deletions(-) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 130283d7e6d..18c82646535 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -712,10 +712,7 @@ declare module "typescript" { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -740,7 +737,7 @@ declare module "typescript" { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -755,7 +752,7 @@ declare module "typescript" { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { isExportEquals?: boolean; expression: Expression; } @@ -765,7 +762,7 @@ declare module "typescript" { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -929,7 +926,7 @@ declare module "typescript" { interface EmitResolver { getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; + hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; @@ -973,6 +970,7 @@ declare module "typescript" { Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -1026,10 +1024,9 @@ declare module "typescript" { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 43dbf041de7..d717386a2d0 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -2160,18 +2160,10 @@ declare module "typescript" { >NodeArray : NodeArray >EnumMember : EnumMember } - interface ExportContainer { ->ExportContainer : ExportContainer - - exportStars?: ExportDeclaration[]; ->exportStars : ExportDeclaration[] ->ExportDeclaration : ExportDeclaration - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { >ModuleDeclaration : ModuleDeclaration >Declaration : Declaration >ModuleElement : ModuleElement ->ExportContainer : ExportContainer name: Identifier | LiteralExpression; >name : Identifier | LiteralExpression @@ -2249,9 +2241,9 @@ declare module "typescript" { >name : Identifier >Identifier : Identifier } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { >ExportDeclaration : ExportDeclaration ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement exportClause?: NamedExports; @@ -2299,9 +2291,9 @@ declare module "typescript" { >ExportSpecifier : ImportOrExportSpecifier >ImportOrExportSpecifier : ImportOrExportSpecifier - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { >ExportAssignment : ExportAssignment ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement isExportEquals?: boolean; @@ -2325,10 +2317,9 @@ declare module "typescript" { hasTrailingNewLine?: boolean; >hasTrailingNewLine : boolean } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { >SourceFile : SourceFile >Declaration : Declaration ->ExportContainer : ExportContainer statements: NodeArray; >statements : NodeArray @@ -2964,8 +2955,8 @@ declare module "typescript" { >EmitResolver : EmitResolver getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration) => string ->node : EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration +>getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string +>node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration >ModuleDeclaration : ModuleDeclaration >EnumDeclaration : EnumDeclaration >ImportDeclaration : ImportDeclaration @@ -2976,8 +2967,8 @@ declare module "typescript" { >node : Identifier >Identifier : Identifier - getExportAssignmentName(node: SourceFile): string; ->getExportAssignmentName : (node: SourceFile) => string + hasExportDefaultValue(node: SourceFile): boolean; +>hasExportDefaultValue : (node: SourceFile) => boolean >node : SourceFile >SourceFile : SourceFile @@ -3154,6 +3145,9 @@ declare module "typescript" { Optional = 536870912, >Optional : SymbolFlags + ExportStar = 1073741824, +>ExportStar : SymbolFlags + Enum = 384, >Enum : SymbolFlags @@ -3318,13 +3312,6 @@ declare module "typescript" { referenced?: boolean; >referenced : boolean - exportAssignmentChecked?: boolean; ->exportAssignmentChecked : boolean - - exportAssignmentSymbol?: Symbol; ->exportAssignmentSymbol : Symbol ->Symbol : Symbol - unionType?: UnionType; >unionType : UnionType >UnionType : UnionType @@ -3332,6 +3319,9 @@ declare module "typescript" { resolvedExports?: SymbolTable; >resolvedExports : SymbolTable >SymbolTable : SymbolTable + + exportsChecked?: boolean; +>exportsChecked : boolean } interface TransientSymbol extends Symbol, SymbolLinks { >TransientSymbol : TransientSymbol diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 2271902eb5c..477bf531fac 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -743,10 +743,7 @@ declare module "typescript" { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -771,7 +768,7 @@ declare module "typescript" { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -786,7 +783,7 @@ declare module "typescript" { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { isExportEquals?: boolean; expression: Expression; } @@ -796,7 +793,7 @@ declare module "typescript" { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -960,7 +957,7 @@ declare module "typescript" { interface EmitResolver { getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; + hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; @@ -1004,6 +1001,7 @@ declare module "typescript" { Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -1057,10 +1055,9 @@ declare module "typescript" { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 3693938dba7..6eb0e17a6e8 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -2306,18 +2306,10 @@ declare module "typescript" { >NodeArray : NodeArray >EnumMember : EnumMember } - interface ExportContainer { ->ExportContainer : ExportContainer - - exportStars?: ExportDeclaration[]; ->exportStars : ExportDeclaration[] ->ExportDeclaration : ExportDeclaration - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { >ModuleDeclaration : ModuleDeclaration >Declaration : Declaration >ModuleElement : ModuleElement ->ExportContainer : ExportContainer name: Identifier | LiteralExpression; >name : Identifier | LiteralExpression @@ -2395,9 +2387,9 @@ declare module "typescript" { >name : Identifier >Identifier : Identifier } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { >ExportDeclaration : ExportDeclaration ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement exportClause?: NamedExports; @@ -2445,9 +2437,9 @@ declare module "typescript" { >ExportSpecifier : ImportOrExportSpecifier >ImportOrExportSpecifier : ImportOrExportSpecifier - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { >ExportAssignment : ExportAssignment ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement isExportEquals?: boolean; @@ -2471,10 +2463,9 @@ declare module "typescript" { hasTrailingNewLine?: boolean; >hasTrailingNewLine : boolean } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { >SourceFile : SourceFile >Declaration : Declaration ->ExportContainer : ExportContainer statements: NodeArray; >statements : NodeArray @@ -3110,8 +3101,8 @@ declare module "typescript" { >EmitResolver : EmitResolver getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration) => string ->node : EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration +>getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string +>node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration >ModuleDeclaration : ModuleDeclaration >EnumDeclaration : EnumDeclaration >ImportDeclaration : ImportDeclaration @@ -3122,8 +3113,8 @@ declare module "typescript" { >node : Identifier >Identifier : Identifier - getExportAssignmentName(node: SourceFile): string; ->getExportAssignmentName : (node: SourceFile) => string + hasExportDefaultValue(node: SourceFile): boolean; +>hasExportDefaultValue : (node: SourceFile) => boolean >node : SourceFile >SourceFile : SourceFile @@ -3300,6 +3291,9 @@ declare module "typescript" { Optional = 536870912, >Optional : SymbolFlags + ExportStar = 1073741824, +>ExportStar : SymbolFlags + Enum = 384, >Enum : SymbolFlags @@ -3464,13 +3458,6 @@ declare module "typescript" { referenced?: boolean; >referenced : boolean - exportAssignmentChecked?: boolean; ->exportAssignmentChecked : boolean - - exportAssignmentSymbol?: Symbol; ->exportAssignmentSymbol : Symbol ->Symbol : Symbol - unionType?: UnionType; >unionType : UnionType >UnionType : UnionType @@ -3478,6 +3465,9 @@ declare module "typescript" { resolvedExports?: SymbolTable; >resolvedExports : SymbolTable >SymbolTable : SymbolTable + + exportsChecked?: boolean; +>exportsChecked : boolean } interface TransientSymbol extends Symbol, SymbolLinks { >TransientSymbol : TransientSymbol diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index f976b1ac822..5ee45e960c6 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -744,10 +744,7 @@ declare module "typescript" { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -772,7 +769,7 @@ declare module "typescript" { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -787,7 +784,7 @@ declare module "typescript" { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { isExportEquals?: boolean; expression: Expression; } @@ -797,7 +794,7 @@ declare module "typescript" { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -961,7 +958,7 @@ declare module "typescript" { interface EmitResolver { getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; + hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; @@ -1005,6 +1002,7 @@ declare module "typescript" { Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -1058,10 +1056,9 @@ declare module "typescript" { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index e291f074937..05aa191ce11 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -2256,18 +2256,10 @@ declare module "typescript" { >NodeArray : NodeArray >EnumMember : EnumMember } - interface ExportContainer { ->ExportContainer : ExportContainer - - exportStars?: ExportDeclaration[]; ->exportStars : ExportDeclaration[] ->ExportDeclaration : ExportDeclaration - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { >ModuleDeclaration : ModuleDeclaration >Declaration : Declaration >ModuleElement : ModuleElement ->ExportContainer : ExportContainer name: Identifier | LiteralExpression; >name : Identifier | LiteralExpression @@ -2345,9 +2337,9 @@ declare module "typescript" { >name : Identifier >Identifier : Identifier } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { >ExportDeclaration : ExportDeclaration ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement exportClause?: NamedExports; @@ -2395,9 +2387,9 @@ declare module "typescript" { >ExportSpecifier : ImportOrExportSpecifier >ImportOrExportSpecifier : ImportOrExportSpecifier - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { >ExportAssignment : ExportAssignment ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement isExportEquals?: boolean; @@ -2421,10 +2413,9 @@ declare module "typescript" { hasTrailingNewLine?: boolean; >hasTrailingNewLine : boolean } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { >SourceFile : SourceFile >Declaration : Declaration ->ExportContainer : ExportContainer statements: NodeArray; >statements : NodeArray @@ -3060,8 +3051,8 @@ declare module "typescript" { >EmitResolver : EmitResolver getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration) => string ->node : EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration +>getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string +>node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration >ModuleDeclaration : ModuleDeclaration >EnumDeclaration : EnumDeclaration >ImportDeclaration : ImportDeclaration @@ -3072,8 +3063,8 @@ declare module "typescript" { >node : Identifier >Identifier : Identifier - getExportAssignmentName(node: SourceFile): string; ->getExportAssignmentName : (node: SourceFile) => string + hasExportDefaultValue(node: SourceFile): boolean; +>hasExportDefaultValue : (node: SourceFile) => boolean >node : SourceFile >SourceFile : SourceFile @@ -3250,6 +3241,9 @@ declare module "typescript" { Optional = 536870912, >Optional : SymbolFlags + ExportStar = 1073741824, +>ExportStar : SymbolFlags + Enum = 384, >Enum : SymbolFlags @@ -3414,13 +3408,6 @@ declare module "typescript" { referenced?: boolean; >referenced : boolean - exportAssignmentChecked?: boolean; ->exportAssignmentChecked : boolean - - exportAssignmentSymbol?: Symbol; ->exportAssignmentSymbol : Symbol ->Symbol : Symbol - unionType?: UnionType; >unionType : UnionType >UnionType : UnionType @@ -3428,6 +3415,9 @@ declare module "typescript" { resolvedExports?: SymbolTable; >resolvedExports : SymbolTable >SymbolTable : SymbolTable + + exportsChecked?: boolean; +>exportsChecked : boolean } interface TransientSymbol extends Symbol, SymbolLinks { >TransientSymbol : TransientSymbol diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 4b93c8554ec..5bd28a4c187 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -781,10 +781,7 @@ declare module "typescript" { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -809,7 +806,7 @@ declare module "typescript" { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -824,7 +821,7 @@ declare module "typescript" { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { isExportEquals?: boolean; expression: Expression; } @@ -834,7 +831,7 @@ declare module "typescript" { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -998,7 +995,7 @@ declare module "typescript" { interface EmitResolver { getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; + hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; @@ -1042,6 +1039,7 @@ declare module "typescript" { Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -1095,10 +1093,9 @@ declare module "typescript" { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index af90a31bebb..f7797f07d68 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -2429,18 +2429,10 @@ declare module "typescript" { >NodeArray : NodeArray >EnumMember : EnumMember } - interface ExportContainer { ->ExportContainer : ExportContainer - - exportStars?: ExportDeclaration[]; ->exportStars : ExportDeclaration[] ->ExportDeclaration : ExportDeclaration - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { >ModuleDeclaration : ModuleDeclaration >Declaration : Declaration >ModuleElement : ModuleElement ->ExportContainer : ExportContainer name: Identifier | LiteralExpression; >name : Identifier | LiteralExpression @@ -2518,9 +2510,9 @@ declare module "typescript" { >name : Identifier >Identifier : Identifier } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { >ExportDeclaration : ExportDeclaration ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement exportClause?: NamedExports; @@ -2568,9 +2560,9 @@ declare module "typescript" { >ExportSpecifier : ImportOrExportSpecifier >ImportOrExportSpecifier : ImportOrExportSpecifier - interface ExportAssignment extends Statement, ModuleElement { + interface ExportAssignment extends Declaration, ModuleElement { >ExportAssignment : ExportAssignment ->Statement : Statement +>Declaration : Declaration >ModuleElement : ModuleElement isExportEquals?: boolean; @@ -2594,10 +2586,9 @@ declare module "typescript" { hasTrailingNewLine?: boolean; >hasTrailingNewLine : boolean } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { >SourceFile : SourceFile >Declaration : Declaration ->ExportContainer : ExportContainer statements: NodeArray; >statements : NodeArray @@ -3233,8 +3224,8 @@ declare module "typescript" { >EmitResolver : EmitResolver getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration) => string ->node : EnumDeclaration | ExportDeclaration | ModuleDeclaration | ImportDeclaration +>getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string +>node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration >ModuleDeclaration : ModuleDeclaration >EnumDeclaration : EnumDeclaration >ImportDeclaration : ImportDeclaration @@ -3245,8 +3236,8 @@ declare module "typescript" { >node : Identifier >Identifier : Identifier - getExportAssignmentName(node: SourceFile): string; ->getExportAssignmentName : (node: SourceFile) => string + hasExportDefaultValue(node: SourceFile): boolean; +>hasExportDefaultValue : (node: SourceFile) => boolean >node : SourceFile >SourceFile : SourceFile @@ -3423,6 +3414,9 @@ declare module "typescript" { Optional = 536870912, >Optional : SymbolFlags + ExportStar = 1073741824, +>ExportStar : SymbolFlags + Enum = 384, >Enum : SymbolFlags @@ -3587,13 +3581,6 @@ declare module "typescript" { referenced?: boolean; >referenced : boolean - exportAssignmentChecked?: boolean; ->exportAssignmentChecked : boolean - - exportAssignmentSymbol?: Symbol; ->exportAssignmentSymbol : Symbol ->Symbol : Symbol - unionType?: UnionType; >unionType : UnionType >UnionType : UnionType @@ -3601,6 +3588,9 @@ declare module "typescript" { resolvedExports?: SymbolTable; >resolvedExports : SymbolTable >SymbolTable : SymbolTable + + exportsChecked?: boolean; +>exportsChecked : boolean } interface TransientSymbol extends Symbol, SymbolLinks { >TransientSymbol : TransientSymbol diff --git a/tests/baselines/reference/ExportAssignment7.errors.txt b/tests/baselines/reference/ExportAssignment7.errors.txt index 6ba0f480e7f..b72ca2d4a72 100644 --- a/tests/baselines/reference/ExportAssignment7.errors.txt +++ b/tests/baselines/reference/ExportAssignment7.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2304: Cannot find name 'B'. tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements. +tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'. ==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ==== @@ -11,6 +11,6 @@ tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignme export = B; ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'B'. - ~~~~~~~~~~~ -!!! error TS2309: An export assignment cannot be used in a module with other exported elements. \ No newline at end of file +!!! error TS2309: An export assignment cannot be used in a module with other exported elements. + ~ +!!! error TS2304: Cannot find name 'B'. \ No newline at end of file diff --git a/tests/baselines/reference/ExportAssignment8.errors.txt b/tests/baselines/reference/ExportAssignment8.errors.txt index 4dc35a9f0b7..4536f37bb81 100644 --- a/tests/baselines/reference/ExportAssignment8.errors.txt +++ b/tests/baselines/reference/ExportAssignment8.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2304: Cannot find name 'B'. tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements. +tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'. ==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ==== @@ -8,9 +8,9 @@ tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignme ~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'B'. - ~~~~~~~~~~~ !!! error TS2309: An export assignment cannot be used in a module with other exported elements. + ~ +!!! error TS2304: Cannot find name 'B'. export class C { } \ No newline at end of file diff --git a/tests/baselines/reference/aliasBug.errors.txt b/tests/baselines/reference/aliasBug.errors.txt index 92b63e41b68..398b093aa88 100644 --- a/tests/baselines/reference/aliasBug.errors.txt +++ b/tests/baselines/reference/aliasBug.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/aliasBug.ts(17,10): error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. +tests/cases/compiler/aliasBug.ts(17,15): error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. ==== tests/cases/compiler/aliasBug.ts (1 errors) ==== @@ -19,7 +19,7 @@ tests/cases/compiler/aliasBug.ts(17,10): error TS2305: Module 'foo.bar.baz' has var p1: provide.Provide; // error here, but should be okay var p2: foo.Provide; var p3:booz.bar; - ~~~~~~~~ + ~~~ !!! error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. var p22 = new provide.Provide(); } diff --git a/tests/baselines/reference/aliasErrors.errors.txt b/tests/baselines/reference/aliasErrors.errors.txt index a4c71fa9c5a..ffc114f80e3 100644 --- a/tests/baselines/reference/aliasErrors.errors.txt +++ b/tests/baselines/reference/aliasErrors.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/aliasErrors.ts(11,1): error TS2304: Cannot find name 'no'. -tests/cases/compiler/aliasErrors.ts(12,1): error TS2304: Cannot find name 'no'. +tests/cases/compiler/aliasErrors.ts(11,12): error TS2304: Cannot find name 'no'. +tests/cases/compiler/aliasErrors.ts(12,13): error TS2304: Cannot find name 'no'. tests/cases/compiler/aliasErrors.ts(13,12): error TS1003: Identifier expected. tests/cases/compiler/aliasErrors.ts(14,12): error TS1003: Identifier expected. tests/cases/compiler/aliasErrors.ts(15,12): error TS1003: Identifier expected. -tests/cases/compiler/aliasErrors.ts(16,1): error TS2304: Cannot find name 'undefined'. -tests/cases/compiler/aliasErrors.ts(26,10): error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. +tests/cases/compiler/aliasErrors.ts(16,12): error TS2304: Cannot find name 'undefined'. +tests/cases/compiler/aliasErrors.ts(26,15): error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. ==== tests/cases/compiler/aliasErrors.ts (7 errors) ==== @@ -19,10 +19,10 @@ tests/cases/compiler/aliasErrors.ts(26,10): error TS2305: Module 'foo.bar.baz' h import beez = foo.bar; import m = no; - ~~~~~~~~~~~~~~ + ~~ !!! error TS2304: Cannot find name 'no'. import m2 = no.mod; - ~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2304: Cannot find name 'no'. import n = 5; ~ @@ -34,7 +34,7 @@ tests/cases/compiler/aliasErrors.ts(26,10): error TS2305: Module 'foo.bar.baz' h ~~~~ !!! error TS1003: Identifier expected. import r = undefined; - ~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~ !!! error TS2304: Cannot find name 'undefined'. @@ -46,7 +46,7 @@ tests/cases/compiler/aliasErrors.ts(26,10): error TS2305: Module 'foo.bar.baz' h var p1: provide.Provide; var p2: foo.Provide; var p3:booz.bar; - ~~~~~~~~ + ~~~ !!! error TS2305: Module 'foo.bar.baz' has no exported member 'bar'. var p22 = new provide.Provide(); } diff --git a/tests/baselines/reference/classExtendingQualifiedName.errors.txt b/tests/baselines/reference/classExtendingQualifiedName.errors.txt index 42eae691050..b63b3e23108 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.errors.txt +++ b/tests/baselines/reference/classExtendingQualifiedName.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/classExtendingQualifiedName.ts(5,21): error TS2305: Module 'M' has no exported member 'C'. +tests/cases/compiler/classExtendingQualifiedName.ts(5,23): error TS2305: Module 'M' has no exported member 'C'. ==== tests/cases/compiler/classExtendingQualifiedName.ts (1 errors) ==== @@ -7,7 +7,7 @@ tests/cases/compiler/classExtendingQualifiedName.ts(5,21): error TS2305: Module } class D extends M.C { - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'C'. } } \ No newline at end of file diff --git a/tests/baselines/reference/complicatedPrivacy.errors.txt b/tests/baselines/reference/complicatedPrivacy.errors.txt index e212ee21fb5..2ba3abbab8a 100644 --- a/tests/baselines/reference/complicatedPrivacy.errors.txt +++ b/tests/baselines/reference/complicatedPrivacy.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/complicatedPrivacy.ts(11,24): error TS1054: A 'get' accessor cannot have parameters. tests/cases/compiler/complicatedPrivacy.ts(35,5): error TS1170: A computed property name in a type literal must directly refer to a built-in symbol. tests/cases/compiler/complicatedPrivacy.ts(35,6): error TS2304: Cannot find name 'number'. -tests/cases/compiler/complicatedPrivacy.ts(73,49): error TS2305: Module 'mglo5' has no exported member 'i6'. +tests/cases/compiler/complicatedPrivacy.ts(73,55): error TS2305: Module 'mglo5' has no exported member 'i6'. ==== tests/cases/compiler/complicatedPrivacy.ts (4 errors) ==== @@ -84,7 +84,7 @@ tests/cases/compiler/complicatedPrivacy.ts(73,49): error TS2305: Module 'mglo5' export module m3 { export class c_pr implements mglo5.i5, mglo5.i6 { - ~~~~~~~~ + ~~ !!! error TS2305: Module 'mglo5' has no exported member 'i6'. f1() { return "Hello"; diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt index 6b394fec4d6..fa1c6bea381 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,1): error TS2304: Cannot find name 'module'. +tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,13): error TS2304: Cannot find name 'module'. tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(11,19): error TS1005: ';' expected. tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(22,35): error TS1005: ')' expected. tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(22,39): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. @@ -96,7 +96,7 @@ tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(261,1): error TS } import fs = module("fs"); - ~~~~~~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2304: Cannot find name 'module'. ~ !!! error TS1005: ';' expected. diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types index 15201baa487..94f3e57b1a6 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types @@ -42,23 +42,23 @@ module m2 { } var m2: { ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } (): m2.connectExport; >m2 : unknown ->connectExport : m2.connectExport +>connectExport : default.connectExport test1: m2.connectModule; ->test1 : m2.connectModule +>test1 : default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule test2(): m2.connectModule; ->test2 : () => m2.connectModule +>test2 : () => default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule }; export = m2; ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types index 70718471d50..ff496f678f2 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types @@ -7,7 +7,7 @@ declare module "express" { function express(): express.ExpressServer; >express : typeof express >express : unknown ->ExpressServer : express.ExpressServer +>ExpressServer : default.ExpressServer module express { >express : typeof express diff --git a/tests/baselines/reference/declareFileExportAssignment.types b/tests/baselines/reference/declareFileExportAssignment.types index f30586b07e3..5853663634c 100644 --- a/tests/baselines/reference/declareFileExportAssignment.types +++ b/tests/baselines/reference/declareFileExportAssignment.types @@ -27,24 +27,24 @@ module m2 { } var m2: { ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } (): m2.connectExport; >m2 : unknown ->connectExport : m2.connectExport +>connectExport : default.connectExport test1: m2.connectModule; ->test1 : m2.connectModule +>test1 : default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule test2(): m2.connectModule; ->test2 : () => m2.connectModule +>test2 : () => default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule }; export = m2; ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types index 675dc38c869..baa9fa1170c 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types @@ -28,24 +28,24 @@ module m2 { var x = 10, m2: { >x : number ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } (): m2.connectExport; >m2 : unknown ->connectExport : m2.connectExport +>connectExport : default.connectExport test1: m2.connectModule; ->test1 : m2.connectModule +>test1 : default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule test2(): m2.connectModule; ->test2 : () => m2.connectModule +>test2 : () => default.connectModule >m2 : unknown ->connectModule : m2.connectModule +>connectModule : default.connectModule }; export = m2; ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; } +>m2 : { (): default.connectExport; test1: default.connectModule; test2(): default.connectModule; } diff --git a/tests/baselines/reference/declareModifierOnImport1.errors.txt b/tests/baselines/reference/declareModifierOnImport1.errors.txt index e78b4973aa1..776f2c07bcb 100644 --- a/tests/baselines/reference/declareModifierOnImport1.errors.txt +++ b/tests/baselines/reference/declareModifierOnImport1.errors.txt @@ -1,10 +1,10 @@ tests/cases/compiler/declareModifierOnImport1.ts(1,1): error TS1079: A 'declare' modifier cannot be used with an import declaration. -tests/cases/compiler/declareModifierOnImport1.ts(1,1): error TS2304: Cannot find name 'b'. +tests/cases/compiler/declareModifierOnImport1.ts(1,20): error TS2304: Cannot find name 'b'. ==== tests/cases/compiler/declareModifierOnImport1.ts (2 errors) ==== declare import a = b; ~~~~~~~ !!! error TS1079: A 'declare' modifier cannot be used with an import declaration. - ~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'b'. \ No newline at end of file diff --git a/tests/baselines/reference/duplicateExportAssignments.errors.txt b/tests/baselines/reference/duplicateExportAssignments.errors.txt index 0052391f62c..1fc844fcaad 100644 --- a/tests/baselines/reference/duplicateExportAssignments.errors.txt +++ b/tests/baselines/reference/duplicateExportAssignments.errors.txt @@ -1,15 +1,15 @@ tests/cases/conformance/externalModules/foo1.ts(3,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/externalModules/foo1.ts(3,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo1.ts(4,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo2.ts(3,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo2.ts(4,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo3.ts(7,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo3.ts(8,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo4.ts(1,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo4.ts(8,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo5.ts(4,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo5.ts(5,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2308: A module cannot have more than one export assignment. +tests/cases/conformance/externalModules/foo1.ts(3,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo1.ts(4,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo2.ts(3,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo2.ts(4,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo3.ts(7,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo3.ts(8,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo4.ts(1,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo4.ts(8,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo5.ts(4,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo5.ts(5,1): error TS2300: Duplicate identifier 'default'. +tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2300: Duplicate identifier 'default'. ==== tests/cases/conformance/externalModules/foo1.ts (3 errors) ==== @@ -19,20 +19,20 @@ tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2308: A module can ~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = y; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. ==== tests/cases/conformance/externalModules/foo2.ts (2 errors) ==== var x = 10; class y {}; export = x; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = y; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. ==== tests/cases/conformance/externalModules/foo3.ts (2 errors) ==== module x { @@ -43,15 +43,15 @@ tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2308: A module can } export = x; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = y; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. ==== tests/cases/conformance/externalModules/foo4.ts (2 errors) ==== export = x; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. function x(){ return 42; } @@ -60,7 +60,7 @@ tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2308: A module can } export = y; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. ==== tests/cases/conformance/externalModules/foo5.ts (3 errors) ==== var x = 5; @@ -68,11 +68,11 @@ tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2308: A module can var z = {}; export = x; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = y; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = z; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types index dc4a19f345c..9087ac09633 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.types +++ b/tests/baselines/reference/exportAssignClassAndModule.types @@ -22,9 +22,9 @@ class Foo { >Foo : Foo x: Foo.Bar; ->x : Foo.Bar +>x : default.Bar >Foo : unknown ->Bar : Foo.Bar +>Bar : default.Bar } module Foo { >Foo : typeof Foo diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js index a22caca3689..ffa2fb9ba58 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.js +++ b/tests/baselines/reference/exportAssignNonIdentifier.js @@ -39,7 +39,6 @@ var Foo3 = (function () { return Foo3; })(); ; // Error, not an expression -module.exports = ; //// [foo4.js] module.exports = true; //// [foo5.js] diff --git a/tests/baselines/reference/exportEqualNamespaces.types b/tests/baselines/reference/exportEqualNamespaces.types index 0f3091c1b8a..b60ba5a85c0 100644 --- a/tests/baselines/reference/exportEqualNamespaces.types +++ b/tests/baselines/reference/exportEqualNamespaces.types @@ -12,7 +12,7 @@ interface server { (): server.Server; >server : unknown ->Server : server.Server +>Server : default.Server startTime: Date; >startTime : Date diff --git a/tests/baselines/reference/extBaseClass2.errors.txt b/tests/baselines/reference/extBaseClass2.errors.txt index 5e49a2dbc47..10c406b6ba0 100644 --- a/tests/baselines/reference/extBaseClass2.errors.txt +++ b/tests/baselines/reference/extBaseClass2.errors.txt @@ -1,11 +1,11 @@ -tests/cases/compiler/extBaseClass2.ts(2,29): error TS2305: Module 'M' has no exported member 'B'. +tests/cases/compiler/extBaseClass2.ts(2,31): error TS2305: Module 'M' has no exported member 'B'. tests/cases/compiler/extBaseClass2.ts(7,29): error TS2304: Cannot find name 'B'. ==== tests/cases/compiler/extBaseClass2.ts (2 errors) ==== module N { export class C4 extends M.B { - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'B'. } } diff --git a/tests/baselines/reference/genericFunduleInModule.errors.txt b/tests/baselines/reference/genericFunduleInModule.errors.txt index ca82f7d2425..752517667b0 100644 --- a/tests/baselines/reference/genericFunduleInModule.errors.txt +++ b/tests/baselines/reference/genericFunduleInModule.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/genericFunduleInModule.ts(8,8): error TS2305: Module 'A' has no exported member 'B'. +tests/cases/compiler/genericFunduleInModule.ts(8,10): error TS2305: Module 'A' has no exported member 'B'. ==== tests/cases/compiler/genericFunduleInModule.ts (1 errors) ==== @@ -10,6 +10,6 @@ tests/cases/compiler/genericFunduleInModule.ts(8,8): error TS2305: Module 'A' ha } var b: A.B; - ~~~ + ~ !!! error TS2305: Module 'A' has no exported member 'B'. A.B(1); \ No newline at end of file diff --git a/tests/baselines/reference/genericFunduleInModule2.errors.txt b/tests/baselines/reference/genericFunduleInModule2.errors.txt index b92b314ece7..156549e8190 100644 --- a/tests/baselines/reference/genericFunduleInModule2.errors.txt +++ b/tests/baselines/reference/genericFunduleInModule2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/genericFunduleInModule2.ts(11,8): error TS2305: Module 'A' has no exported member 'B'. +tests/cases/compiler/genericFunduleInModule2.ts(11,10): error TS2305: Module 'A' has no exported member 'B'. ==== tests/cases/compiler/genericFunduleInModule2.ts (1 errors) ==== @@ -13,6 +13,6 @@ tests/cases/compiler/genericFunduleInModule2.ts(11,8): error TS2305: Module 'A' } var b: A.B; - ~~~ + ~ !!! error TS2305: Module 'A' has no exported member 'B'. A.B(1); \ No newline at end of file diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt index 6c98d419dec..5ae71fa2a89 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt @@ -8,7 +8,7 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(14,23): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(14,27): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(16,25): error TS2314: Generic type 'C' requires 1 type argument(s). -tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(22,26): error TS2305: Module 'M' has no exported member 'C'. +tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(22,28): error TS2305: Module 'M' has no exported member 'C'. tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(23,28): error TS2314: Generic type 'E' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(25,30): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts(26,30): error TS2314: Generic type 'E' requires 1 type argument(s). @@ -57,7 +57,7 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc } declare class D2 extends M.C { } - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'C'. declare class D3 { } ~~~ diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt index 745da9aa106..2949ce52ce0 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt @@ -15,9 +15,9 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(18,38): error TS2314: Generic type 'I' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(20,17): error TS2314: Generic type 'I' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(23,21): error TS2314: Generic type 'I' requires 1 type argument(s). -tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(29,18): error TS2305: Module 'M' has no exported member 'C'. +tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(29,20): error TS2305: Module 'M' has no exported member 'C'. tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(30,24): error TS2314: Generic type 'E' requires 1 type argument(s). -tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(31,22): error TS2305: Module 'M' has no exported member 'C'. +tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(31,24): error TS2305: Module 'M' has no exported member 'C'. tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(33,22): error TS2314: Generic type 'I' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(34,22): error TS2314: Generic type 'E' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts(36,10): error TS2304: Cannot find name 'C'. @@ -88,13 +88,13 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc } class D2 extends M.C { } - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'C'. interface D3 { } ~~~ !!! error TS2314: Generic type 'E' requires 1 type argument(s). interface I2 extends M.C { } - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'C'. function h(x: T) { } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt index 1fec52356a2..c0e41374527 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt @@ -8,7 +8,7 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(14,23): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(14,27): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(16,25): error TS2314: Generic type 'C' requires 1 type argument(s). -tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(22,26): error TS2305: Module 'M' has no exported member 'C'. +tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(22,28): error TS2305: Module 'M' has no exported member 'C'. tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(23,28): error TS2314: Generic type 'E' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(25,30): error TS2314: Generic type 'C' requires 1 type argument(s). tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts(26,30): error TS2314: Generic type 'E' requires 1 type argument(s). @@ -57,7 +57,7 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenc } declare class D2 extends M.C { } - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'C'. declare class D3 { } ~~~ diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt index a11b0f0ad9e..c25aca342ca 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt @@ -11,12 +11,12 @@ tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(21 declare function _(value: Array): _; ~ !!! error TS2300: Duplicate identifier '_'. - ~~~~ + ~ !!! error TS2304: Cannot find name '_'. declare function _(value: T): _; ~ !!! error TS2300: Duplicate identifier '_'. - ~~~~ + ~ !!! error TS2304: Cannot find name '_'. declare module _ { diff --git a/tests/baselines/reference/importAnImport.errors.txt b/tests/baselines/reference/importAnImport.errors.txt index 662655d3a3e..5f79b21f375 100644 --- a/tests/baselines/reference/importAnImport.errors.txt +++ b/tests/baselines/reference/importAnImport.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/importAnImport.ts(6,5): error TS2305: Module 'c.a.b' has no exported member 'ma'. +tests/cases/compiler/importAnImport.ts(6,23): error TS2305: Module 'c.a.b' has no exported member 'ma'. ==== tests/cases/compiler/importAnImport.ts (1 errors) ==== @@ -8,6 +8,6 @@ tests/cases/compiler/importAnImport.ts(6,5): error TS2305: Module 'c.a.b' has no module m0 { import m8 = c.a.b.ma; - ~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2305: Module 'c.a.b' has no exported member 'ma'. } \ No newline at end of file diff --git a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt index 19d30ae1b63..b7f60881e6e 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt +++ b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/importDeclWithClassModifiers.ts(5,1): error TS2305: Module 'x' has no exported member 'c'. tests/cases/compiler/importDeclWithClassModifiers.ts(5,8): error TS1044: 'public' modifier cannot appear on a module element. -tests/cases/compiler/importDeclWithClassModifiers.ts(6,1): error TS2305: Module 'x' has no exported member 'c'. +tests/cases/compiler/importDeclWithClassModifiers.ts(5,28): error TS2305: Module 'x' has no exported member 'c'. tests/cases/compiler/importDeclWithClassModifiers.ts(6,8): error TS1044: 'private' modifier cannot appear on a module element. -tests/cases/compiler/importDeclWithClassModifiers.ts(7,1): error TS2305: Module 'x' has no exported member 'c'. +tests/cases/compiler/importDeclWithClassModifiers.ts(6,29): error TS2305: Module 'x' has no exported member 'c'. tests/cases/compiler/importDeclWithClassModifiers.ts(7,8): error TS1044: 'static' modifier cannot appear on a module element. +tests/cases/compiler/importDeclWithClassModifiers.ts(7,28): error TS2305: Module 'x' has no exported member 'c'. ==== tests/cases/compiler/importDeclWithClassModifiers.ts (6 errors) ==== @@ -12,19 +12,19 @@ tests/cases/compiler/importDeclWithClassModifiers.ts(7,8): error TS1044: 'static } } export public import a = x.c; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2305: Module 'x' has no exported member 'c'. ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module element. - export private import b = x.c; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2305: Module 'x' has no exported member 'c'. + export private import b = x.c; ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module element. - export static import c = x.c; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2305: Module 'x' has no exported member 'c'. + export static import c = x.c; ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module element. + ~ +!!! error TS2305: Module 'x' has no exported member 'c'. var b: a; \ No newline at end of file diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt index dc7462a699f..56da8354977 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt +++ b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS2305: Module 'x' has no exported member 'c'. tests/cases/compiler/importDeclWithDeclareModifier.ts(5,9): error TS1029: 'export' modifier must precede 'declare' modifier. +tests/cases/compiler/importDeclWithDeclareModifier.ts(5,29): error TS2305: Module 'x' has no exported member 'c'. ==== tests/cases/compiler/importDeclWithDeclareModifier.ts (3 errors) ==== @@ -11,9 +11,9 @@ tests/cases/compiler/importDeclWithDeclareModifier.ts(5,9): error TS1029: 'expor declare export import a = x.c; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2305: Module 'x' has no exported member 'c'. ~~~~~~ !!! error TS1029: 'export' modifier must precede 'declare' modifier. + ~ +!!! error TS2305: Module 'x' has no exported member 'c'. var b: a; \ No newline at end of file diff --git a/tests/baselines/reference/importDeclWithExportModifier.errors.txt b/tests/baselines/reference/importDeclWithExportModifier.errors.txt index e1d75496a39..9fb53fbd3ea 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.errors.txt +++ b/tests/baselines/reference/importDeclWithExportModifier.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/importDeclWithExportModifier.ts(5,1): error TS2305: Module 'x' has no exported member 'c'. +tests/cases/compiler/importDeclWithExportModifier.ts(5,21): error TS2305: Module 'x' has no exported member 'c'. ==== tests/cases/compiler/importDeclWithExportModifier.ts (1 errors) ==== @@ -7,7 +7,7 @@ tests/cases/compiler/importDeclWithExportModifier.ts(5,1): error TS2305: Module } } export import a = x.c; - ~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2305: Module 'x' has no exported member 'c'. var b: a; \ No newline at end of file diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt index b7d938fbd58..4d2084b7f08 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts(5,1): error TS2305: Module 'x' has no exported member 'c'. +tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts(5,21): error TS2305: Module 'x' has no exported member 'c'. tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts(6,1): error TS2309: An export assignment cannot be used in a module with other exported elements. @@ -8,7 +8,7 @@ tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts(6,1): er } } export import a = x.c; - ~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2305: Module 'x' has no exported member 'c'. export = x; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt index 2ffd16ecbf2..8948c67f78b 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt +++ b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt @@ -17,6 +17,6 @@ tests/cases/compiler/importedModuleAddToGlobal.ts(15,23): error TS2304: Cannot f module C { import a = A; function hello(): b.B { return null; } - ~~~ + ~ !!! error TS2304: Cannot find name 'b'. } \ No newline at end of file diff --git a/tests/baselines/reference/innerAliases.errors.txt b/tests/baselines/reference/innerAliases.errors.txt index b5135c19d12..e4699c0825b 100644 --- a/tests/baselines/reference/innerAliases.errors.txt +++ b/tests/baselines/reference/innerAliases.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/innerAliases.ts(19,8): error TS2305: Module 'D' has no exported member 'inner'. +tests/cases/compiler/innerAliases.ts(19,10): error TS2305: Module 'D' has no exported member 'inner'. tests/cases/compiler/innerAliases.ts(21,11): error TS2339: Property 'inner' does not exist on type 'typeof D'. @@ -22,7 +22,7 @@ tests/cases/compiler/innerAliases.ts(21,11): error TS2339: Property 'inner' does } var c: D.inner.Class1; - ~~~~~~~~~~~~~~ + ~~~~~ !!! error TS2305: Module 'D' has no exported member 'inner'. c = new D.inner.Class1(); diff --git a/tests/baselines/reference/instantiateTypeParameter.errors.txt b/tests/baselines/reference/instantiateTypeParameter.errors.txt index e8685251f9c..d3e30665b22 100644 --- a/tests/baselines/reference/instantiateTypeParameter.errors.txt +++ b/tests/baselines/reference/instantiateTypeParameter.errors.txt @@ -8,7 +8,7 @@ tests/cases/compiler/instantiateTypeParameter.ts(3,1): error TS1128: Declaration var x: T<>; ~~~ !!! error TS1131: Property or signature expected. - ~~~ + ~ !!! error TS2304: Cannot find name 'T'. } ~ diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt index 9b5bf66844d..7bd34f1d5d3 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(11,8): error TS2305: Module '"tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. +tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(11,10): error TS2305: Module '"tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. ==== tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== @@ -13,5 +13,5 @@ tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessE } var x: c.b; - ~~~ + ~ !!! error TS2305: Module '"tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt index 33bb8f16331..865929890c0 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(16,15): error TS2305: Module '"tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. +tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(16,17): error TS2305: Module '"tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. ==== tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== @@ -18,5 +18,5 @@ tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExp export var z: c.b.I; - ~~~~~ + ~ !!! error TS2305: Module '"tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. \ No newline at end of file diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt index ea582635856..7794fb027d7 100644 --- a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt +++ b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(5,1): error TS2304: Cannot find name 'V'. -tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(11,1): error TS2304: Cannot find name 'C'. -tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(17,1): error TS2304: Cannot find name 'E'. -tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,1): error TS2304: Cannot find name 'I'. +tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(5,12): error TS2304: Cannot find name 'V'. +tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(11,12): error TS2304: Cannot find name 'C'. +tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(17,12): error TS2304: Cannot find name 'E'. +tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,12): error TS2304: Cannot find name 'I'. ==== tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts (4 errors) ==== @@ -10,7 +10,7 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde var V = 12; import v = V; - ~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'V'. class C { @@ -18,7 +18,7 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde } import c = C; - ~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'C'. enum E { @@ -26,7 +26,7 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde } import e = E; - ~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'E'. interface I { @@ -34,6 +34,6 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde } import i = I; - ~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'I'. \ No newline at end of file diff --git a/tests/baselines/reference/invalidInstantiatedModule.errors.txt b/tests/baselines/reference/invalidInstantiatedModule.errors.txt index 5a8ac069803..8bd7e6492c0 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.errors.txt +++ b/tests/baselines/reference/invalidInstantiatedModule.errors.txt @@ -20,7 +20,7 @@ tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedMo var m = M2; var p: m.Point; // Error - ~~~~~~~ + ~ !!! error TS2304: Cannot find name 'm'. diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt b/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt index 3e52f51445d..702beffa290 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/moduleClassArrayCodeGenTest.ts(10,9): error TS2305: Module 'M' has no exported member 'B'. +tests/cases/compiler/moduleClassArrayCodeGenTest.ts(10,11): error TS2305: Module 'M' has no exported member 'B'. ==== tests/cases/compiler/moduleClassArrayCodeGenTest.ts (1 errors) ==== @@ -12,5 +12,5 @@ tests/cases/compiler/moduleClassArrayCodeGenTest.ts(10,9): error TS2305: Module var t: M.A[] = []; var t2: M.B[] = []; - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'B'. \ No newline at end of file diff --git a/tests/baselines/reference/moduleImport.errors.txt b/tests/baselines/reference/moduleImport.errors.txt index 95163ef119f..7b18c80ba24 100644 --- a/tests/baselines/reference/moduleImport.errors.txt +++ b/tests/baselines/reference/moduleImport.errors.txt @@ -1,11 +1,14 @@ -tests/cases/compiler/moduleImport.ts(2,2): error TS2305: Module 'X' has no exported member 'Y'. +tests/cases/compiler/moduleImport.ts(2,17): error TS2305: Module 'X' has no exported member 'Y'. +tests/cases/compiler/moduleImport.ts(2,17): error TS2339: Property 'Y' does not exist on type 'typeof X'. -==== tests/cases/compiler/moduleImport.ts (1 errors) ==== +==== tests/cases/compiler/moduleImport.ts (2 errors) ==== module A.B.C { import XYZ = X.Y.Z; - ~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2305: Module 'X' has no exported member 'Y'. + ~ +!!! error TS2339: Property 'Y' does not exist on type 'typeof X'. export function ping(x: number) { if (x>0) XYZ.pong (x-1); } diff --git a/tests/baselines/reference/moduleNewExportBug.errors.txt b/tests/baselines/reference/moduleNewExportBug.errors.txt index 829fe83ae7b..779d51e4699 100644 --- a/tests/baselines/reference/moduleNewExportBug.errors.txt +++ b/tests/baselines/reference/moduleNewExportBug.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/moduleNewExportBug.ts(10,9): error TS2305: Module 'mod1' has no exported member 'C'. +tests/cases/compiler/moduleNewExportBug.ts(10,14): error TS2305: Module 'mod1' has no exported member 'C'. ==== tests/cases/compiler/moduleNewExportBug.ts (1 errors) ==== @@ -12,7 +12,7 @@ tests/cases/compiler/moduleNewExportBug.ts(10,9): error TS2305: Module 'mod1' ha } var c : mod1.C; // ERROR: C should not be visible - ~~~~~~ + ~ !!! error TS2305: Module 'mod1' has no exported member 'C'. diff --git a/tests/baselines/reference/moduleVisibilityTest2.errors.txt b/tests/baselines/reference/moduleVisibilityTest2.errors.txt index 9620b48cdfb..9ff92604392 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.errors.txt +++ b/tests/baselines/reference/moduleVisibilityTest2.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/moduleVisibilityTest2.ts(57,17): error TS2304: Cannot find name 'x'. tests/cases/compiler/moduleVisibilityTest2.ts(58,21): error TS2339: Property 'E' does not exist on type 'typeof M'. -tests/cases/compiler/moduleVisibilityTest2.ts(61,14): error TS2305: Module 'M' has no exported member 'I'. -tests/cases/compiler/moduleVisibilityTest2.ts(61,21): error TS2305: Module 'M' has no exported member 'I'. +tests/cases/compiler/moduleVisibilityTest2.ts(61,16): error TS2305: Module 'M' has no exported member 'I'. +tests/cases/compiler/moduleVisibilityTest2.ts(61,23): error TS2305: Module 'M' has no exported member 'I'. tests/cases/compiler/moduleVisibilityTest2.ts(64,11): error TS2339: Property 'x' does not exist on type 'typeof M'. tests/cases/compiler/moduleVisibilityTest2.ts(65,15): error TS2339: Property 'E' does not exist on type 'typeof M'. @@ -72,9 +72,9 @@ tests/cases/compiler/moduleVisibilityTest2.ts(65,15): error TS2339: Property 'E' } var cprime : M.I = null; - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'I'. - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'I'. var c = new M.C(); diff --git a/tests/baselines/reference/moduleVisibilityTest3.errors.txt b/tests/baselines/reference/moduleVisibilityTest3.errors.txt index 581d96fc1df..0ad8a789a8f 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.errors.txt +++ b/tests/baselines/reference/moduleVisibilityTest3.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/moduleVisibilityTest3.ts(20,22): error TS2304: Cannot find name 'modes'. -tests/cases/compiler/moduleVisibilityTest3.ts(20,33): error TS2305: Module '_modes' has no exported member 'Mode'. -tests/cases/compiler/moduleVisibilityTest3.ts(21,16): error TS2305: Module '_modes' has no exported member 'Mode'. +tests/cases/compiler/moduleVisibilityTest3.ts(20,39): error TS2305: Module '_modes' has no exported member 'Mode'. +tests/cases/compiler/moduleVisibilityTest3.ts(21,22): error TS2305: Module '_modes' has no exported member 'Mode'. ==== tests/cases/compiler/moduleVisibilityTest3.ts (3 errors) ==== @@ -26,10 +26,10 @@ tests/cases/compiler/moduleVisibilityTest3.ts(21,16): error TS2305: Module '_mod constructor(p1: modes, p2: modes.Mode) {// should be an error on p2 - it's not exported ~~~~~ !!! error TS2304: Cannot find name 'modes'. - ~~~~~~~~~~ + ~~~~ !!! error TS2305: Module '_modes' has no exported member 'Mode'. var x:modes.Mode; - ~~~~~~~~~~ + ~~~~ !!! error TS2305: Module '_modes' has no exported member 'Mode'. } diff --git a/tests/baselines/reference/multipleExportAssignments.errors.txt b/tests/baselines/reference/multipleExportAssignments.errors.txt index d5af20073c7..604236a0516 100644 --- a/tests/baselines/reference/multipleExportAssignments.errors.txt +++ b/tests/baselines/reference/multipleExportAssignments.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/multipleExportAssignments.ts(13,1): error TS2308: A module cannot have more than one export assignment. -tests/cases/compiler/multipleExportAssignments.ts(14,1): error TS2308: A module cannot have more than one export assignment. +tests/cases/compiler/multipleExportAssignments.ts(13,1): error TS2300: Duplicate identifier 'default'. +tests/cases/compiler/multipleExportAssignments.ts(14,1): error TS2300: Duplicate identifier 'default'. ==== tests/cases/compiler/multipleExportAssignments.ts (2 errors) ==== @@ -17,9 +17,9 @@ tests/cases/compiler/multipleExportAssignments.ts(14,1): error TS2308: A module }; export = server; ~~~~~~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = connectExport; ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. \ No newline at end of file diff --git a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.errors.txt b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.errors.txt index c2475f0ff14..ac076e7016c 100644 --- a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.errors.txt +++ b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts(4,5): error TS2308: A module cannot have more than one export assignment. -tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts(5,5): error TS2308: A module cannot have more than one export assignment. +tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts(4,5): error TS2300: Duplicate identifier 'default'. +tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts(5,5): error TS2300: Duplicate identifier 'default'. ==== tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts (2 errors) ==== @@ -8,8 +8,8 @@ tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts(5,5): erro var b: number; export = a; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. export = b; ~~~~~~~~~~~ -!!! error TS2308: A module cannot have more than one export assignment. +!!! error TS2300: Duplicate identifier 'default'. } \ No newline at end of file diff --git a/tests/baselines/reference/parser519458.errors.txt b/tests/baselines/reference/parser519458.errors.txt index 792d0463d4c..e618e38723f 100644 --- a/tests/baselines/reference/parser519458.errors.txt +++ b/tests/baselines/reference/parser519458.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/parser/ecmascript5/RegressionTests/parser519458.ts(1,1): error TS2304: Cannot find name 'module'. +tests/cases/conformance/parser/ecmascript5/RegressionTests/parser519458.ts(1,15): error TS2304: Cannot find name 'module'. tests/cases/conformance/parser/ecmascript5/RegressionTests/parser519458.ts(1,21): error TS1005: ';' expected. ==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser519458.ts (2 errors) ==== import rect = module("rect"); var bar = new rect.Rect(); - ~~~~~~~~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2304: Cannot find name 'module'. ~ !!! error TS1005: ';' expected. diff --git a/tests/baselines/reference/parserExportAssignment1.errors.txt b/tests/baselines/reference/parserExportAssignment1.errors.txt index 79edd5069f0..e6711946d25 100644 --- a/tests/baselines/reference/parserExportAssignment1.errors.txt +++ b/tests/baselines/reference/parserExportAssignment1.errors.txt @@ -1,10 +1,10 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS2304: Cannot find name 'foo'. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,10): error TS2304: Cannot find name 'foo'. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (2 errors) ==== export = foo ~~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. - ~~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment2.errors.txt b/tests/baselines/reference/parserExportAssignment2.errors.txt index f9ad377bbd7..8a376dbe6d3 100644 --- a/tests/baselines/reference/parserExportAssignment2.errors.txt +++ b/tests/baselines/reference/parserExportAssignment2.errors.txt @@ -1,10 +1,10 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS2304: Cannot find name 'foo'. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,10): error TS2304: Cannot find name 'foo'. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (2 errors) ==== export = foo; ~~~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. - ~~~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment3.js b/tests/baselines/reference/parserExportAssignment3.js index 02a65d82817..13e04c3607a 100644 --- a/tests/baselines/reference/parserExportAssignment3.js +++ b/tests/baselines/reference/parserExportAssignment3.js @@ -2,4 +2,3 @@ export = //// [parserExportAssignment3.js] -module.exports = ; diff --git a/tests/baselines/reference/parserExportAssignment4.js b/tests/baselines/reference/parserExportAssignment4.js index f5d5ebab609..7cfd8206dbe 100644 --- a/tests/baselines/reference/parserExportAssignment4.js +++ b/tests/baselines/reference/parserExportAssignment4.js @@ -2,4 +2,3 @@ export = ; //// [parserExportAssignment4.js] -module.exports = ; diff --git a/tests/baselines/reference/parserExportAssignment6.errors.txt b/tests/baselines/reference/parserExportAssignment6.errors.txt index 41b5baed87b..fa49490a7f8 100644 --- a/tests/baselines/reference/parserExportAssignment6.errors.txt +++ b/tests/baselines/reference/parserExportAssignment6.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts(2,5): error TS2304: Cannot find name 'A'. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts(2,14): error TS2304: Cannot find name 'A'. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts (1 errors) ==== declare module "M" { export = A; - ~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'A'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment7.errors.txt b/tests/baselines/reference/parserExportAssignment7.errors.txt index 401eb1355a2..a6650c23540 100644 --- a/tests/baselines/reference/parserExportAssignment7.errors.txt +++ b/tests/baselines/reference/parserExportAssignment7.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,1): error TS2304: Cannot find name 'B'. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (3 errors) ==== @@ -11,6 +11,6 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm export = B; ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'B'. - ~~~~~~~~~~~ -!!! error TS2309: An export assignment cannot be used in a module with other exported elements. \ No newline at end of file +!!! error TS2309: An export assignment cannot be used in a module with other exported elements. + ~ +!!! error TS2304: Cannot find name 'B'. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment8.errors.txt b/tests/baselines/reference/parserExportAssignment8.errors.txt index 2ad8e7b2739..ac8feeeec58 100644 --- a/tests/baselines/reference/parserExportAssignment8.errors.txt +++ b/tests/baselines/reference/parserExportAssignment8.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS2304: Cannot find name 'B'. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements. +tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'. ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (3 errors) ==== @@ -8,9 +8,9 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm ~~~~~~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'B'. - ~~~~~~~~~~~ !!! error TS2309: An export assignment cannot be used in a module with other exported elements. + ~ +!!! error TS2304: Cannot find name 'B'. export class C { } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint2.errors.txt b/tests/baselines/reference/parserGenericConstraint2.errors.txt index bd79178b5e1..a1548d81d9a 100644 --- a/tests/baselines/reference/parserGenericConstraint2.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint2.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts( 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 8ab92c1e271..1dc7ea4e080 100644 --- a/tests/baselines/reference/parserGenericConstraint3.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint3.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts( 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 cea9267587f..3109bca9a2f 100644 --- a/tests/baselines/reference/parserGenericConstraint4.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint4.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts( 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 0bf17ca4213..db8fea938b8 100644 --- a/tests/baselines/reference/parserGenericConstraint5.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint5.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts( 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 d8e082109f1..032ed7fafb3 100644 --- a/tests/baselines/reference/parserGenericConstraint6.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint6.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts( 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 0c97e9adff5..62dc8373e63 100644 --- a/tests/baselines/reference/parserGenericConstraint7.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint7.errors.txt @@ -6,6 +6,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts( 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/parserGenericsInInterfaceDeclaration1.errors.txt b/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.errors.txt index 1c27ba1afbf..a4abd191aeb 100644 --- a/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.errors.txt +++ b/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.errors.txt @@ -4,7 +4,7 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInInterfaceDec ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1.ts (1 errors) ==== interface I { v: A; - ~~~~ + ~ !!! error TS2304: Cannot find name 'A'. f1(): T; f2?(): T; diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.errors.txt b/tests/baselines/reference/parserGenericsInTypeContexts1.errors.txt index 5edf06ff762..8b9304d9165 100644 --- a/tests/baselines/reference/parserGenericsInTypeContexts1.errors.txt +++ b/tests/baselines/reference/parserGenericsInTypeContexts1.errors.txt @@ -12,9 +12,9 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts1.ts (10 errors) ==== class C extends A implements B { - ~~~~ + ~ !!! error TS2304: Cannot find name 'A'. - ~~~~ + ~ !!! error TS2304: Cannot find name 'B'. } @@ -22,26 +22,26 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts ~~~~ !!! error TS2315: Type 'C' is not generic. var v2: D = null; - ~~~~ + ~ !!! error TS2304: Cannot find name 'D'. var v3: E.F; - ~~~~~~ + ~ !!! error TS2304: Cannot find name 'E'. var v3: G.H.I; - ~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'G'. var v6: K[]; - ~~~~ + ~ !!! error TS2304: Cannot find name 'K'. function f1(a: E) { - ~~~~ + ~ !!! error TS2304: Cannot find name 'E'. } function f2(): F { - ~~~~ + ~ !!! error TS2304: Cannot find name 'F'. ~~~~ !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement. diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.errors.txt b/tests/baselines/reference/parserGenericsInTypeContexts2.errors.txt index be93850a07c..0ef716d1804 100644 --- a/tests/baselines/reference/parserGenericsInTypeContexts2.errors.txt +++ b/tests/baselines/reference/parserGenericsInTypeContexts2.errors.txt @@ -12,9 +12,9 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts2.ts (10 errors) ==== class C extends A, Y>> implements B, Y>> { - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'A'. - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'B'. } @@ -22,26 +22,26 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInTypeContexts ~~~~~~~~~~~~~~~~ !!! error TS2315: Type 'C' is not generic. var v2: D, Y>> = null; - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'D'. var v3: E.F, Y>>; - ~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'E'. var v4: G.H.I, Y>>; - ~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'G'. var v6: K, Y>>[]; - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'K'. function f1(a: E, Y>>) { - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'E'. } function f2(): F, Y>> { - ~~~~~~~~~~~~~~~~ + ~ !!! error TS2304: Cannot find name 'F'. ~~~~~~~~~~~~~~~~ !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement. diff --git a/tests/baselines/reference/parserGenericsInVariableDeclaration1.errors.txt b/tests/baselines/reference/parserGenericsInVariableDeclaration1.errors.txt index 6569cfe89bf..42f013cb250 100644 --- a/tests/baselines/reference/parserGenericsInVariableDeclaration1.errors.txt +++ b/tests/baselines/reference/parserGenericsInVariableDeclaration1.errors.txt @@ -8,22 +8,22 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInVariableDecl ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1.ts (6 errors) ==== var v : Foo = 1; - ~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. var v : Foo= 1; - ~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. var v : Foo> = 1; - ~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. var v : Foo>= 1; - ~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. var v : Foo>> = 1; - ~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. var v : Foo>>= 1; - ~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2304: Cannot find name 'Foo'. \ No newline at end of file diff --git a/tests/baselines/reference/parserImportDeclaration1.errors.txt b/tests/baselines/reference/parserImportDeclaration1.errors.txt index 51cfbea320b..ec3397cd196 100644 --- a/tests/baselines/reference/parserImportDeclaration1.errors.txt +++ b/tests/baselines/reference/parserImportDeclaration1.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/parser/ecmascript5/parserImportDeclaration1.ts(1,1): error TS2304: Cannot find name 'TypeScriptServices'. +tests/cases/conformance/parser/ecmascript5/parserImportDeclaration1.ts(1,21): error TS2304: Cannot find name 'TypeScriptServices'. ==== tests/cases/conformance/parser/ecmascript5/parserImportDeclaration1.ts (1 errors) ==== import TypeScript = TypeScriptServices.TypeScript; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScriptServices'. \ No newline at end of file diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt index 3b70ab37522..d39986c9c01 100644 --- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt +++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt @@ -8,9 +8,9 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpen ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts (5 errors) ==== class C { where(filter: Iterator): Query { - ~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Iterator'. - ~~~~~~~~ + ~~~~~ !!! error TS2304: Cannot find name 'Query'. return fromDoWhile(test => ~~~~~~~~~~~ diff --git a/tests/baselines/reference/parserRealSource14.errors.txt b/tests/baselines/reference/parserRealSource14.errors.txt index 85ed1e0a7d3..bc32a8e585b 100644 --- a/tests/baselines/reference/parserRealSource14.errors.txt +++ b/tests/baselines/reference/parserRealSource14.errors.txt @@ -1,30 +1,30 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(4,1): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(24,22): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(38,23): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(48,26): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(68,28): error TS2305: Module 'TypeScript' has no exported member 'NodeType'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(24,33): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(38,34): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(48,37): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(68,39): error TS2305: Module 'TypeScript' has no exported member 'NodeType'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(70,35): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(75,21): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(79,21): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(86,36): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(75,32): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(79,32): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(86,47): error TS2305: Module 'TypeScript' has no exported member 'AST'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(94,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(95,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(96,20): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(96,31): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(103,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(104,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(105,20): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(105,31): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(112,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(113,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(114,20): error TS2305: Module 'TypeScript' has no exported member 'ArgDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(114,31): error TS2305: Module 'TypeScript' has no exported member 'ArgDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(121,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(122,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(123,20): error TS2305: Module 'TypeScript' has no exported member 'VarDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(123,31): error TS2305: Module 'TypeScript' has no exported member 'VarDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(130,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(131,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(132,20): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(132,31): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(139,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(140,56): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(141,20): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(141,31): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(148,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(149,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(156,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. @@ -35,128 +35,128 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(172,65): error tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(173,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(174,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(175,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(176,20): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(177,20): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(178,20): error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(176,31): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(177,31): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(178,31): error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(185,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(186,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(191,61): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(192,28): error TS2339: Property 'hasFlag' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(192,38): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(192,49): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(192,109): error TS2339: Property 'ModuleFlags' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(197,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(198,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(199,20): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(199,31): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(200,28): error TS2339: Property 'hasFlag' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(200,38): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(200,49): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(200,113): error TS2339: Property 'ModuleFlags' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(205,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(206,20): error TS2305: Module 'TypeScript' has no exported member 'Script'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(206,31): error TS2305: Module 'TypeScript' has no exported member 'Script'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(211,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(212,20): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(212,31): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(217,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(218,20): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(218,31): error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(223,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(224,20): error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(224,31): error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(229,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(230,20): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(230,31): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(235,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(236,20): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(236,31): error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(241,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(242,19): error TS2305: Module 'TypeScript' has no exported member 'Block'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(242,30): error TS2305: Module 'TypeScript' has no exported member 'Block'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(247,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(248,19): error TS2305: Module 'TypeScript' has no exported member 'ForStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(248,30): error TS2305: Module 'TypeScript' has no exported member 'ForStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(253,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(254,19): error TS2305: Module 'TypeScript' has no exported member 'CaseStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(254,30): error TS2305: Module 'TypeScript' has no exported member 'CaseStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(259,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(260,19): error TS2305: Module 'TypeScript' has no exported member 'Try'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(260,30): error TS2305: Module 'TypeScript' has no exported member 'Try'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(265,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(266,19): error TS2305: Module 'TypeScript' has no exported member 'Catch'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(266,30): error TS2305: Module 'TypeScript' has no exported member 'Catch'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(271,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(272,19): error TS2305: Module 'TypeScript' has no exported member 'DoWhileStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(272,30): error TS2305: Module 'TypeScript' has no exported member 'DoWhileStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(277,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(278,19): error TS2305: Module 'TypeScript' has no exported member 'WhileStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(278,30): error TS2305: Module 'TypeScript' has no exported member 'WhileStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(283,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(284,19): error TS2305: Module 'TypeScript' has no exported member 'ForInStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(284,30): error TS2305: Module 'TypeScript' has no exported member 'ForInStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(289,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(290,19): error TS2305: Module 'TypeScript' has no exported member 'WithStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(290,30): error TS2305: Module 'TypeScript' has no exported member 'WithStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(295,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(296,19): error TS2305: Module 'TypeScript' has no exported member 'Finally'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(296,30): error TS2305: Module 'TypeScript' has no exported member 'Finally'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(301,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(302,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(303,19): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(303,30): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(308,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(309,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(310,19): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(311,19): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(310,30): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(311,30): error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(316,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(317,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(318,19): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(318,30): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(327,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(328,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(329,19): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(330,19): error TS2305: Module 'TypeScript' has no exported member 'ASTList'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(329,30): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(330,30): error TS2305: Module 'TypeScript' has no exported member 'ASTList'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(335,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(336,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(337,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(338,19): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(338,30): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(343,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(344,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(345,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(346,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(347,19): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(347,30): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(352,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(353,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(354,19): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(354,30): error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(359,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(360,19): error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(360,30): error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(365,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(366,19): error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(366,30): error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(371,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(377,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(378,19): error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(378,30): error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(383,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(384,19): error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(384,30): error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(393,61): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(394,19): error TS2305: Module 'TypeScript' has no exported member 'ASTList'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(394,30): error TS2305: Module 'TypeScript' has no exported member 'ASTList'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(399,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(400,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(401,19): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(401,30): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(406,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(407,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(408,19): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(408,30): error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(413,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(414,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(415,19): error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(415,30): error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(420,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(421,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(422,19): error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(422,30): error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(427,65): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(428,19): error TS2305: Module 'TypeScript' has no exported member 'Block'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(432,41): error TS2305: Module 'TypeScript' has no exported member 'ASTSpan'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(462,50): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(463,41): error TS2305: Module 'TypeScript' has no exported member 'Comment'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(478,34): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(478,58): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(428,30): error TS2305: Module 'TypeScript' has no exported member 'Block'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(432,52): error TS2305: Module 'TypeScript' has no exported member 'ASTSpan'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(462,61): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(463,52): error TS2305: Module 'TypeScript' has no exported member 'Comment'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(478,45): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(478,69): error TS2305: Module 'TypeScript' has no exported member 'AST'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(478,82): error TS2304: Cannot find name 'IAstWalker'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(489,21): error TS2304: Cannot find name 'hasFlag'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(490,49): error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(516,22): error TS2304: Cannot find name 'hasFlag'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(525,20): error TS2339: Property 'getAstWalkerFactory' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(533,51): error TS2305: Module 'TypeScript' has no exported member 'Script'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,25): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,49): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,73): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,97): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(533,62): error TS2305: Module 'TypeScript' has no exported member 'Script'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,36): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,60): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,84): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(535,108): error TS2305: Module 'TypeScript' has no exported member 'AST'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(551,20): error TS2339: Property 'getAstWalkerFactory' does not exist on type 'typeof TypeScript'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(558,34): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(558,84): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,34): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,58): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,82): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,35): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,59): error TS2305: Module 'TypeScript' has no exported member 'AST'. -tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,83): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(558,45): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(558,95): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,45): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,69): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(559,93): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,46): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,70): error TS2305: Module 'TypeScript' has no exported member 'AST'. +tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(565,94): error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error TS2339: Property 'getAstWalkerFactory' does not exist on type 'typeof TypeScript'. @@ -187,7 +187,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error // export class AstPath { public asts: TypeScript.AST[] = []; - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. public top: number = -1; @@ -203,7 +203,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error } public pop(): TypeScript.AST { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. var head = this.ast(); this.up(); @@ -215,7 +215,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error } public push(ast: TypeScript.AST) { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. while (this.asts.length > this.count()) { this.asts.pop(); @@ -237,7 +237,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error } public nodeType(): TypeScript.NodeType { - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'NodeType'. if (this.ast() == null) return TypeScript.NodeType.None; @@ -248,13 +248,13 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error public ast() { return AstPath.reverseIndexOf(this.asts, this.asts.length - (this.top + 1)); - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. } public parent() { return AstPath.reverseIndexOf(this.asts, this.asts.length - this.top); - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. } @@ -263,7 +263,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error } public get(index: number): TypeScript.AST { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. return this.asts[index]; } @@ -279,7 +279,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).name === this.ast()); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. } @@ -294,7 +294,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).name === this.ast()); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. } @@ -309,7 +309,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).id === this.ast()); - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ArgDecl'. } @@ -324,7 +324,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).id === this.ast()); - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'VarDecl'. } @@ -339,7 +339,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).name === this.ast()); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. } @@ -354,7 +354,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.parent()).name === this.ast()); - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. } @@ -411,13 +411,13 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. ((this.asts[this.top - 2]).isConstructor) && - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. ((this.asts[this.top - 2]).arguments === this.asts[this.top - 1]) && - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. ((this.asts[this.top - 4]).constructorDecl === this.asts[this.top - 2]); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. } @@ -441,7 +441,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error TypeScript.hasFlag((this.asts[this.top]).modFlags, TypeScript.ModuleFlags.IsWholeFile); ~~~~~~~ !!! error TS2339: Property 'hasFlag' does not exist on type 'typeof TypeScript'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. ~~~~~~~~~~~ !!! error TS2339: Property 'ModuleFlags' does not exist on type 'typeof TypeScript'. @@ -456,12 +456,12 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).members == this.asts[this.top - 0] && - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. TypeScript.hasFlag((this.asts[this.top - 1]).modFlags, TypeScript.ModuleFlags.IsWholeFile); ~~~~~~~ !!! error TS2339: Property 'hasFlag' does not exist on type 'typeof TypeScript'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. ~~~~~~~~~~~ !!! error TS2339: Property 'ModuleFlags' does not exist on type 'typeof TypeScript'. @@ -473,7 +473,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).bod == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Script'. } @@ -483,7 +483,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).caseList == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. } @@ -493,7 +493,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).members == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ModuleDeclaration'. } @@ -503,7 +503,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).members == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ClassDeclaration'. } @@ -513,7 +513,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).bod == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. } @@ -523,7 +523,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).members == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'InterfaceDeclaration'. } @@ -533,7 +533,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).statements == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~ + ~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Block'. } @@ -543,7 +543,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ForStatement'. } @@ -553,7 +553,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'CaseStatement'. } @@ -563,7 +563,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Try'. } @@ -573,7 +573,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~ + ~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Catch'. } @@ -583,7 +583,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'DoWhileStatement'. } @@ -593,7 +593,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'WhileStatement'. } @@ -603,7 +603,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ForInStatement'. } @@ -613,7 +613,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'WithStatement'. } @@ -623,7 +623,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Finally'. } @@ -636,7 +636,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 2]).caseList == this.asts[this.top - 1]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. } @@ -649,10 +649,10 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 2]).caseList == this.asts[this.top - 1] && - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. (this.asts[this.top - 2]).defaultCase == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'SwitchStatement'. } @@ -665,7 +665,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).operand == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. } @@ -682,10 +682,10 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).operand == this.asts[this.top - 0] && - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. (this.asts[this.top - 0]).members.length == 0; - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ASTList'. } @@ -701,7 +701,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 2]).operand == this.asts[this.top - 1]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. } @@ -720,7 +720,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 3]).operand == this.asts[this.top - 2]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. } @@ -733,7 +733,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).operand == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'UnaryExpression'. } @@ -743,7 +743,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).operand1 === this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. } @@ -753,7 +753,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).operand2 === this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'BinaryExpression'. } @@ -771,7 +771,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).thenBod == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. } @@ -781,7 +781,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).elseBod == this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IfStatement'. } @@ -795,7 +795,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top]).members.length === 1; - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ASTList'. } @@ -808,7 +808,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).arguments === this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. } @@ -821,7 +821,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 2]).arguments === this.asts[this.top - 1]; - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'FuncDecl'. } @@ -834,7 +834,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).arguments === this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. } @@ -847,7 +847,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).arguments === this.asts[this.top - 0]; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'CallExpression'. } @@ -857,13 +857,13 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 0]).isStatementBlock === false; - ~~~~~~~~~~~~~~~~ + ~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Block'. } } export function isValidAstNode(ast: TypeScript.ASTSpan): boolean { - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'ASTSpan'. if (ast === null) return false; @@ -895,10 +895,10 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error /// Return the stack of AST nodes containing "position" /// export function getAstPathToPosition(script: TypeScript.AST, pos: number, options = GetAstPathOptions.Default): TypeScript.AstPath { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. var lookInComments = (comments: TypeScript.Comment[]) => { - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Comment'. if (comments && comments.length > 0) { for (var i = 0; i < comments.length; i++) { @@ -915,9 +915,9 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error } var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. ~~~~~~~~~~ !!! error TS2304: Cannot find name 'IAstWalker'. @@ -984,17 +984,17 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error // This is used when "position" might be inside a comment or string, etc. // export function getTokenizationOffset(script: TypeScript.Script, position: number): number { - ~~~~~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'Script'. var bestOffset = 0; var pre = (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. if (TypeScript.isValidAstNode(cur)) { // Did we find a closer offset? @@ -1021,16 +1021,16 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error /// Simple function to Walk an AST using a simple callback function. /// export function walkAST(ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void ): void { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. var path: TypeScript.AstPath = walker.state; path.push(cur); @@ -1038,11 +1038,11 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error return cur; } var post = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) { - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~ + ~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'AST'. - ~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2305: Module 'TypeScript' has no exported member 'IAstWalker'. var path: TypeScript.AstPath = walker.state; path.pop(); diff --git a/tests/baselines/reference/parserSkippedTokens20.errors.txt b/tests/baselines/reference/parserSkippedTokens20.errors.txt index ba932f15346..4e66b51f48d 100644 --- a/tests/baselines/reference/parserSkippedTokens20.errors.txt +++ b/tests/baselines/reference/parserSkippedTokens20.errors.txt @@ -5,7 +5,7 @@ tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens20.t ==== tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens20.ts (3 errors) ==== var v: X' expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt index ad65f138c7a..a2be22d5ee0 100644 --- a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt +++ b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt @@ -48,9 +48,9 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGener interface IQService { all(promises: IPromise < any > []): IPromise< - ~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'IPromise'. - ~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'IPromise'. !!! error TS1005: '>' expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserVariableDeclaration3.errors.txt b/tests/baselines/reference/parserVariableDeclaration3.errors.txt index 146dcba5b92..bb4e5eceaf6 100644 --- a/tests/baselines/reference/parserVariableDeclaration3.errors.txt +++ b/tests/baselines/reference/parserVariableDeclaration3.errors.txt @@ -13,7 +13,7 @@ tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDe ~~~~~~~ !!! error TS2304: Cannot find name 'Harness'. , compiler = new TypeScript.TypeScriptCompiler(outerr) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt index 14ea953dad5..2452cd76a18 100644 --- a/tests/baselines/reference/parserharness.errors.txt +++ b/tests/baselines/reference/parserharness.errors.txt @@ -2,7 +2,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(16,1): err tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(17,1): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/compiler/typescript.ts' not found. tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(18,1): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/services/typescriptServices.ts' not found. tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(19,1): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/RealWorld/diff.ts' not found. -tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(21,21): error TS2305: Module 'Harness' has no exported member 'Assert'. +tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(21,29): error TS2305: Module 'Harness' has no exported member 'Assert'. tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(25,17): error TS2304: Cannot find name 'IIO'. tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(41,12): error TS2304: Cannot find name 'ActiveXObject'. tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(43,19): error TS2304: Cannot find name 'require'. @@ -140,7 +140,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): !!! error TS6053: File 'diff.ts' not found. declare var assert: Harness.Assert; - ~~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2305: Module 'Harness' has no exported member 'Assert'. declare var it; declare var describe; @@ -857,7 +857,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** Mimics having multiple files, later concatenated to a single file. */ export class EmitterIOHost implements TypeScript.EmitterIOHost { - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. private fileCollection = {}; @@ -913,7 +913,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export function makeDefaultCompilerForTest(c?: TypeScript.TypeScriptCompiler) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var compiler = c || new TypeScript.TypeScriptCompiler(stderr); ~~~~~~~~~~ @@ -940,7 +940,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } var compiler: TypeScript.TypeScriptCompiler; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. recreate(); @@ -1156,7 +1156,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): !!! error TS2304: Cannot find name 'TypeScript'. ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. @@ -1174,7 +1174,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): else { for (var m = 0; m < compiler.scripts.members.length; m++) { var script2 = compiler.scripts.members[m]; - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. if (script2.locationInfo.filename !== 'lib.d.ts') { if (targetPosition > -1) { @@ -1218,7 +1218,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } private getTypeInfoName(ast : TypeScript.AST) { - ~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var name = ''; switch (ast.nodeType) { @@ -1262,7 +1262,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = (ast).text; - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; case TypeScript.NodeType.QString: @@ -1274,7 +1274,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = (ast).text; - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; case TypeScript.NodeType.Return: @@ -1286,30 +1286,30 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = (ast).name.actualText; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; case TypeScript.NodeType.ModuleDeclaration: ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = (ast).name.actualText; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; case TypeScript.NodeType.ClassDeclaration: ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = (ast).name.actualText; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; case TypeScript.NodeType.FuncDecl: ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. name = !(ast).name ? "" : (ast).name.actualText; // name == null for lambdas - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. break; default: @@ -1338,7 +1338,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): * @param references the set of referenced files used by the given code */ export function generateDeclFile(code: string, verifyNoDeclFile: boolean, unitName?: string, compilationContext?: Harness.Compiler.CompilationContext, references?: TypeScript.IFileReference[]): string { - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. reset(); @@ -1409,7 +1409,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** @param fileResults an array of strings for the filename and an ITextWriter with its code */ constructor(public fileResults: { filename: string; file: WriterAggregator; }[], errorLines: string[], public scripts: TypeScript.Script[]) { - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var lines = []; fileResults.forEach(v => lines = lines.concat(v.file.lines)); @@ -1493,10 +1493,10 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export function addUnit(code: string, unitName?: string, isResident?: boolean, isDeclareFile?: boolean, references?: TypeScript.IFileReference[]) { - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var script: TypeScript.Script = null; - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var uName = unitName || '0' + (isDeclareFile ? '.d.ts' : '.ts'); @@ -1504,7 +1504,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): if (compiler.units[i].filename === uName) { updateUnit(code, uName); script = compiler.scripts.members[i]; - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. } } @@ -1531,9 +1531,9 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export function compileFile(path: string, callback: (res: CompilerResult) => void , settingsCallback?: (settings?: TypeScript.CompilationSettings) => void , context?: CompilationContext, references?: TypeScript.IFileReference[]) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. path = switchToForwardSlashes(path); var filename = path.match(/[^\/]*$/)[0]; @@ -1543,9 +1543,9 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export function compileUnit(code: string, filename: string, callback: (res: CompilerResult) => void , settingsCallback?: (settings?: TypeScript.CompilationSettings) => void , context?: CompilationContext, references?: TypeScript.IFileReference[]) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. // not recursive function clone/* */(source: any, target: any) { @@ -1603,16 +1603,16 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export function emit(ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) { - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. compiler.emit(ioHost, usePullEmitter); } export function compileString(code: string, unitName: string, callback: (res: Compiler.CompilerResult) => void , context?: CompilationContext, references?: TypeScript.IFileReference[]) { - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var scripts: TypeScript.Script[] = []; - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. reset(); @@ -1695,7 +1695,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): name: string; originalFilePath: string; references: TypeScript.IFileReference[]; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. } @@ -1738,7 +1738,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): var currentFileOptions = {}; var currentFileName = null; var refs: TypeScript.IFileReference[] = []; - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. for (var i = 0; i < lines.length; i++) { @@ -1831,7 +1831,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): export class ScriptInfo { public version: number; public editRanges: { length: number; editRange: TypeScript.ScriptEditRange; }[] = []; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. constructor(public name: string, public content: string, public isResident: boolean, public maxScriptVersions: number) { @@ -1869,7 +1869,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } public getEditRangeSinceVersion(version: number): TypeScript.ScriptEditRange { - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. if (this.version == version) { // No edits! @@ -1897,10 +1897,10 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): } export class TypeScriptLS implements Services.ILanguageServiceShimHost { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. private ls: Services.ILanguageServiceShim = null; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. public scripts: ScriptInfo[] = []; @@ -2002,7 +2002,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): * To access the non-shim (i.e. actual) language service, use the "ls.languageService" property. */ public getLanguageService(): Services.ILanguageServiceShim { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var ls = new Services.TypeScriptServicesFactory().createLanguageServiceShim(this); ~~~~~~~~ @@ -2014,9 +2014,9 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** Parse file given its source text */ public parseSourceText(fileName: string, sourceText: TypeScript.ISourceText): TypeScript.Script { - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var parser = new TypeScript.Parser(); ~~~~~~~~~~ @@ -2057,7 +2057,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): * @param col 0 based index */ public positionToZeroBasedLineCol(fileName: string, position: number): TypeScript.ILineCol { - ~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. var script = this.ls.languageService.getScriptAST(fileName); assert.notNull(script); @@ -2073,7 +2073,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** Verify that applying edits to sourceFileName result in the content of the file baselineFileName */ public checkEdits(sourceFileName: string, baselineFileName: string, edits: Services.TextEdit[]) { - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var script = readFile(sourceFileName); var formattedScript = this.applyEdits(script, edits); @@ -2086,7 +2086,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** Apply an array of text edits to a string, and return the resulting string. */ public applyEdits(content: string, edits: Services.TextEdit[]): string { - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var result = content; edits = this.normalizeEdits(edits); @@ -2103,18 +2103,18 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): /** Normalize an array of edits by removing overlapping entries and sorting entries on the minChar position. */ private normalizeEdits(edits: Services.TextEdit[]): Services.TextEdit[] { - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var result: Services.TextEdit[] = []; - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. function mapEdits(edits: Services.TextEdit[]): { edit: Services.TextEdit; index: number; }[] { - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. - ~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var result = []; for (var i = 0; i < edits.length; i++) { diff --git a/tests/baselines/reference/parserindenter.errors.txt b/tests/baselines/reference/parserindenter.errors.txt index 55cc3ba8469..3d8e5f7cc45 100644 --- a/tests/baselines/reference/parserindenter.errors.txt +++ b/tests/baselines/reference/parserindenter.errors.txt @@ -164,7 +164,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38): constructor( public logger: TypeScript.ILogger, - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScript'. public tree: ParseTree, ~~~~~~~~~ @@ -174,7 +174,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38): !!! error TS2304: Cannot find name 'ITextSnapshot'. public languageHostIndentation: string, public editorOptions: Services.EditorOptions, - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. public firstToken: TokenSpan, ~~~~~~~~~ @@ -369,7 +369,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38): } static GetIndentSizeFromIndentText(indentText: string, editorOptions: Services.EditorOptions): number { - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. return GetIndentSizeFromText(indentText, editorOptions, /*includeNonIndentChars:*/ false); ~~~~~~~~~~~~~~~~~~~~~ @@ -377,7 +377,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38): } static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number { - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2304: Cannot find name 'Services'. var indentSize = 0; diff --git a/tests/baselines/reference/parservoidInQualifiedName2.errors.txt b/tests/baselines/reference/parservoidInQualifiedName2.errors.txt index eebec7fe00c..ad96679f0fd 100644 --- a/tests/baselines/reference/parservoidInQualifiedName2.errors.txt +++ b/tests/baselines/reference/parservoidInQualifiedName2.errors.txt @@ -5,7 +5,7 @@ tests/cases/conformance/parser/ecmascript5/parservoidInQualifiedName2.ts(1,15): ==== tests/cases/conformance/parser/ecmascript5/parservoidInQualifiedName2.ts (3 errors) ==== var v : x.void; - ~~ + ~ !!! error TS2304: Cannot find name 'x'. ~~~~ !!! error TS1003: Identifier expected. diff --git a/tests/baselines/reference/primaryExpressionMods.errors.txt b/tests/baselines/reference/primaryExpressionMods.errors.txt index eefc0735ef0..8de3d60c27d 100644 --- a/tests/baselines/reference/primaryExpressionMods.errors.txt +++ b/tests/baselines/reference/primaryExpressionMods.errors.txt @@ -16,6 +16,6 @@ tests/cases/compiler/primaryExpressionMods.ts(11,8): error TS2304: Cannot find n var x1 = M.a; // Used as PrimaryExpression var x2 = m.a; // Same as M.a var q: m.P; // Error - ~~~ + ~ !!! error TS2304: Cannot find name 'm'. \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types index 936f04731f6..b0af8ae0b6e 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types @@ -12,9 +12,9 @@ interface Foo { >T : T } var Foo: new () => Foo.A>; ->Foo : new () => Foo.A> +>Foo : new () => default.A> >Foo : unknown ->A : Foo.A +>A : default.A >Foo : Foo export = Foo; diff --git a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt index 5541c8d7c19..e7db8a4da6a 100644 --- a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt +++ b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt @@ -21,7 +21,7 @@ test.ts(3,8): error TS2304: Cannot find name 'Array'. /// var x: Array; - ~~~~~~~~~~~~~ + ~~~~~ !!! error TS2304: Cannot find name 'Array'. \ No newline at end of file diff --git a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt index 5541c8d7c19..e7db8a4da6a 100644 --- a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt +++ b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt @@ -21,7 +21,7 @@ test.ts(3,8): error TS2304: Cannot find name 'Array'. /// var x: Array; - ~~~~~~~~~~~~~ + ~~~~~ !!! error TS2304: Cannot find name 'Array'. \ No newline at end of file diff --git a/tests/baselines/reference/protoAssignment.errors.txt b/tests/baselines/reference/protoAssignment.errors.txt index b87f97e7c04..37c443ba74e 100644 --- a/tests/baselines/reference/protoAssignment.errors.txt +++ b/tests/baselines/reference/protoAssignment.errors.txt @@ -4,7 +4,7 @@ tests/cases/compiler/protoAssignment.ts(2,26): error TS2304: Cannot find name 'C ==== tests/cases/compiler/protoAssignment.ts (1 errors) ==== interface Number extends Comparable { - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'Comparable'. compareTo(other: number); diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt index 3b2cdf44194..21bf243dfcb 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts(5,20): error TS2305: Module 'Alpha' has no exported member 'x'. +tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts(5,26): error TS2305: Module 'Alpha' has no exported member 'x'. ==== tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts (1 errors) ==== @@ -7,6 +7,6 @@ tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class- } class Beta extends Alpha.x { - ~~~~~~~ + ~ !!! error TS2305: Module 'Alpha' has no exported member 'x'. } \ No newline at end of file diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js index 8123273846f..1a9e00675a7 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js @@ -14,8 +14,7 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB"); export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType4_moduleC.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType4_moduleC"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js index 8dc0bca5fb0..dd94524bfa2 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js @@ -18,12 +18,10 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB"); export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType5_moduleD.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleC"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleD"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js index 666f5a996bb..792f09b5579 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js @@ -22,16 +22,13 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB"); export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType6_moduleE.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleC"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleE"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js] -define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleD"], function (require, exports, self) { - return self; +define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/recursiveTypeComparison2.errors.txt b/tests/baselines/reference/recursiveTypeComparison2.errors.txt index ce6311c0089..5c1200ceec6 100644 --- a/tests/baselines/reference/recursiveTypeComparison2.errors.txt +++ b/tests/baselines/reference/recursiveTypeComparison2.errors.txt @@ -15,7 +15,7 @@ tests/cases/compiler/recursiveTypeComparison2.ts(13,80): error TS2304: Cannot fi log(): Observable; combine(other: Observable, f: (a: T, b: U) => V): Property; withStateMachine(initState: U, f: (state: U, event: Event) => StateValue): EventStream; - ~~~~~~~~~~~~~~~~ + ~~~~~~~~~~ !!! error TS2304: Cannot find name 'StateValue'. decode(mapping: Object): Property; awaiting(other: Observable): Property; diff --git a/tests/baselines/reference/scannerImportDeclaration1.errors.txt b/tests/baselines/reference/scannerImportDeclaration1.errors.txt index 4f71678aa7a..243670c6854 100644 --- a/tests/baselines/reference/scannerImportDeclaration1.errors.txt +++ b/tests/baselines/reference/scannerImportDeclaration1.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/scanner/ecmascript5/scannerImportDeclaration1.ts(1,1): error TS2304: Cannot find name 'TypeScriptServices'. +tests/cases/conformance/scanner/ecmascript5/scannerImportDeclaration1.ts(1,21): error TS2304: Cannot find name 'TypeScriptServices'. ==== tests/cases/conformance/scanner/ecmascript5/scannerImportDeclaration1.ts (1 errors) ==== import TypeScript = TypeScriptServices.TypeScript; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'TypeScriptServices'. \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.errors.txt b/tests/baselines/reference/sourceMapSample.errors.txt index 80a2f88aba5..25072de7c0e 100644 --- a/tests/baselines/reference/sourceMapSample.errors.txt +++ b/tests/baselines/reference/sourceMapSample.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/sourceMapSample.ts(14,37): error TS2305: Module 'Foo.Bar' has no exported member 'Greeter'. +tests/cases/compiler/sourceMapSample.ts(14,45): error TS2305: Module 'Foo.Bar' has no exported member 'Greeter'. ==== tests/cases/compiler/sourceMapSample.ts (1 errors) ==== @@ -16,7 +16,7 @@ tests/cases/compiler/sourceMapSample.ts(14,37): error TS2305: Module 'Foo.Bar' h function foo(greeting: string): Foo.Bar.Greeter { - ~~~~~~~~~~~~~~~ + ~~~~~~~ !!! error TS2305: Module 'Foo.Bar' has no exported member 'Greeter'. return new Greeter(greeting); } diff --git a/tests/baselines/reference/undeclaredBase.errors.txt b/tests/baselines/reference/undeclaredBase.errors.txt index b03108ac982..5a6d838284c 100644 --- a/tests/baselines/reference/undeclaredBase.errors.txt +++ b/tests/baselines/reference/undeclaredBase.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/undeclaredBase.ts(1,35): error TS2305: Module 'M' has no exported member 'I'. +tests/cases/compiler/undeclaredBase.ts(1,37): error TS2305: Module 'M' has no exported member 'I'. ==== tests/cases/compiler/undeclaredBase.ts (1 errors) ==== module M { export class C extends M.I { } } - ~~~ + ~ !!! error TS2305: Module 'M' has no exported member 'I'. \ No newline at end of file diff --git a/tests/baselines/reference/unknownSymbols2.errors.txt b/tests/baselines/reference/unknownSymbols2.errors.txt index 1fb0bf9f4de..e78b4a14b61 100644 --- a/tests/baselines/reference/unknownSymbols2.errors.txt +++ b/tests/baselines/reference/unknownSymbols2.errors.txt @@ -7,7 +7,7 @@ tests/cases/compiler/unknownSymbols2.ts(15,13): error TS2304: Cannot find name ' tests/cases/compiler/unknownSymbols2.ts(16,14): error TS2304: Cannot find name 'qwerty'. tests/cases/compiler/unknownSymbols2.ts(22,19): error TS2304: Cannot find name 'asdf'. tests/cases/compiler/unknownSymbols2.ts(23,32): error TS2304: Cannot find name 'qwerty'. -tests/cases/compiler/unknownSymbols2.ts(29,5): error TS2304: Cannot find name 'asdf'. +tests/cases/compiler/unknownSymbols2.ts(29,16): error TS2304: Cannot find name 'asdf'. ==== tests/cases/compiler/unknownSymbols2.ts (10 errors) ==== @@ -58,6 +58,6 @@ tests/cases/compiler/unknownSymbols2.ts(29,5): error TS2304: Cannot find name 'a } import c = N; import d = asdf; - ~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2304: Cannot find name 'asdf'. } \ No newline at end of file From 74acbe97df71dd2b0251b1af9a5b6d3d8a24dfad Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 2 Mar 2015 13:58:07 -0800 Subject: [PATCH 006/251] Updating fourslash tests --- tests/cases/fourslash/getPreProcessedFile.ts | 8 +++----- tests/cases/fourslash/shims/getPreProcessedFile.ts | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/cases/fourslash/getPreProcessedFile.ts b/tests/cases/fourslash/getPreProcessedFile.ts index abd26bb6e4b..aa0ff4c0669 100644 --- a/tests/cases/fourslash/getPreProcessedFile.ts +++ b/tests/cases/fourslash/getPreProcessedFile.ts @@ -14,7 +14,7 @@ //// import ref2 = require("refFile2"); //// import noExistref2 = require(/*5*/"NotExistRefFile2"/*6*/); //// import invalidRef1 /*7*/require/*8*/("refFile2"); -//// /*9*/import invalidRef2 = requi/*10*/("refFile2"); +//// import invalidRef2 = /*9*/requi/*10*/(/*10A*/"refFile2"); //// var obj: /*11*/C/*12*/; //// var obj1: D; //// var obj2: ref2.E; @@ -25,8 +25,6 @@ verify.errorExistsBetweenMarkers("1", "2"); verify.errorExistsBetweenMarkers("3", "4"); verify.errorExistsBetweenMarkers("5", "6"); verify.errorExistsBetweenMarkers("7", "8"); -verify.errorExistsBetweenMarkers("9", "10"); // At this position, there are two diagnostic messages: ';' expected, Cannot find name 'requi' +verify.errorExistsBetweenMarkers("9", "10"); +verify.errorExistsBetweenMarkers("10", "10A"); verify.errorExistsBetweenMarkers("11", "12"); - - - diff --git a/tests/cases/fourslash/shims/getPreProcessedFile.ts b/tests/cases/fourslash/shims/getPreProcessedFile.ts index abd26bb6e4b..aa0ff4c0669 100644 --- a/tests/cases/fourslash/shims/getPreProcessedFile.ts +++ b/tests/cases/fourslash/shims/getPreProcessedFile.ts @@ -14,7 +14,7 @@ //// import ref2 = require("refFile2"); //// import noExistref2 = require(/*5*/"NotExistRefFile2"/*6*/); //// import invalidRef1 /*7*/require/*8*/("refFile2"); -//// /*9*/import invalidRef2 = requi/*10*/("refFile2"); +//// import invalidRef2 = /*9*/requi/*10*/(/*10A*/"refFile2"); //// var obj: /*11*/C/*12*/; //// var obj1: D; //// var obj2: ref2.E; @@ -25,8 +25,6 @@ verify.errorExistsBetweenMarkers("1", "2"); verify.errorExistsBetweenMarkers("3", "4"); verify.errorExistsBetweenMarkers("5", "6"); verify.errorExistsBetweenMarkers("7", "8"); -verify.errorExistsBetweenMarkers("9", "10"); // At this position, there are two diagnostic messages: ';' expected, Cannot find name 'requi' +verify.errorExistsBetweenMarkers("9", "10"); +verify.errorExistsBetweenMarkers("10", "10A"); verify.errorExistsBetweenMarkers("11", "12"); - - - From 9af8ae43866e73eeeb7744a40f42d6716980472c Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 15:09:40 -0800 Subject: [PATCH 007/251] Parsing, binding, checking of export default with function/class --- src/compiler/binder.ts | 9 ++++++--- src/compiler/checker.ts | 37 +++++++++++++++++++++++++++++-------- src/compiler/emitter.ts | 23 +++++++++++++++-------- src/compiler/parser.ts | 16 ++++++++++++---- src/compiler/types.ts | 17 +++++++++-------- src/compiler/utilities.ts | 1 + 6 files changed, 72 insertions(+), 31 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 8541c3b36b3..65b5c9035a2 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -112,10 +112,13 @@ module ts { return "__new"; case SyntaxKind.IndexSignature: return "__index"; - case SyntaxKind.ExportAssignment: - return "default"; case SyntaxKind.ExportDeclaration: return "__export"; + case SyntaxKind.ExportAssignment: + return "default"; + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.ClassDeclaration: + return node.flags & NodeFlags.Default ? "default" : undefined; } } @@ -126,7 +129,7 @@ module ts { function declareSymbol(symbols: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol { Debug.assert(!hasDynamicName(node)); - var name = getDeclarationName(node); + var name = node.flags & NodeFlags.Default && parent ? "default" : getDeclarationName(node); if (name !== undefined) { var symbol = hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7699f333d54..d3a10ca0d1c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8268,7 +8268,7 @@ module 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) { + if (node.name && node.name.kind === SyntaxKind.ComputedPropertyName) { // This check will account for methods in class/interface declarations, // as well as accessors in classes/object literals checkComputedPropertyName(node.name); @@ -8998,10 +8998,12 @@ module ts { // Grammar checking checkGrammarClassDeclarationHeritageClauses(node); - checkTypeNameIsReserved(node.name, Diagnostics.Class_name_cannot_be_0); + if (node.name) { + checkTypeNameIsReserved(node.name, Diagnostics.Class_name_cannot_be_0); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + } checkTypeParameters(node.typeParameters); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); var type = getDeclaredTypeOfSymbol(symbol); @@ -9014,9 +9016,9 @@ module ts { if (type.baseTypes.length) { if (produceDiagnostics) { var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, Diagnostics.Class_0_incorrectly_extends_base_class_1); + checkTypeAssignableTo(type, baseType, node.name || node, Diagnostics.Class_0_incorrectly_extends_base_class_1); var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node, Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, SymbolFlags.Value)) { error(baseTypeNode, Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); @@ -9038,7 +9040,7 @@ module ts { if (t !== unknownType) { var declaredType = (t.flags & TypeFlags.Reference) ? (t).target : t; if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) { - checkTypeAssignableTo(type, t, node.name, Diagnostics.Class_0_incorrectly_implements_interface_1); + checkTypeAssignableTo(type, t, node.name || node, Diagnostics.Class_0_incorrectly_implements_interface_1); } else { error(typeRefNode, Diagnostics.A_class_may_only_implement_another_class_or_interface); @@ -10414,6 +10416,10 @@ module ts { function generateNames(node: Node) { switch (node.kind) { + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.ClassDeclaration: + generateNameForFunctionOrClassDeclaration(node); + break; case SyntaxKind.ModuleDeclaration: generateNameForModuleOrEnum(node); generateNames((node).body); @@ -10427,6 +10433,9 @@ module ts { case SyntaxKind.ExportDeclaration: generateNameForExportDeclaration(node); break; + case SyntaxKind.ExportAssignment: + generateNameForExportAssignment(node); + break; case SyntaxKind.SourceFile: case SyntaxKind.ModuleBlock: forEach((node).statements, generateNames); @@ -10464,6 +10473,12 @@ module ts { getNodeLinks(node).generatedName = unescapeIdentifier(name); } + function generateNameForFunctionOrClassDeclaration(node: Declaration) { + if (!node.name) { + assignGeneratedName(node, makeUniqueName("default")); + } + } + function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) { if (node.name.kind === SyntaxKind.Identifier) { var name = node.name.text; @@ -10490,9 +10505,15 @@ module ts { generateNameForImportOrExportDeclaration(node); } } + + function generateNameForExportAssignment(node: ExportAssignment) { + if (node.expression.kind !== SyntaxKind.Identifier) { + assignGeneratedName(node, makeUniqueName("default")); + } + } } - function getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration) { + function getGeneratedNameForNode(node: Node) { var links = getNodeLinks(node); if (!links.generatedName) { getGeneratedNamesForSourceFile(getSourceFile(node)); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 8551d8301e7..f2f04bcd2de 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1580,7 +1580,7 @@ module ts { var tempParameters: Identifier[]; var externalImports: ExternalImportInfo[]; var exportSpecifiers: Map; - var exportDefault: ExportAssignment | ExportSpecifier; + var exportDefault: FunctionDeclaration | ClassDeclaration | ExportAssignment | ExportSpecifier; /** write emitted output to disk*/ var writeEmittedFiles = writeJavaScriptFile; @@ -3912,7 +3912,7 @@ module ts { emitExpressionFunctionBody(node, node.body); } - if (node.flags & NodeFlags.Export) { + if (node.flags & NodeFlags.Export && !(node.flags & NodeFlags.Default)) { writeLine(); emitStart(node); emitModuleMemberName(node); @@ -4243,11 +4243,10 @@ module ts { emitMemberFunctions(node); emitMemberAssignments(node, NodeFlags.Static); writeLine(); - function emitClassReturnStatement() { + emitToken(SyntaxKind.CloseBraceToken, node.members.end, () => { write("return "); emitNode(node.name); - } - emitToken(SyntaxKind.CloseBraceToken, node.members.end, emitClassReturnStatement); + }); write(";"); decreaseIndent(); writeLine(); @@ -4260,7 +4259,7 @@ module ts { } write(");"); emitEnd(node); - if (node.flags & NodeFlags.Export) { + if (node.flags & NodeFlags.Export && !(node.flags & NodeFlags.Default)) { writeLine(); emitStart(node); emitModuleMemberName(node); @@ -4269,7 +4268,7 @@ module ts { emitEnd(node); write(";"); } - if (languageVersion < ScriptTarget.ES6 && node.parent === currentSourceFile) { + if (languageVersion < ScriptTarget.ES6 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } @@ -4680,6 +4679,11 @@ module ts { else if (node.kind === SyntaxKind.ExportAssignment) { exportDefault = exportDefault || node; } + else if (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.ClassDeclaration) { + if (node.flags & NodeFlags.Export && node.flags & NodeFlags.Default) { + exportDefault = exportDefault || node; + } + } else { var info = createExternalImportInfo(node); if (info) { @@ -4788,9 +4792,12 @@ module ts { if (exportDefault.kind === SyntaxKind.ExportAssignment) { emit((exportDefault).expression); } - else { + else if (exportDefault.kind === SyntaxKind.ExportSpecifier) { emit((exportDefault).propertyName); } + else { + emit((exportDefault).name); + } write(";"); emitEnd(exportDefault); } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index abccfb96ffa..9ebfc108c6a 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -358,6 +358,7 @@ module ts { case SyntaxKind.ExportKeyword: return NodeFlags.Export; case SyntaxKind.DeclareKeyword: return NodeFlags.Ambient; case SyntaxKind.ConstKeyword: return NodeFlags.Const; + case SyntaxKind.DefaultKeyword: return NodeFlags.Default; } return 0; } @@ -1501,11 +1502,13 @@ module ts { if (token === SyntaxKind.ExportKeyword) { nextToken(); if (token === SyntaxKind.DefaultKeyword) { - nextToken(); - return token === SyntaxKind.ClassKeyword || token === SyntaxKind.FunctionKeyword; + return lookAhead(nextTokenIsClassOrFunction); } return token !== SyntaxKind.AsteriskToken && token !== SyntaxKind.OpenBraceToken && canFollowModifier(); } + if (token === SyntaxKind.DefaultKeyword) { + return nextTokenIsClassOrFunction(); + } nextToken(); return canFollowModifier(); } @@ -1517,6 +1520,11 @@ module ts { || isLiteralPropertyName(); } + function nextTokenIsClassOrFunction(): boolean { + nextToken(); + return token === SyntaxKind.ClassKeyword || token === SyntaxKind.FunctionKeyword; + } + // True if positioned at the start of a list element function isListElement(parsingContext: ParsingContext, inErrorRecovery: boolean): boolean { var node = currentNode(parsingContext); @@ -4323,7 +4331,7 @@ module ts { setModifiers(node, modifiers); parseExpected(SyntaxKind.FunctionKeyword); node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken); - node.name = parseIdentifier(); + node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier(); fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ !!node.asteriskToken, /*requireCompleteParameterList:*/ false, node); node.body = parseFunctionBlockOrSemicolon(!!node.asteriskToken, Diagnostics.or_expected); return finishNode(node); @@ -4499,7 +4507,7 @@ module ts { var node = createNode(SyntaxKind.ClassDeclaration, fullStart); setModifiers(node, modifiers); parseExpected(SyntaxKind.ClassKeyword); - node.name = parseIdentifier(); + node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause:*/ true); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5115fd0d25c..24f2b23db60 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -298,14 +298,15 @@ module ts { Private = 0x00000020, // Property/Method Protected = 0x00000040, // Property/Method Static = 0x00000080, // Property/Method - MultiLine = 0x00000100, // Multi-line array or object literal - Synthetic = 0x00000200, // Synthetic node (for full fidelity) - DeclarationFile = 0x00000400, // Node is a .d.ts file - Let = 0x00000800, // Variable declaration - Const = 0x00001000, // Variable declaration - OctalLiteral = 0x00002000, + Default = 0x00000100, // Function/Class (export default declaration) + MultiLine = 0x00000200, // Multi-line array or object literal + Synthetic = 0x00000400, // Synthetic node (for full fidelity) + DeclarationFile = 0x00000800, // Node is a .d.ts file + Let = 0x00001000, // Variable declaration + Const = 0x00002000, // Variable declaration + OctalLiteral = 0x00004000, - Modifier = Export | Ambient | Public | Private | Protected | Static, + Modifier = Export | Ambient | Public | Private | Protected | Static | Default, AccessibilityModifier = Public | Private | Protected, BlockScoped = Let | Const } @@ -1185,7 +1186,7 @@ module ts { } export interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index c5bb46aa962..269e9007cdf 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -901,6 +901,7 @@ module ts { case SyntaxKind.ExportKeyword: case SyntaxKind.DeclareKeyword: case SyntaxKind.ConstKeyword: + case SyntaxKind.DefaultKeyword: return true; } return false; From c086dc6d3ac51fb71a786db25533b9a10336da73 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 15:10:18 -0800 Subject: [PATCH 008/251] Accepting new baselines --- .../baselines/reference/APISample_compile.js | 19 ++++++------ .../reference/APISample_compile.types | 30 +++++++++---------- tests/baselines/reference/APISample_linter.js | 19 ++++++------ .../reference/APISample_linter.types | 30 +++++++++---------- .../reference/APISample_transform.js | 19 ++++++------ .../reference/APISample_transform.types | 30 +++++++++---------- .../baselines/reference/APISample_watcher.js | 19 ++++++------ .../reference/APISample_watcher.types | 30 +++++++++---------- 8 files changed, 100 insertions(+), 96 deletions(-) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 18c82646535..4967205ba17 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -313,15 +313,16 @@ declare module "typescript" { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -924,7 +925,7 @@ declare module "typescript" { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index d717386a2d0..2f01ef05d63 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -954,31 +954,34 @@ declare module "typescript" { Static = 128, >Static : NodeFlags - MultiLine = 256, + Default = 256, +>Default : NodeFlags + + MultiLine = 512, >MultiLine : NodeFlags - Synthetic = 512, + Synthetic = 1024, >Synthetic : NodeFlags - DeclarationFile = 1024, + DeclarationFile = 2048, >DeclarationFile : NodeFlags - Let = 2048, + Let = 4096, >Let : NodeFlags - Const = 4096, + Const = 8192, >Const : NodeFlags - OctalLiteral = 8192, + OctalLiteral = 16384, >OctalLiteral : NodeFlags - Modifier = 243, + Modifier = 499, >Modifier : NodeFlags AccessibilityModifier = 112, >AccessibilityModifier : NodeFlags - BlockScoped = 6144, + BlockScoped = 12288, >BlockScoped : NodeFlags } const enum ParserContextFlags { @@ -2954,13 +2957,10 @@ declare module "typescript" { interface EmitResolver { >EmitResolver : EmitResolver - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string ->node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration ->ModuleDeclaration : ModuleDeclaration ->EnumDeclaration : EnumDeclaration ->ImportDeclaration : ImportDeclaration ->ExportDeclaration : ExportDeclaration + getGeneratedNameForNode(node: Node): string; +>getGeneratedNameForNode : (node: Node) => string +>node : Node +>Node : Node getExpressionNameSubstitution(node: Identifier): string; >getExpressionNameSubstitution : (node: Identifier) => string diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 477bf531fac..91394e58a4e 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -344,15 +344,16 @@ declare module "typescript" { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -955,7 +956,7 @@ declare module "typescript" { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 6eb0e17a6e8..35c3ef91153 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -1100,31 +1100,34 @@ declare module "typescript" { Static = 128, >Static : NodeFlags - MultiLine = 256, + Default = 256, +>Default : NodeFlags + + MultiLine = 512, >MultiLine : NodeFlags - Synthetic = 512, + Synthetic = 1024, >Synthetic : NodeFlags - DeclarationFile = 1024, + DeclarationFile = 2048, >DeclarationFile : NodeFlags - Let = 2048, + Let = 4096, >Let : NodeFlags - Const = 4096, + Const = 8192, >Const : NodeFlags - OctalLiteral = 8192, + OctalLiteral = 16384, >OctalLiteral : NodeFlags - Modifier = 243, + Modifier = 499, >Modifier : NodeFlags AccessibilityModifier = 112, >AccessibilityModifier : NodeFlags - BlockScoped = 6144, + BlockScoped = 12288, >BlockScoped : NodeFlags } const enum ParserContextFlags { @@ -3100,13 +3103,10 @@ declare module "typescript" { interface EmitResolver { >EmitResolver : EmitResolver - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string ->node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration ->ModuleDeclaration : ModuleDeclaration ->EnumDeclaration : EnumDeclaration ->ImportDeclaration : ImportDeclaration ->ExportDeclaration : ExportDeclaration + getGeneratedNameForNode(node: Node): string; +>getGeneratedNameForNode : (node: Node) => string +>node : Node +>Node : Node getExpressionNameSubstitution(node: Identifier): string; >getExpressionNameSubstitution : (node: Identifier) => string diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 5ee45e960c6..12fe5286ded 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -345,15 +345,16 @@ declare module "typescript" { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -956,7 +957,7 @@ declare module "typescript" { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 05aa191ce11..f5be4160106 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -1050,31 +1050,34 @@ declare module "typescript" { Static = 128, >Static : NodeFlags - MultiLine = 256, + Default = 256, +>Default : NodeFlags + + MultiLine = 512, >MultiLine : NodeFlags - Synthetic = 512, + Synthetic = 1024, >Synthetic : NodeFlags - DeclarationFile = 1024, + DeclarationFile = 2048, >DeclarationFile : NodeFlags - Let = 2048, + Let = 4096, >Let : NodeFlags - Const = 4096, + Const = 8192, >Const : NodeFlags - OctalLiteral = 8192, + OctalLiteral = 16384, >OctalLiteral : NodeFlags - Modifier = 243, + Modifier = 499, >Modifier : NodeFlags AccessibilityModifier = 112, >AccessibilityModifier : NodeFlags - BlockScoped = 6144, + BlockScoped = 12288, >BlockScoped : NodeFlags } const enum ParserContextFlags { @@ -3050,13 +3053,10 @@ declare module "typescript" { interface EmitResolver { >EmitResolver : EmitResolver - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string ->node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration ->ModuleDeclaration : ModuleDeclaration ->EnumDeclaration : EnumDeclaration ->ImportDeclaration : ImportDeclaration ->ExportDeclaration : ExportDeclaration + getGeneratedNameForNode(node: Node): string; +>getGeneratedNameForNode : (node: Node) => string +>node : Node +>Node : Node getExpressionNameSubstitution(node: Identifier): string; >getExpressionNameSubstitution : (node: Identifier) => string diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 5bd28a4c187..56fa829d95b 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -382,15 +382,16 @@ declare module "typescript" { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -993,7 +994,7 @@ declare module "typescript" { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; isReferencedImportDeclaration(node: Node): boolean; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index f7797f07d68..a58524de812 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -1223,31 +1223,34 @@ declare module "typescript" { Static = 128, >Static : NodeFlags - MultiLine = 256, + Default = 256, +>Default : NodeFlags + + MultiLine = 512, >MultiLine : NodeFlags - Synthetic = 512, + Synthetic = 1024, >Synthetic : NodeFlags - DeclarationFile = 1024, + DeclarationFile = 2048, >DeclarationFile : NodeFlags - Let = 2048, + Let = 4096, >Let : NodeFlags - Const = 4096, + Const = 8192, >Const : NodeFlags - OctalLiteral = 8192, + OctalLiteral = 16384, >OctalLiteral : NodeFlags - Modifier = 243, + Modifier = 499, >Modifier : NodeFlags AccessibilityModifier = 112, >AccessibilityModifier : NodeFlags - BlockScoped = 6144, + BlockScoped = 12288, >BlockScoped : NodeFlags } const enum ParserContextFlags { @@ -3223,13 +3226,10 @@ declare module "typescript" { interface EmitResolver { >EmitResolver : EmitResolver - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; ->getGeneratedNameForNode : (node: EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration) => string ->node : EnumDeclaration | ModuleDeclaration | ImportDeclaration | ExportDeclaration ->ModuleDeclaration : ModuleDeclaration ->EnumDeclaration : EnumDeclaration ->ImportDeclaration : ImportDeclaration ->ExportDeclaration : ExportDeclaration + getGeneratedNameForNode(node: Node): string; +>getGeneratedNameForNode : (node: Node) => string +>node : Node +>Node : Node getExpressionNameSubstitution(node: Identifier): string; >getExpressionNameSubstitution : (node: Identifier) => string From 689112fcccd20d6535d42f8b1478ef49e7fc740a Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 15:27:33 -0800 Subject: [PATCH 009/251] Changing emit(...) to emitNode(...) in several places --- src/compiler/emitter.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f2f04bcd2de..d97838ef9b7 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3842,7 +3842,7 @@ module ts { } if (node.kind === SyntaxKind.FunctionDeclaration || (node.kind === SyntaxKind.FunctionExpression && node.name)) { - emit(node.name); + emitNode(node.name); } emitSignatureAndBody(node); if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.FunctionDeclaration && node.parent === currentSourceFile) { @@ -3917,7 +3917,7 @@ module ts { emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitNode(node.name); emitEnd(node); write(";"); } @@ -4221,7 +4221,7 @@ module ts { function emitClassDeclaration(node: ClassDeclaration) { write("var "); - emit(node.name); + emitNode(node.name); write(" = (function ("); var baseTypeNode = getClassBaseTypeNode(node); if (baseTypeNode) { @@ -4234,7 +4234,7 @@ module ts { writeLine(); emitStart(baseTypeNode); write("__extends("); - emit(node.name); + emitNode(node.name); write(", _super);"); emitEnd(baseTypeNode); } @@ -4264,7 +4264,7 @@ module ts { emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitNode(node.name); emitEnd(node); write(";"); } @@ -4292,7 +4292,7 @@ module ts { } emitStart(ctor || node); write("function "); - emit(node.name); + emitNode(node.name); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); From daacd8005c71f31f590066a4302e6b58ef0f01ee Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 15:27:50 -0800 Subject: [PATCH 010/251] Accepting new baselines --- ...computedPropertyNamesSourceMap1_ES5.js.map | 2 +- ...dPropertyNamesSourceMap1_ES5.sourcemap.txt | 21 +- ...computedPropertyNamesSourceMap1_ES6.js.map | 2 +- ...dPropertyNamesSourceMap1_ES6.sourcemap.txt | 21 +- .../reference/contextualTyping.js.map | 2 +- .../reference/contextualTyping.sourcemap.txt | 228 ++++----- tests/baselines/reference/es3-amd.js.map | 2 +- .../baselines/reference/es3-amd.sourcemap.txt | 25 +- .../reference/es3-declaration-amd.js.map | 2 +- .../es3-declaration-amd.sourcemap.txt | 25 +- .../reference/es3-sourcemap-amd.js.map | 2 +- .../reference/es3-sourcemap-amd.sourcemap.txt | 25 +- tests/baselines/reference/es5-amd.js.map | 2 +- .../baselines/reference/es5-amd.sourcemap.txt | 25 +- .../reference/es5-declaration-amd.js.map | 2 +- .../es5-declaration-amd.sourcemap.txt | 25 +- .../reference/es5-souremap-amd.js.map | 2 +- .../reference/es5-souremap-amd.sourcemap.txt | 25 +- tests/baselines/reference/es6-amd.js.map | 2 +- .../baselines/reference/es6-amd.sourcemap.txt | 25 +- .../reference/es6-declaration-amd.js.map | 2 +- .../es6-declaration-amd.sourcemap.txt | 25 +- .../reference/es6-sourcemap-amd.js.map | 2 +- .../reference/es6-sourcemap-amd.sourcemap.txt | 25 +- .../reference/getEmitOutputMapRoots.baseline | 2 +- .../reference/getEmitOutputSourceMap.baseline | 2 +- .../getEmitOutputSourceMap2.baseline | 2 +- .../getEmitOutputSourceRoot.baseline | 2 +- ...getEmitOutputSourceRootMultiFiles.baseline | 4 +- tests/baselines/reference/out-flag.js.map | 2 +- .../reference/out-flag.sourcemap.txt | 25 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../amd/ref/m2.js.map | 2 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../node/ref/m2.js.map | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../amd/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...solutePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../amd/ref/m2.js.map | 2 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../node/ref/m2.js.map | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../amd/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...lativePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../amd/ref/m2.js.map | 2 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../node/ref/m2.js.map | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...aprootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...aprootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../maprootUrlSimpleNoOutdir/amd/m1.js.map | 2 +- .../maprootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../maprootUrlSimpleNoOutdir/amd/test.js.map | 2 +- .../maprootUrlSimpleNoOutdir/node/m1.js.map | 2 +- .../maprootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../maprootUrlSimpleNoOutdir/node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...maprootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...maprootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../maprootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../maprootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../amd/ref/m2.js.map | 2 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../node/ref/m2.js.map | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../amd/m1.js.map | 2 +- ...lsourcerootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lsourcerootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../node/bin/test.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../node/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../amd/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...solutePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../amd/ref/m1.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../node/bin/test.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../node/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../amd/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...lativePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../amd/ref/m1.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../node/bin/test.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../node/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...sourcemapMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...sourcemapMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../sourcemapSimpleNoOutdir/amd/m1.js.map | 2 +- .../amd/sourcemapSimpleNoOutdir.sourcemap.txt | 62 +-- .../sourcemapSimpleNoOutdir/amd/test.js.map | 2 +- .../sourcemapSimpleNoOutdir/node/m1.js.map | 2 +- .../sourcemapSimpleNoOutdir.sourcemap.txt | 62 +-- .../sourcemapSimpleNoOutdir/node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...cemapSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...cemapSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../sourcemapSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- .../sourcemapSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/bin/test.js.map | 2 +- ...pSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...pSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../amd/ref/m1.js.map | 2 +- .../sourcemapSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../sourcemapSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...apSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...apSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 133 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 135 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 133 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 135 ++---- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 133 ++---- .../node/bin/test.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 135 ++---- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 133 ++---- .../node/bin/outAndOutDirFile.js.map | 2 +- .../outdir/outAndOutDirFolder/ref/m2.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 135 ++---- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 215 +++------ .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 219 +++------ .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 215 +++------ .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 219 +++------ .../node/test.js.map | 2 +- .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 144 ++---- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 146 ++---- .../amd/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 144 ++---- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 146 ++---- .../node/test.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 93 +--- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 93 +--- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 93 +--- .../sourcerootUrlSimpleNoOutdir/amd/m1.js.map | 2 +- .../sourcerootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- .../sourcerootUrlSimpleNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 62 +-- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../amd/test.js.map | 2 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 31 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 31 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 31 +- .../amd/ref/m1.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 62 +-- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 62 +-- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 62 +-- tests/baselines/reference/properties.js.map | 2 +- .../reference/properties.sourcemap.txt | 21 +- .../recursiveClassReferenceTest.js.map | 2 +- .../recursiveClassReferenceTest.sourcemap.txt | 298 +++++------- .../sourceMap-FileWithComments.js.map | 2 +- .../sourceMap-FileWithComments.sourcemap.txt | 111 ++--- .../reference/sourceMapSample.js.map | 2 +- .../reference/sourceMapSample.sourcemap.txt | 71 +-- .../reference/sourceMapValidationClass.js.map | 2 +- .../sourceMapValidationClass.sourcemap.txt | 29 +- ...lidationClassWithDefaultConstructor.js.map | 2 +- ...nClassWithDefaultConstructor.sourcemap.txt | 18 +- ...ConstructorAndCapturedThisStatement.js.map | 2 +- ...ctorAndCapturedThisStatement.sourcemap.txt | 16 +- ...hDefaultConstructorAndExtendsClause.js.map | 2 +- ...tConstructorAndExtendsClause.sourcemap.txt | 53 +-- .../sourceMapValidationClasses.js.map | 2 +- .../sourceMapValidationClasses.sourcemap.txt | 71 +-- ...sourceMapValidationExportAssignment.js.map | 2 +- ...apValidationExportAssignment.sourcemap.txt | 21 +- ...pValidationExportAssignmentCommonjs.js.map | 2 +- ...tionExportAssignmentCommonjs.sourcemap.txt | 21 +- .../sourceMapValidationFunctions.js.map | 2 +- ...sourceMapValidationFunctions.sourcemap.txt | 106 ++--- .../sourceMapValidationImport.js.map | 2 +- .../sourceMapValidationImport.sourcemap.txt | 40 +- .../sourceMapValidationModule.js.map | 2 +- .../sourceMapValidationModule.sourcemap.txt | 31 +- .../sourceMapValidationStatements.js.map | 2 +- ...ourceMapValidationStatements.sourcemap.txt | 10 +- .../sourceMapValidationWithComments.js.map | 2 +- ...rceMapValidationWithComments.sourcemap.txt | 21 +- ...sourceMapWithCaseSensitiveFileNames.js.map | 2 +- ...apWithCaseSensitiveFileNames.sourcemap.txt | 50 +- ...WithCaseSensitiveFileNamesAndOutDir.js.map | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 50 +- ...pleFilesWithFileEndingWithInterface.js.map | 2 +- ...sWithFileEndingWithInterface.sourcemap.txt | 40 +- ...rceMapWithNonCaseSensitiveFileNames.js.map | 2 +- ...ithNonCaseSensitiveFileNames.sourcemap.txt | 50 +- ...hNonCaseSensitiveFileNamesAndOutDir.js.map | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 50 +- .../sourcemapValidationDuplicateNames.js.map | 2 +- ...emapValidationDuplicateNames.sourcemap.txt | 40 +- .../baselines/reference/typeResolution.js.map | 2 +- .../reference/typeResolution.sourcemap.txt | 446 ++++++------------ 1293 files changed, 15006 insertions(+), 33714 deletions(-) diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map index f3881a54bd5..c47fcfcad31 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map @@ -1,2 +1,2 @@ //// [computedPropertyNamesSourceMap1_ES5.js.map] -{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAIPC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"} \ No newline at end of file +{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA;IAAAA;IAIAC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"} \ 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 607d51ca5dc..df0af71fb02 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt @@ -10,38 +10,27 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts ------------------------------------------------------------------- >>>var C = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > C 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0) --- >>> function C() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > C 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (C) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (C) -3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (C) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->class C { > ["hello"]() { > debugger; > } > 2 > } -1 >Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor) 2 >Emitted(3, 6) Source(5, 2) + SourceIndex(0) name (C.constructor) --- >>> C.prototype["hello"] = function () { diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map index 51154cc4676..20765a5b2d4 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map @@ -1,2 +1,2 @@ //// [computedPropertyNamesSourceMap1_ES6.js.map] -{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAIPC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"} \ No newline at end of file +{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA;IAAAA;IAIAC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt index bb482f68cba..64713447e43 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt @@ -10,38 +10,27 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts ------------------------------------------------------------------- >>>var C = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > C 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0) --- >>> function C() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > C 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (C) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (C) -3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (C) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->class C { > ["hello"]() { > debugger; > } > 2 > } -1 >Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor) 2 >Emitted(3, 6) Source(5, 2) + SourceIndex(0) name (C.constructor) --- >>> C.prototype["hello"] = function () { diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map index 7cb571ee5af..082a166d69a 100644 --- a/tests/baselines/reference/contextualTyping.js.map +++ b/tests/baselines/reference/contextualTyping.js.map @@ -1,2 +1,2 @@ //// [contextualTyping.js.map] -{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAaA,AADA,sCAAsC;IAChC,IAAI;IAAVA,SAAMA,IAAIA;QACNC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAGD,AADA,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAGD,AADA,gCAAgC;IAC5B,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAGF,AADA,qCAAqC;IAC/B,IAAI;IAENC,SAFEA,IAAIA;QAGFC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAGD,AADA,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAGD,AADA,+BAA+B;IAC3B,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAG9D,AADA,kCAAkC;IAC9B,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;SAChB,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAGH,AADA,4BAA4B;IACxB,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAG/F,AADA,0BAA0B;IACpB,KAAK;IAAGC,SAARA,KAAKA,CAAeA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAGrD,AADA,qCAAqC;IACjC,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA,CAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file +{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAaA,AADA,sCAAsC;;IACtCA;QACIC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAGD,AADA,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAGD,AADA,gCAAgC;IAC5B,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAGF,AADA,qCAAqC;;IAGjCC;QACIC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAGD,AADA,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAGD,AADA,+BAA+B;IAC3B,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAG9D,AADA,kCAAkC;IAC9B,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;cACX,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAGH,AADA,4BAA4B;IACxB,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAG/F,AADA,0BAA0B;;IACZC,eAAYA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAGrD,AADA,qCAAqC;IACjC,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA,CAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index 9dc9c4b3ee6..534b642d5e5 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/tests/baselines/reference/contextualTyping.sourcemap.txt @@ -33,26 +33,12 @@ sourceFile:contextualTyping.ts 3 >Emitted(1, 39) Source(13, 39) + SourceIndex(0) --- >>>var C1T5 = (function () { -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > C1T5 -1 >Emitted(2, 5) Source(14, 7) + SourceIndex(0) -2 >Emitted(2, 9) Source(14, 11) + SourceIndex(0) ---- >>> function C1T5() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^^^^^^^^^^^^^^^^^-> -1-> -2 > class -3 > C1T5 -1->Emitted(3, 5) Source(14, 1) + SourceIndex(0) name (C1T5) -2 >Emitted(3, 14) Source(14, 7) + SourceIndex(0) name (C1T5) -3 >Emitted(3, 18) Source(14, 11) + SourceIndex(0) name (C1T5) +1 >^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +1 >Emitted(3, 5) Source(14, 1) + SourceIndex(0) name (C1T5) --- >>> this.foo = function (i) { 1->^^^^^^^^ @@ -60,7 +46,7 @@ sourceFile:contextualTyping.ts 3 > ^^^ 4 > ^^^^^^^^^^ 5 > ^ -1-> { +1->class C1T5 { > 2 > foo 3 > : (i: number, s: string) => number = @@ -972,28 +958,14 @@ sourceFile:contextualTyping.ts 3 >Emitted(40, 38) Source(55, 38) + SourceIndex(0) --- >>>var C4T5 = (function () { -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > C4T5 -1 >Emitted(41, 5) Source(56, 7) + SourceIndex(0) -2 >Emitted(41, 9) Source(56, 11) + SourceIndex(0) ---- >>> function C4T5() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^-> -1-> { +1 >^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >class C4T5 { > foo: (i: number, s: string) => string; > -2 > -3 > C4T5 -1->Emitted(42, 5) Source(58, 5) + SourceIndex(0) name (C4T5) -2 >Emitted(42, 14) Source(56, 7) + SourceIndex(0) name (C4T5) -3 >Emitted(42, 18) Source(56, 11) + SourceIndex(0) name (C4T5) +1 >Emitted(42, 5) Source(58, 5) + SourceIndex(0) name (C4T5) --- >>> this.foo = function (i, s) { 1->^^^^^^^^ @@ -1005,9 +977,7 @@ sourceFile:contextualTyping.ts 7 > ^ 8 > ^^ 9 > ^ -1-> { - > foo: (i: number, s: string) => string; - > constructor() { +1->constructor() { > 2 > this 3 > . @@ -2193,25 +2163,19 @@ sourceFile:contextualTyping.ts 3 >Emitted(86, 26) Source(145, 26) + SourceIndex(0) --- >>>function c9t5(f) { } -1 >^^^^^^^^^ -2 > ^^^^ -3 > ^ -4 > ^ -5 > ^^^^ -6 > ^ +1 >^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^ +4 > ^ 1 > - >function -2 > c9t5 -3 > ( -4 > f: (n: number) => IFoo -5 > ) { -6 > } -1 >Emitted(87, 10) Source(146, 10) + SourceIndex(0) -2 >Emitted(87, 14) Source(146, 14) + SourceIndex(0) -3 >Emitted(87, 15) Source(146, 15) + SourceIndex(0) -4 >Emitted(87, 16) Source(146, 37) + SourceIndex(0) -5 >Emitted(87, 20) Source(146, 40) + SourceIndex(0) -6 >Emitted(87, 21) Source(146, 41) + SourceIndex(0) + >function c9t5( +2 > f: (n: number) => IFoo +3 > ) { +4 > } +1 >Emitted(87, 15) Source(146, 15) + SourceIndex(0) +2 >Emitted(87, 16) Source(146, 37) + SourceIndex(0) +3 >Emitted(87, 20) Source(146, 40) + SourceIndex(0) +4 >Emitted(87, 21) Source(146, 41) + SourceIndex(0) --- >>>; 1 > @@ -2378,31 +2342,17 @@ sourceFile:contextualTyping.ts 3 >Emitted(94, 27) Source(154, 27) + SourceIndex(0) --- >>>var C11t5 = (function () { -1->^^^^ -2 > ^^^^^ -3 > ^^^^^^^^^^^^^^^-> -1-> - >class -2 > C11t5 -1->Emitted(95, 5) Source(155, 7) + SourceIndex(0) -2 >Emitted(95, 10) Source(155, 12) + SourceIndex(0) ---- >>> function C11t5(f) { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^ -5 > ^ -1-> { -2 > -3 > C11t5 -4 > { constructor( -5 > f: (n: number) => IFoo +2 > ^^^^^^^^^^^^^^^ +3 > ^ +1-> + >class C11t5 { +2 > constructor( +3 > f: (n: number) => IFoo 1->Emitted(96, 5) Source(155, 15) + SourceIndex(0) name (C11t5) -2 >Emitted(96, 14) Source(155, 7) + SourceIndex(0) name (C11t5) -3 >Emitted(96, 19) Source(155, 12) + SourceIndex(0) name (C11t5) -4 >Emitted(96, 20) Source(155, 27) + SourceIndex(0) name (C11t5) -5 >Emitted(96, 21) Source(155, 49) + SourceIndex(0) name (C11t5) +2 >Emitted(96, 20) Source(155, 27) + SourceIndex(0) name (C11t5) +3 >Emitted(96, 21) Source(155, 49) + SourceIndex(0) name (C11t5) --- >>> } 1 >^^^^ @@ -3197,21 +3147,19 @@ sourceFile:contextualTyping.ts --- >>>function EF1(a, b) { return a + b; } 1-> -2 >^^^^^^^^^ -3 > ^^^ -4 > ^ -5 > ^ -6 > ^^ -7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^^^ -13> ^ -14> ^ -15> ^ -16> ^ +2 >^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +6 > ^^^^ +7 > ^^^^^^ +8 > ^ +9 > ^ +10> ^^^ +11> ^ +12> ^ +13> ^ +14> ^ 1-> > >// CONTEXT: Contextual typing declarations @@ -3220,37 +3168,33 @@ sourceFile:contextualTyping.ts >declare function EF1(a:number, b:number):number; > > -2 >function -3 > EF1 -4 > ( -5 > a -6 > , -7 > b -8 > ) { -9 > return -10> -11> a -12> + -13> b -14> ; -15> -16> } +2 >function EF1( +3 > a +4 > , +5 > b +6 > ) { +7 > return +8 > +9 > a +10> + +11> b +12> ; +13> +14> } 1->Emitted(125, 1) Source(191, 1) + SourceIndex(0) -2 >Emitted(125, 10) Source(191, 10) + SourceIndex(0) -3 >Emitted(125, 13) Source(191, 13) + SourceIndex(0) -4 >Emitted(125, 14) Source(191, 14) + SourceIndex(0) -5 >Emitted(125, 15) Source(191, 15) + SourceIndex(0) -6 >Emitted(125, 17) Source(191, 16) + SourceIndex(0) -7 >Emitted(125, 18) Source(191, 17) + SourceIndex(0) -8 >Emitted(125, 22) Source(191, 21) + SourceIndex(0) name (EF1) -9 >Emitted(125, 28) Source(191, 27) + SourceIndex(0) name (EF1) -10>Emitted(125, 29) Source(191, 28) + SourceIndex(0) name (EF1) -11>Emitted(125, 30) Source(191, 29) + SourceIndex(0) name (EF1) -12>Emitted(125, 33) Source(191, 30) + SourceIndex(0) name (EF1) -13>Emitted(125, 34) Source(191, 31) + SourceIndex(0) name (EF1) -14>Emitted(125, 35) Source(191, 32) + SourceIndex(0) name (EF1) -15>Emitted(125, 36) Source(191, 33) + SourceIndex(0) name (EF1) -16>Emitted(125, 37) Source(191, 34) + SourceIndex(0) name (EF1) +2 >Emitted(125, 14) Source(191, 14) + SourceIndex(0) +3 >Emitted(125, 15) Source(191, 15) + SourceIndex(0) +4 >Emitted(125, 17) Source(191, 16) + SourceIndex(0) +5 >Emitted(125, 18) Source(191, 17) + SourceIndex(0) +6 >Emitted(125, 22) Source(191, 21) + SourceIndex(0) name (EF1) +7 >Emitted(125, 28) Source(191, 27) + SourceIndex(0) name (EF1) +8 >Emitted(125, 29) Source(191, 28) + SourceIndex(0) name (EF1) +9 >Emitted(125, 30) Source(191, 29) + SourceIndex(0) name (EF1) +10>Emitted(125, 33) Source(191, 30) + SourceIndex(0) name (EF1) +11>Emitted(125, 34) Source(191, 31) + SourceIndex(0) name (EF1) +12>Emitted(125, 35) Source(191, 32) + SourceIndex(0) name (EF1) +13>Emitted(125, 36) Source(191, 33) + SourceIndex(0) name (EF1) +14>Emitted(125, 37) Source(191, 34) + SourceIndex(0) name (EF1) --- >>>var efv = EF1(1, 2); 1 > @@ -3292,12 +3236,10 @@ sourceFile:contextualTyping.ts --- >>>function Point(x, y) { 1-> -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^ -5 > ^ -6 > ^^ -7 > ^ +2 >^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ 1-> > > @@ -3313,19 +3255,15 @@ sourceFile:contextualTyping.ts >} > > -2 >function -3 > Point -4 > ( -5 > x -6 > , -7 > y +2 >function Point( +3 > x +4 > , +5 > y 1->Emitted(127, 1) Source(207, 1) + SourceIndex(0) -2 >Emitted(127, 10) Source(207, 10) + SourceIndex(0) -3 >Emitted(127, 15) Source(207, 15) + SourceIndex(0) -4 >Emitted(127, 16) Source(207, 16) + SourceIndex(0) -5 >Emitted(127, 17) Source(207, 17) + SourceIndex(0) -6 >Emitted(127, 19) Source(207, 19) + SourceIndex(0) -7 >Emitted(127, 20) Source(207, 20) + SourceIndex(0) +2 >Emitted(127, 16) Source(207, 16) + SourceIndex(0) +3 >Emitted(127, 17) Source(207, 17) + SourceIndex(0) +4 >Emitted(127, 19) Source(207, 19) + SourceIndex(0) +5 >Emitted(127, 20) Source(207, 20) + SourceIndex(0) --- >>> this.x = x; 1 >^^^^ diff --git a/tests/baselines/reference/es3-amd.js.map b/tests/baselines/reference/es3-amd.js.map index c587e10f904..a1ccff476c6 100644 --- a/tests/baselines/reference/es3-amd.js.map +++ b/tests/baselines/reference/es3-amd.js.map @@ -1,2 +1,2 @@ //// [es3-amd.js.map] -{"version":3,"file":"es3-amd.js","sourceRoot":"","sources":["es3-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es3-amd.js","sourceRoot":"","sources":["es3-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es3-amd.sourcemap.txt b/tests/baselines/reference/es3-amd.sourcemap.txt index 226904108df..86ef55a1f58 100644 --- a/tests/baselines/reference/es3-amd.sourcemap.txt +++ b/tests/baselines/reference/es3-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es3-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es3-declaration-amd.js.map b/tests/baselines/reference/es3-declaration-amd.js.map index ccd05b446f7..612763299c9 100644 --- a/tests/baselines/reference/es3-declaration-amd.js.map +++ b/tests/baselines/reference/es3-declaration-amd.js.map @@ -1,2 +1,2 @@ //// [es3-declaration-amd.js.map] -{"version":3,"file":"es3-declaration-amd.js","sourceRoot":"","sources":["es3-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es3-declaration-amd.js","sourceRoot":"","sources":["es3-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es3-declaration-amd.sourcemap.txt b/tests/baselines/reference/es3-declaration-amd.sourcemap.txt index 35e5474dd84..7ad6f48d3ad 100644 --- a/tests/baselines/reference/es3-declaration-amd.sourcemap.txt +++ b/tests/baselines/reference/es3-declaration-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es3-declaration-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es3-sourcemap-amd.js.map b/tests/baselines/reference/es3-sourcemap-amd.js.map index d3f8fafc960..e11de869437 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.js.map +++ b/tests/baselines/reference/es3-sourcemap-amd.js.map @@ -1,2 +1,2 @@ //// [es3-sourcemap-amd.js.map] -{"version":3,"file":"es3-sourcemap-amd.js","sourceRoot":"","sources":["es3-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es3-sourcemap-amd.js","sourceRoot":"","sources":["es3-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ 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 c39c3ccd4b1..a20cfaa766d 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt +++ b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es3-sourcemap-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es5-amd.js.map b/tests/baselines/reference/es5-amd.js.map index 84512d7eece..6201673cb34 100644 --- a/tests/baselines/reference/es5-amd.js.map +++ b/tests/baselines/reference/es5-amd.js.map @@ -1,2 +1,2 @@ //// [es5-amd.js.map] -{"version":3,"file":"es5-amd.js","sourceRoot":"","sources":["es5-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es5-amd.js","sourceRoot":"","sources":["es5-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es5-amd.sourcemap.txt b/tests/baselines/reference/es5-amd.sourcemap.txt index e7586b02a4e..a5902f03982 100644 --- a/tests/baselines/reference/es5-amd.sourcemap.txt +++ b/tests/baselines/reference/es5-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es5-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es5-declaration-amd.js.map b/tests/baselines/reference/es5-declaration-amd.js.map index 8ed2d06ab3f..d4dfe8ac244 100644 --- a/tests/baselines/reference/es5-declaration-amd.js.map +++ b/tests/baselines/reference/es5-declaration-amd.js.map @@ -1,2 +1,2 @@ //// [es5-declaration-amd.js.map] -{"version":3,"file":"es5-declaration-amd.js","sourceRoot":"","sources":["es5-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es5-declaration-amd.js","sourceRoot":"","sources":["es5-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es5-declaration-amd.sourcemap.txt b/tests/baselines/reference/es5-declaration-amd.sourcemap.txt index 80a60ca6c6a..59b6ba6bb0a 100644 --- a/tests/baselines/reference/es5-declaration-amd.sourcemap.txt +++ b/tests/baselines/reference/es5-declaration-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es5-declaration-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es5-souremap-amd.js.map b/tests/baselines/reference/es5-souremap-amd.js.map index 64d882aae47..b8412bd1e72 100644 --- a/tests/baselines/reference/es5-souremap-amd.js.map +++ b/tests/baselines/reference/es5-souremap-amd.js.map @@ -1,2 +1,2 @@ //// [es5-souremap-amd.js.map] -{"version":3,"file":"es5-souremap-amd.js","sourceRoot":"","sources":["es5-souremap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es5-souremap-amd.js","sourceRoot":"","sources":["es5-souremap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ 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 dc614195e28..9b6b4af56ca 100644 --- a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt +++ b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es5-souremap-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es6-amd.js.map b/tests/baselines/reference/es6-amd.js.map index 7371ba578bd..c9866d87884 100644 --- a/tests/baselines/reference/es6-amd.js.map +++ b/tests/baselines/reference/es6-amd.js.map @@ -1,2 +1,2 @@ //// [es6-amd.js.map] -{"version":3,"file":"es6-amd.js","sourceRoot":"","sources":["es6-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es6-amd.js","sourceRoot":"","sources":["es6-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es6-amd.sourcemap.txt b/tests/baselines/reference/es6-amd.sourcemap.txt index 070a35703e1..2b271099401 100644 --- a/tests/baselines/reference/es6-amd.sourcemap.txt +++ b/tests/baselines/reference/es6-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es6-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es6-declaration-amd.js.map b/tests/baselines/reference/es6-declaration-amd.js.map index 0987f9478e9..03f79f6c667 100644 --- a/tests/baselines/reference/es6-declaration-amd.js.map +++ b/tests/baselines/reference/es6-declaration-amd.js.map @@ -1,2 +1,2 @@ //// [es6-declaration-amd.js.map] -{"version":3,"file":"es6-declaration-amd.js","sourceRoot":"","sources":["es6-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es6-declaration-amd.js","sourceRoot":"","sources":["es6-declaration-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es6-declaration-amd.sourcemap.txt b/tests/baselines/reference/es6-declaration-amd.sourcemap.txt index 1fc0b5f05fe..198a68633b1 100644 --- a/tests/baselines/reference/es6-declaration-amd.sourcemap.txt +++ b/tests/baselines/reference/es6-declaration-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es6-declaration-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/es6-sourcemap-amd.js.map b/tests/baselines/reference/es6-sourcemap-amd.js.map index 689f0447fa8..ef22eb4638c 100644 --- a/tests/baselines/reference/es6-sourcemap-amd.js.map +++ b/tests/baselines/reference/es6-sourcemap-amd.js.map @@ -1,2 +1,2 @@ //// [es6-sourcemap-amd.js.map] -{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA,IAAM,CAAC;IAEHA,SAFEA,CAACA;IAKHC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt index 09abb195987..bcfc33d0405 100644 --- a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt +++ b/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt @@ -10,42 +10,29 @@ sourceFile:es6-sourcemap-amd.ts ------------------------------------------------------------------- >>>var A = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > A 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(2, 8) + SourceIndex(0) --- >>> function A() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> +2 > ^^-> +1->class A >{ > -2 > -3 > A 1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (A) -3 >Emitted(2, 15) Source(2, 8) + SourceIndex(0) name (A) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >{ - > constructor () +1->constructor () > { > > 2 > } -1 >Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) +1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor) 2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor) --- >>> A.prototype.B = function () { diff --git a/tests/baselines/reference/getEmitOutputMapRoots.baseline b/tests/baselines/reference/getEmitOutputMapRoots.baseline index 16f39169e23..b4a4ace4d42 100644 --- a/tests/baselines/reference/getEmitOutputMapRoots.baseline +++ b/tests/baselines/reference/getEmitOutputMapRoots.baseline @@ -1,6 +1,6 @@ EmitSkipped: false FileName : declSingleFile.js.map -{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../tests/cases/fourslash/inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : declSingleFile.js +{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../tests/cases/fourslash/inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : declSingleFile.js var x = 109; var foo = "hello world"; var M = (function () { diff --git a/tests/baselines/reference/getEmitOutputSourceMap.baseline b/tests/baselines/reference/getEmitOutputSourceMap.baseline index 39cff967d89..1f7056989e9 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap.baseline +++ b/tests/baselines/reference/getEmitOutputSourceMap.baseline @@ -1,6 +1,6 @@ EmitSkipped: false FileName : tests/cases/fourslash/inputFile.js.map -{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js +{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js var x = 109; var foo = "hello world"; var M = (function () { diff --git a/tests/baselines/reference/getEmitOutputSourceMap2.baseline b/tests/baselines/reference/getEmitOutputSourceMap2.baseline index 713aa4f3c08..df59ca00162 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap2.baseline +++ b/tests/baselines/reference/getEmitOutputSourceMap2.baseline @@ -1,6 +1,6 @@ EmitSkipped: false FileName : sample/outDir/inputFile1.js.map -{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["../../tests/cases/fourslash/inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : sample/outDir/inputFile1.js +{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["../../tests/cases/fourslash/inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : sample/outDir/inputFile1.js var x = 109; var foo = "hello world"; var M = (function () { diff --git a/tests/baselines/reference/getEmitOutputSourceRoot.baseline b/tests/baselines/reference/getEmitOutputSourceRoot.baseline index 5424def98ee..7b56ee5a4d8 100644 --- a/tests/baselines/reference/getEmitOutputSourceRoot.baseline +++ b/tests/baselines/reference/getEmitOutputSourceRoot.baseline @@ -1,6 +1,6 @@ EmitSkipped: false FileName : tests/cases/fourslash/inputFile.js.map -{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js +{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js var x = 109; var foo = "hello world"; var M = (function () { diff --git a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline index 7948ad99673..9df4711b3e1 100644 --- a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline +++ b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline @@ -1,6 +1,6 @@ EmitSkipped: false FileName : tests/cases/fourslash/inputFile1.js.map -{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js +{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js var x = 109; var foo = "hello world"; var M = (function () { @@ -11,7 +11,7 @@ var M = (function () { //# sourceMappingURL=inputFile1.js.map EmitSkipped: false FileName : tests/cases/fourslash/inputFile2.js.map -{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":["C","C.constructor"],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAGPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile2.js +{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":["C","C.constructor"],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile2.js var bar = "hello world Typescript"; var C = (function () { function C() { diff --git a/tests/baselines/reference/out-flag.js.map b/tests/baselines/reference/out-flag.js.map index 795d564b2c0..71984498067 100644 --- a/tests/baselines/reference/out-flag.js.map +++ b/tests/baselines/reference/out-flag.js.map @@ -1,2 +1,2 @@ //// [out-flag.js.map] -{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count"],"mappings":"AAAA,eAAe;AAGf,AADA,oBAAoB;IACd,OAAO;IAAbA,SAAMA,OAAOA;IAYbC,CAACA;IAVGD,uBAAuBA;IAChBA,uBAAKA,GAAZA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IAEMF,0BAAQA,GAAfA,UAAgBA,KAAaA;QAEzBA,EAAEA;IACNA,CAACA;IACLA,cAACA;AAADA,CAACA,AAZD,IAYC"} \ No newline at end of file +{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count"],"mappings":"AAAA,eAAe;AAGf,AADA,oBAAoB;;IACpBA;IAYAC,CAACA;IAVGD,uBAAuBA;IAChBA,uBAAKA,GAAZA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IAEMF,0BAAQA,GAAfA,UAAgBA,KAAaA;QAEzBA,EAAEA;IACNA,CAACA;IACLA,cAACA;AAADA,CAACA,AAZD,IAYC"} \ No newline at end of file diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt index b54f7f8d0a1..a199ae16373 100644 --- a/tests/baselines/reference/out-flag.sourcemap.txt +++ b/tests/baselines/reference/out-flag.sourcemap.txt @@ -33,31 +33,18 @@ sourceFile:out-flag.ts 3 >Emitted(2, 21) Source(3, 21) + SourceIndex(0) --- >>>var MyClass = (function () { -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^-> -1-> - >class -2 > MyClass -1->Emitted(3, 5) Source(4, 7) + SourceIndex(0) -2 >Emitted(3, 12) Source(4, 14) + SourceIndex(0) ---- >>> function MyClass() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -1-> -2 > class -3 > MyClass +2 > ^^-> +1-> + > 1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (MyClass) -2 >Emitted(4, 14) Source(4, 7) + SourceIndex(0) name (MyClass) -3 >Emitted(4, 21) Source(4, 14) + SourceIndex(0) name (MyClass) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1 > +1->class MyClass >{ > // my function comments > public Count(): number @@ -71,7 +58,7 @@ sourceFile:out-flag.ts > } > 2 > } -1 >Emitted(5, 5) Source(16, 1) + SourceIndex(0) name (MyClass.constructor) +1->Emitted(5, 5) Source(16, 1) + SourceIndex(0) name (MyClass.constructor) 2 >Emitted(5, 6) Source(16, 2) + SourceIndex(0) name (MyClass.constructor) --- >>> // my function comments diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index ea13c12204d..401347e92f1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index a2f16483a1e..0e907c1a2ca 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map index 7d8b76cac05..af309c1684b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 3153725651c..8d9c30d6288 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 87101a5b084..cbb2dc36492 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map index 7d8b76cac05..af309c1684b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index c90b960a80e..44306f12661 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index a2f16483a1e..0e907c1a2ca 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 7d8b76cac05..af309c1684b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 30ffc64617e..55483177e5b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 87101a5b084..cbb2dc36492 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 7d8b76cac05..af309c1684b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 6f1ddfd7dd7..d1972c6fac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index ef107bb75b8..8a778d7b74b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index a2f16483a1e..0e907c1a2ca 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 6f1ddfd7dd7..d1972c6fac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 2e21de11e01..dfc6d1e756f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 87101a5b084..cbb2dc36492 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index d9a8564525c..eb72bfc3c02 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 7c4f8ffc229..534b9497bda 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index a2f16483a1e..0e907c1a2ca 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index d9a8564525c..eb72bfc3c02 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 9e1907a3f19..71ac2234142 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 87101a5b084..cbb2dc36492 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 89642c2cc6d..b02c7fdd8c2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index f8e8d8dfcda..021b77c5c7e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 2de14ea4583..652d934d602 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map index 2fa75cca668..1ae647dfae6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map index a9c59a766f9..f9d0dd89e9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 784e7f4633d..5ab3146b099 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index d01d6f28db2..15bddd32fe5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map index fca31256992..eae921435ac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index db4c232c316..a52d154805d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 2de14ea4583..652d934d602 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 2fa75cca668..1ae647dfae6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 89642c2cc6d..b02c7fdd8c2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 84cb97409a5..7fd3bf30722 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index d01d6f28db2..15bddd32fe5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index fca31256992..eae921435ac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index a9c59a766f9..f9d0dd89e9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 89642c2cc6d..b02c7fdd8c2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 4cd682b8c3b..d40f871367c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 2de14ea4583..652d934d602 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map index 2fa75cca668..1ae647dfae6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index a9c59a766f9..f9d0dd89e9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6bd3da2ec8d..f348cfad93c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index d01d6f28db2..15bddd32fe5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map index fca31256992..eae921435ac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 3f162153875..7f5576a8a9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index a8a5bb2ccd2..93d9d6199b7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map index cdcab4fcd08..2e8f6fe5049 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index edd3870ab63..ce271e4a3cd 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 23be4fbfdc4..668c24e25c5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map index 1d68ca16748..de9ec1f9859 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 6c8b73f6c8b..357406fe360 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 3f162153875..7f5576a8a9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index cdcab4fcd08..2e8f6fe5049 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index b61a3bce9ad..ed2f07140c4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index edd3870ab63..ce271e4a3cd 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1d68ca16748..de9ec1f9859 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map index 3f162153875..7f5576a8a9c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 39e2b7f43fe..7985162b99d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map index cdcab4fcd08..2e8f6fe5049 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map index edd3870ab63..ce271e4a3cd 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index e26fe9d1141..75228e5ea64 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map index 1d68ca16748..de9ec1f9859 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index c83cc3c4cd4..c9fa657c407 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index cb450009899..88e67e19b36 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map index e807575b382..9d8db9a4c71 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 0b9f727913a..f227d9809ad 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 5a72780e994..420650feeac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map index 1952f8c0e7d..15d4e3e1c9b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index d99f6762b89..71e537a5f0a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index cb450009899..88e67e19b36 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e807575b382..9d8db9a4c71 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 284e615b39c..2e0ba5061ce 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 5a72780e994..420650feeac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1952f8c0e7d..15d4e3e1c9b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index ac800e51764..837628ec61f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index cb450009899..88e67e19b36 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map index e807575b382..9d8db9a4c71 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index fe52512fa0a..97c6b8a85e4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index 5a72780e994..420650feeac 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map index 1952f8c0e7d..15d4e3e1c9b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map index 19d51858d76..bc33e2f8d72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 02cad9b9ab3..9d64326a562 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map index b592e001a98..b6fc8f25627 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map index 19d51858d76..bc33e2f8d72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 02cad9b9ab3..9d64326a562 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map index b592e001a98..b6fc8f25627 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 3b087cd34db..d83cb1fe788 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index b592e001a98..b6fc8f25627 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 19d51858d76..bc33e2f8d72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 3b087cd34db..d83cb1fe788 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index b592e001a98..b6fc8f25627 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 19d51858d76..bc33e2f8d72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 1812f2fecd5..8df103744b5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 6c42e7229b3..66573712ce7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 1812f2fecd5..8df103744b5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 6c42e7229b3..66573712ce7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map index b52fecc1d52..9ad95c3cfd4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 9b5860b612b..ad89f7cfe86 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map index b0471f2c948..08a7411226a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map index b52fecc1d52..9ad95c3cfd4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 9b5860b612b..ad89f7cfe86 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map index b0471f2c948..08a7411226a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 47fa7e75199..fbca4c774c7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index b52fecc1d52..9ad95c3cfd4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index b0471f2c948..08a7411226a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 47fa7e75199..fbca4c774c7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index b52fecc1d52..9ad95c3cfd4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index b0471f2c948..08a7411226a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map index 4217335db62..f358b98d465 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 92885552f3f..ca11421c733 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map index 4217335db62..f358b98d465 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 92885552f3f..ca11421c733 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index e73d1fdf39b..4433eb94534 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index e73d1fdf39b..4433eb94534 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index a7c2ec6a92b..9b92dfb4455 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index a7c2ec6a92b..9b92dfb4455 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index c6d7e2d77eb..85f4115a0ee 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index c6d7e2d77eb..85f4115a0ee 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 949c8b01349..2c8142a51ef 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map index b1ba0007b51..1d5372ad9c9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 949c8b01349..2c8142a51ef 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map index b1ba0007b51..1d5372ad9c9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 44c413210dc..b87a91089b3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index b1ba0007b51..1d5372ad9c9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 44c413210dc..b87a91089b3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 16f97c48e68..43db599a092 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index b1ba0007b51..1d5372ad9c9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 9593afdf577..6882b70c389 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6cdd1b8fc9e..cfa708b107d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 9593afdf577..6882b70c389 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6cdd1b8fc9e..cfa708b107d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 0c408c275ea..c4ea7bd2123 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index c8bc7a5dead..49da9789ec8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 9697f0008ad..81bb9202e5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map index 828e5f06c03..515473b17f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 3f303cae59a..0eed3e7d5ba 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map index c8bc7a5dead..49da9789ec8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 5eaf90bb137..98da596cfa4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map index 828e5f06c03..515473b17f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 9465eaca080..1fdab4bbb56 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index c8bc7a5dead..49da9789ec8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 9697f0008ad..81bb9202e5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 828e5f06c03..515473b17f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 1494a71e0c2..129d326ecac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index c8bc7a5dead..49da9789ec8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 5eaf90bb137..98da596cfa4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 828e5f06c03..515473b17f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 111caa88ab6..9d7accaa452 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 33a1a16a5c5..e5fd70c6434 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index 9697f0008ad..81bb9202e5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 111caa88ab6..9d7accaa452 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 100d1da6afd..2fc592160a1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 5eaf90bb137..98da596cfa4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 5bfeb8c37b1..1b716998db3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 090f794e06a..78467c99ecc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index 9697f0008ad..81bb9202e5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 5bfeb8c37b1..1b716998db3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index e6e8d34e4cb..7603a4ca2b0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 5eaf90bb137..98da596cfa4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 90534df8d8c..9745ad1a4ab 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 9986c904a2e..9df87b47237 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 458a007af7d..e7200adafdb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map index 9e56ebb991d..436695f4e0d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map index 156d44b336a..c2ac2bc2710 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 683855ebe85..567b51cfff5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index d88675f1bb6..074ab743af3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map index b4e88f8cf4d..85da8e39421 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 3b46f52c0a3..7d976d7c896 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 458a007af7d..e7200adafdb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 9e56ebb991d..436695f4e0d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 90534df8d8c..9745ad1a4ab 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index e51988fff45..b4900315771 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index d88675f1bb6..074ab743af3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index b4e88f8cf4d..85da8e39421 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 156d44b336a..c2ac2bc2710 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 90534df8d8c..9745ad1a4ab 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 170c86cf98e..e680f5976dd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 458a007af7d..e7200adafdb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map index 9e56ebb991d..436695f4e0d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 156d44b336a..c2ac2bc2710 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 48b161591d2..1d6a282976d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index d88675f1bb6..074ab743af3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map index b4e88f8cf4d..85da8e39421 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index 4efa8b1c4e8..e2625035edb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index d2f77da6708..559534194af 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map index f2feb05d139..3dec08edbfc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index 5382a2122af..0950101384d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 16bd40b29ae..aff5583a5e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map index c51a3e0d23d..c0654a8e141 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 40b415a7141..a2c4fc8b17e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 4efa8b1c4e8..e2625035edb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index f2feb05d139..3dec08edbfc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c1f746f7600..bcfdd607553 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 5382a2122af..0950101384d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index c51a3e0d23d..c0654a8e141 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map index 4efa8b1c4e8..e2625035edb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index c96db8869f7..4849040861c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map index f2feb05d139..3dec08edbfc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map index 5382a2122af..0950101384d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index a74920582ea..0af20dc5ef9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map index c51a3e0d23d..c0654a8e141 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index a745692adc0..fd3cc1e9423 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index c36f481f1b5..66acf4aace7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map index bf794345a00..324bf862942 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 13576c48bf9..48f639a7ee2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 914c886ac87..7e9c3643b99 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map index 1b507245fc6..64b21aa3115 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index f67ab153f73..c206367edaa 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index c36f481f1b5..66acf4aace7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index bf794345a00..324bf862942 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 206300e0c34..abf4b9d6a84 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 914c886ac87..7e9c3643b99 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1b507245fc6..64b21aa3115 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 5f6bdc4ae98..29b0e86baa2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index c36f481f1b5..66acf4aace7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map index bf794345a00..324bf862942 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 251fcdee70a..8f609cc28d9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index 914c886ac87..7e9c3643b99 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map index 1b507245fc6..64b21aa3115 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map index b7b0675e733..b94901a1d6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index 29cc1bff12e..a0f444928ea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map index 61da94509c8..be7882c99f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map index 0893e2d067d..b6c5ca84681 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map index b7b0675e733..b94901a1d6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index 29cc1bff12e..a0f444928ea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map index 61da94509c8..be7882c99f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map index 0893e2d067d..b6c5ca84681 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 20db52dd8e8..ff91d92f2c9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 61da94509c8..be7882c99f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 0893e2d067d..b6c5ca84681 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index b7b0675e733..b94901a1d6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 20db52dd8e8..ff91d92f2c9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 61da94509c8..be7882c99f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 0893e2d067d..b6c5ca84681 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index b7b0675e733..b94901a1d6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 3764898a5cf..fdcfeeef82a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 0346140ef3d..ebe3cd999ae 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 3764898a5cf..fdcfeeef82a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 0346140ef3d..ebe3cd999ae 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map index 54e9026a874..82ae367f41d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 144c281141e..1af999bf589 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map index b280e83c684..ee9a236558d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map index 54e9026a874..82ae367f41d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 144c281141e..1af999bf589 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map index b280e83c684..ee9a236558d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 4166fd0726b..f62798ba3fe 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 54e9026a874..82ae367f41d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index b280e83c684..ee9a236558d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 4166fd0726b..f62798ba3fe 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 54e9026a874..82ae367f41d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index b280e83c684..ee9a236558d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map index 9f094e0e243..e2b612e5851 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 08069776096..0c75ab9d5e1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map index 9f094e0e243..e2b612e5851 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 08069776096..0c75ab9d5e1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index 5a20e2a7c7c..b0d16a34e9a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index 5a20e2a7c7c..b0d16a34e9a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index d3ed95ca916..ade0746d1bf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index d3ed95ca916..ade0746d1bf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 512266b6237..b4f76aad2a3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map index f664b080161..e3d8cd8c37f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 512266b6237..b4f76aad2a3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index c95281b0117..3ec9d9c435c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map index 23fb6d33f8a..67151dfbad5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map index 3518a66e606..f1475afcba7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index c95281b0117..3ec9d9c435c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map index 23fb6d33f8a..67151dfbad5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map index 3518a66e606..f1475afcba7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 7a17ef73ca4..0ff54843266 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 23fb6d33f8a..67151dfbad5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 3518a66e606..f1475afcba7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 7a17ef73ca4..0ff54843266 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 23fb6d33f8a..67151dfbad5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 3518a66e606..f1475afcba7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 70b064b97a9..1760e9f4124 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 95712b2c3ef..3bad00b19d7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 70b064b97a9..1760e9f4124 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 95712b2c3ef..3bad00b19d7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index dbacb509299..c13865cf8f3 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index 1b8646a41af..18051b2af91 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index a3f3bcc4e8b..c2157bc3b1b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map index ec46d44dd36..5b6ec16659f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 7f8e5e51eef..0b663f820bb 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index 1b8646a41af..18051b2af91 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 8635a7515df..0230aad40a5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map index ec46d44dd36..5b6ec16659f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index b055e0d85ac..e0f4f03c27a 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 1b8646a41af..18051b2af91 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index a3f3bcc4e8b..c2157bc3b1b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index ec46d44dd36..5b6ec16659f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 101a39cb149..96f7d6f45aa 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 1b8646a41af..18051b2af91 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 8635a7515df..0230aad40a5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index ec46d44dd36..5b6ec16659f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index b8b1e81a1f7..420891e5019 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 8dbf7526563..26d86253ec1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index a3f3bcc4e8b..c2157bc3b1b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index b8b1e81a1f7..420891e5019 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 1805bde6293..0510b7e7e33 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 8635a7515df..0230aad40a5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 6765e0e0fa6..e0b70849bc1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index e5aca4bd246..00fddd7206e 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index a3f3bcc4e8b..c2157bc3b1b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 6765e0e0fa6..e0b70849bc1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index ea467254de4..9d9bdbe17a2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 8635a7515df..0230aad40a5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 4c7df3a9d40..66c8fa96a0b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index a4ce5648e5b..a065295b528 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 2516d32cb22..37bc8039271 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map index aabb245d036..b36bc401bb8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index 457cf11710d..ec29dfcad18 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index 29fa229628c..e3d905204b2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index dec55471584..c88465aaec4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map index a8d13feec67..6a18d277c10 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 7ad61dddeec..381bea73055 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 2516d32cb22..37bc8039271 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index aabb245d036..b36bc401bb8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 4c7df3a9d40..66c8fa96a0b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 40f49063f38..097d3769047 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index dec55471584..c88465aaec4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index a8d13feec67..6a18d277c10 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 457cf11710d..ec29dfcad18 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 4c7df3a9d40..66c8fa96a0b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 5a4217fe733..c288a90a6ee 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 2516d32cb22..37bc8039271 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map index aabb245d036..b36bc401bb8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 457cf11710d..ec29dfcad18 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 4db3d0c70d3..aaf57c9d055 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index dec55471584..c88465aaec4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map index a8d13feec67..6a18d277c10 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map index b83ab295512..d2270dfd2ce 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index fad4fc1783c..b36d21d9ba6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map index 4aca98811da..b75b544961a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map index a00af772e4d..bc2e2667bcd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index 136894e2adf..ff16dbdb8d6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map index a842c47d7fa..b9c164bb732 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c71e97ff503..849fccd6b73 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index b83ab295512..d2270dfd2ce 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 4aca98811da..b75b544961a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ccc7c6c0ffc..67a86d9d9ae 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index a00af772e4d..bc2e2667bcd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index a842c47d7fa..b9c164bb732 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map index b83ab295512..d2270dfd2ce 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 697df496dfe..bd126e61877 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map index 4aca98811da..b75b544961a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map index a00af772e4d..bc2e2667bcd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 248347a869c..804e4408446 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map index a842c47d7fa..b9c164bb732 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index 2d63c4bddac..6f16ea9e2f1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index e31fdeb2b46..ec8a7690d47 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map index 243a840423d..e9f1ee500c9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index 83179011b96..acf02348d67 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 949975a6ea1..95de442e92d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map index adfae43de8e..fee2f4cb129 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index bcfc5bc3195..959fdf6baa2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index e31fdeb2b46..ec8a7690d47 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 243a840423d..e9f1ee500c9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c1c33e4a5e7..a70074a2fbd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 949975a6ea1..95de442e92d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index adfae43de8e..fee2f4cb129 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index bba66e6cf92..f9f1988d93d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index e31fdeb2b46..ec8a7690d47 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map index 243a840423d..e9f1ee500c9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index eae6ea635af..9a7f754c534 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index 949975a6ea1..95de442e92d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map index adfae43de8e..fee2f4cb129 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map index 0b381a365b6..dd02f14d4a1 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt index 85447a672f9..a2fc3dfe05e 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 1429bf14f31..57ced088c41 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map index cc7aa790c7b..06903d6fc51 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map index 0b381a365b6..dd02f14d4a1 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt index 85447a672f9..a2fc3dfe05e 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map index 1429bf14f31..57ced088c41 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map index cc7aa790c7b..06903d6fc51 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index bf5416e3ae3..3bbfa8afdfa 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 1429bf14f31..57ced088c41 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index cc7aa790c7b..06903d6fc51 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 0b381a365b6..dd02f14d4a1 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index bf5416e3ae3..3bbfa8afdfa 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 1429bf14f31..57ced088c41 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index cc7aa790c7b..06903d6fc51 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 0b381a365b6..dd02f14d4a1 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index d3400838027..06f3e72443d 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 292e5cf400f..f889da36fe6 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index d3400838027..06f3e72443d 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 292e5cf400f..f889da36fe6 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map index ce927d94c7c..0fc2c621e0a 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt index 0779281197a..173dec77069 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map index e10afd12d5f..5b13c1897d9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map index ce927d94c7c..0fc2c621e0a 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt index 0779281197a..173dec77069 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map index e10afd12d5f..5b13c1897d9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 68c1cd3bce9..e1589c0feff 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index ce927d94c7c..0fc2c621e0a 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e10afd12d5f..5b13c1897d9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 68c1cd3bce9..e1589c0feff 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ce927d94c7c..0fc2c621e0a 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index e10afd12d5f..5b13c1897d9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index 70062ed1d78..b1aa6b79fb6 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index c06e1433af5..fb91eae1254 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index 70062ed1d78..b1aa6b79fb6 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index c06e1433af5..fb91eae1254 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt index 039a038f947..a0eb693f753 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt index 039a038f947..a0eb693f753 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index f4bc5552ff5..22edc6e923d 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index f4bc5552ff5..22edc6e923d 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index f952c25a211..b7c18ea6cd1 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index 781feaa6938..420452cddcf 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index f952c25a211..b7c18ea6cd1 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt index af274497908..1d778de19b1 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map index 7f27a87d128..74b0608f236 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map index 2cbc935e3ca..ec6296f1323 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt index af274497908..1d778de19b1 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map index 7f27a87d128..74b0608f236 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map index 2cbc935e3ca..ec6296f1323 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index ed6df05a4da..003ceee4d93 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 7f27a87d128..74b0608f236 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 2cbc935e3ca..ec6296f1323 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index ed6df05a4da..003ceee4d93 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 7f27a87d128..74b0608f236 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 2cbc935e3ca..ec6296f1323 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index a83d7767a58..e56b1937c6d 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index e7181011976..5f63c0e5142 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index a83d7767a58..e56b1937c6d 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index e7181011976..5f63c0e5142 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index bbfd41971ea..679505e8648 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index cb5acf04cad..341a676141d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 5c7fbf55980..39fe2de604c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 9358870a688..4483b21610f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index af09cb956f6..156e391d669 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 7a63f82b063..877c5b5035c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index af09cb956f6..156e391d669 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index edff71433ac..a15e54dd069 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 2b043394866..c5ec380afae 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 1a6dfcfc5f3..b75fe639eb9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 2b043394866..c5ec380afae 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 83af964a3ef..7a54e211028 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index b646b14d468..d5be2b19f79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index a10ee476182..a8f4f3bf238 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 4cd04fa270c..9dca948f2f1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 5e785215461..8fbb0bd3916 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index db54a0d65a6..206982bbc7e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6f7510afb31..5f476cfb8ed 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index c664fca1e12..0b21c3a7f08 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 6224a28a43e..2843c88faf5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 7c145eb9597..16d5644b3d5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index e5707eaf2e4..8b33b445d72 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 017951622a6..b15912ba2e6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index b9e8c452ef0..ff984bf74ee 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 15ce6f5a43a..4582ca1ca5b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index c3f599f9e80..bf0333f3d12 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index cb5ad88846a..831f0c94f62 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 162707b8a9b..363cd0e29f1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 33014efc6e7..af780a9c2b5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 2c64730243e..c5bce1a19d5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index 470b4280389..96940f59a3f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index 470b4280389..96940f59a3f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 4cfbf25edb5..5a945f4c71d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 4cfbf25edb5..5a945f4c71d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index ece3a005e75..df7254bd000 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 5884efb5062..4e24018adaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index ece3a005e75..df7254bd000 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 5884efb5062..4e24018adaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index 0d6c41e9711..6be1df8d85d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index 0d6c41e9711..6be1df8d85d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 77f1611c24e..90059c54016 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 77f1611c24e..90059c54016 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index 8610dc814fc..a107f15c1bf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 93973163cd7..6ce817a2afc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index 8610dc814fc..a107f15c1bf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 93973163cd7..6ce817a2afc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 02f3351ef30..13e178f926c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 02f3351ef30..13e178f926c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 1d124c986f4..3fe9cb43cbd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 1d124c986f4..3fe9cb43cbd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 6cd13c5c612..8fff42e6b47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 6cd13c5c612..8fff42e6b47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index f437ff38afa..e6031c87b2b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index f437ff38afa..e6031c87b2b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 5b1bcfef3e7..aff09cc2ec5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 5b1bcfef3e7..aff09cc2ec5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index 677ccf1596d..6e45ee8da7d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index f9478f2e3bc..8a2e3c01e10 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index 677ccf1596d..6e45ee8da7d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index f9478f2e3bc..8a2e3c01e10 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index c3cc0d4253f..ec4f3128e18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index a522f38d991..381b239c573 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 6777ff94467..154daaa4a70 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map index 59114b811dc..9bf8cc49759 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map index c3cc0d4253f..ec4f3128e18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 62ca624e4f3..2963737a5a0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 9250746237b..95d78aa3a6f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map index 59114b811dc..9bf8cc49759 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index c3cc0d4253f..ec4f3128e18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index a522f38d991..381b239c573 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 59114b811dc..9bf8cc49759 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index ef941ec8527..7197c780765 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index c3cc0d4253f..ec4f3128e18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 62ca624e4f3..2963737a5a0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 59114b811dc..9bf8cc49759 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 8a79efe75e9..68ab2e1cb0e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index f21f73c29bb..63116c3c3ec 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index a522f38d991..381b239c573 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index b1c5507682c..7579aa9cc1c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index f21f73c29bb..63116c3c3ec 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 62ca624e4f3..2963737a5a0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 6eea2973858..8fe4fb35089 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 7f35721dda8..81d49818901 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index a522f38d991..381b239c573 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 39e33fa9c4f..1a094439574 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 7f35721dda8..81d49818901 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 62ca624e4f3..2963737a5a0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 7943340db97..1b485f8a450 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 3ce4a0ee163..c4c57a82e12 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 9b1685c84f2..71e1da5d3cc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 643298a2225..08265129eac 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map index 5ee511671dd..c1ff644fb97 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map index 39c18fb8d23..7e08245de72 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index b95495e9dd1..de341c87ec1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 8d010aa113d..9072b5c7129 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map index e0c8782d730..0b67e7ee481 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 9b1685c84f2..71e1da5d3cc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 5ee511671dd..c1ff644fb97 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 3ce4a0ee163..c4c57a82e12 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index b7c2f5b7669..062c65d4728 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index b95495e9dd1..de341c87ec1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index e0c8782d730..0b67e7ee481 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 39c18fb8d23..7e08245de72 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index acb0bd34971..fbbb2304152 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 3ce4a0ee163..c4c57a82e12 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 9b1685c84f2..71e1da5d3cc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index f7eeab0a5fd..4de4e7187f7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map index 5ee511671dd..c1ff644fb97 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 39c18fb8d23..7e08245de72 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index b95495e9dd1..de341c87ec1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index e13d18582ca..63e22ab64ba 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map index e0c8782d730..0b67e7ee481 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 29b187f991d..89373fc1cfa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 74eb9e3aa24..66992cb8359 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map index 0066f881f76..34ab44d4457 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index 519ccb90df5..9bf6e024b3f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 909e92e6606..55790d25272 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map index 1ec1848e231..a7792ef5242 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 29b187f991d..89373fc1cfa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 0066f881f76..34ab44d4457 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 03d8b18512e..3a29347b4ea 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 519ccb90df5..9bf6e024b3f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1ec1848e231..a7792ef5242 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 75c5572d004..e4c6d218e88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map index 29b187f991d..89373fc1cfa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 3f6102f1bb4..5ed1e2a3867 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map index 0066f881f76..34ab44d4457 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map index 519ccb90df5..9bf6e024b3f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index d4deb812f0b..08491d50151 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map index 1ec1848e231..a7792ef5242 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index c0a2696f7ec..6f750f89857 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 7157945599d..247d4dc21da 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map index 49e86ea9531..6f9c7463378 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index a4994dffea1..19b046a427c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 5912d5319af..757d17973af 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map index 5a0bc483548..c63a0943976 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index c0a2696f7ec..6f750f89857 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 49e86ea9531..6f9c7463378 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 396d03885e1..ebd955c3327 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index a4994dffea1..19b046a427c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 5a0bc483548..c63a0943976 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 09274e0a16c..4849be6e95a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index c0a2696f7ec..6f750f89857 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 2394ca431ad..acef32cca00 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map index 49e86ea9531..6f9c7463378 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index a4994dffea1..19b046a427c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index e6f1a6e5f9c..67fc9030f41 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map index 5a0bc483548..c63a0943976 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map index bdf6f4c4907..c41bb345581 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map index f9b0b3e8ecb..e43074326e0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index a932b4ba35e..06c05bb438b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map index 39be85e5c61..54f77cba804 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map index bdf6f4c4907..c41bb345581 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map index f9b0b3e8ecb..e43074326e0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index a932b4ba35e..06c05bb438b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map index 39be85e5c61..54f77cba804 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index f9b0b3e8ecb..e43074326e0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 39be85e5c61..54f77cba804 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index bdf6f4c4907..c41bb345581 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 7e47593c4b7..0cd80fd563d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index f9b0b3e8ecb..e43074326e0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 39be85e5c61..54f77cba804 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index bdf6f4c4907..c41bb345581 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 7e47593c4b7..0cd80fd563d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 47c9541e0eb..6baf87e6a0a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 011daa6708b..c686916fecf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 47c9541e0eb..6baf87e6a0a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 011daa6708b..c686916fecf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map index 2f3480ff8df..166a894f9bc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 40f672bb0f2..937975a41dc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map index c50d8e4859f..2c82359c39e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map index 2f3480ff8df..166a894f9bc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 40f672bb0f2..937975a41dc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map index c50d8e4859f..2c82359c39e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 2f3480ff8df..166a894f9bc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index c50d8e4859f..2c82359c39e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 4a50fc2c799..b94aa72552f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 2f3480ff8df..166a894f9bc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index c50d8e4859f..2c82359c39e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 4a50fc2c799..b94aa72552f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map index e60662f68a5..725dab29806 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 28833a21cbc..1091dae5c06 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map index e60662f68a5..725dab29806 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 28833a21cbc..1091dae5c06 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 5e508ff8a78..8a378aeb633 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 5e508ff8a78..8a378aeb633 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 73fd44c82b9..d7ecfe75c35 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 73fd44c82b9..d7ecfe75c35 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index 5fb2ab686c7..ab2d0e10bd3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map index e75ae6e92ca..d4b7f1b88c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index 5fb2ab686c7..ab2d0e10bd3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map index cfd4530338c..0cd3d17ea8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index ee5822937fb..e76f86d4edf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map index 09ec82b9dc6..7aecf7bb797 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map index cfd4530338c..0cd3d17ea8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index ee5822937fb..e76f86d4edf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map index 09ec82b9dc6..7aecf7bb797 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index cfd4530338c..0cd3d17ea8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 09ec82b9dc6..7aecf7bb797 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index de87b327bb2..e8ad9ce990c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index cfd4530338c..0cd3d17ea8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 09ec82b9dc6..7aecf7bb797 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index de87b327bb2..e8ad9ce990c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 489c554916e..9d1c6c21871 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index ade7f125bba..d51d030afc4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 489c554916e..9d1c6c21871 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index ade7f125bba..d51d030afc4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 0b307d7a3f3..0927206ec1b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 280d8605873..4492ea156cd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map index e21190f8e2e..7b83f21b715 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index f5995365dd1..84f18c56247 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 7f4e9e1ddbe..18997be9365 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map index e21190f8e2e..7b83f21b715 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 0b307d7a3f3..0927206ec1b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e21190f8e2e..7b83f21b715 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index ee48016ceb9..4af0f38468e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index f5995365dd1..84f18c56247 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index e21190f8e2e..7b83f21b715 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 95cca9bf57d..bdfda8e946b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index b86daf390ae..f3b07b196ea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index 0b307d7a3f3..0927206ec1b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 458add435ad..9bf843435cb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index b86daf390ae..f3b07b196ea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index f5995365dd1..84f18c56247 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 9e6b357fb24..59f5f96fc76 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index e9865e31b38..bae3da16f51 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index 0b307d7a3f3..0927206ec1b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index e881c0b785d..d4f1ba4f5aa 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index e9865e31b38..bae3da16f51 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index f5995365dd1..84f18c56247 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 6312eb97268..47a5afc6d80 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 223d33df45e..414fa845b2e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 3c58e7d101c..0cdc44d330d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 06558319aad..c0fe39d4076 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map index 706cb7efc9d..6cbe9eb3387 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map index 771da5c5a90..92fd6e19cfb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index b332468413f..292dcb61933 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index e87343210a7..095d4b65fdf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map index 34d8334c90e..a603394fc15 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 3c58e7d101c..0cdc44d330d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 706cb7efc9d..6cbe9eb3387 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 223d33df45e..414fa845b2e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index d523e5cd5b9..4315a83b043 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index b332468413f..292dcb61933 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 34d8334c90e..a603394fc15 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 771da5c5a90..92fd6e19cfb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 4edec10d016..28aa64ae076 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 223d33df45e..414fa845b2e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 3c58e7d101c..0cdc44d330d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index c17d9555be6..c254e418af5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map index 706cb7efc9d..6cbe9eb3387 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 771da5c5a90..92fd6e19cfb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index b332468413f..292dcb61933 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index e60683226b7..e34bffc6f61 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map index 34d8334c90e..a603394fc15 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index e4922cbc450..e0af3af9b22 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 02b225cc851..8984f80e86c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map index 439e497e1e6..b6ba5dd0f7e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index d817acec1bc..05c53f0182e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 8da4686938a..82c62b23d3c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map index da13a487630..1e72e2a2203 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index e4922cbc450..e0af3af9b22 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 439e497e1e6..b6ba5dd0f7e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 7bc5c6fc31a..01ab16b1f2b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index d817acec1bc..05c53f0182e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index da13a487630..1e72e2a2203 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 8ab8c0a6041..d94164cc056 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map index e4922cbc450..e0af3af9b22 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 03a8fc274e0..ae7da446d66 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map index 439e497e1e6..b6ba5dd0f7e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map index d817acec1bc..05c53f0182e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 79fd07b3d67..65bea50d84f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map index da13a487630..1e72e2a2203 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index dd0d4674a38..aaae11bb5b5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 1f8be506ddd..6e10b6eea05 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map index 2b2873013f1..43a3eb9d838 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 2b502d41a8f..702b574b614 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 9be420cb4f5..4e25047bafc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map index 5f288a1eaac..b3972a3cfc1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index dd0d4674a38..aaae11bb5b5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 2b2873013f1..43a3eb9d838 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c85d2e84771..3ba8a06679f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 2b502d41a8f..702b574b614 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 5f288a1eaac..b3972a3cfc1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 08d38875be1..ebcaec60aaa 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index dd0d4674a38..aaae11bb5b5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index d1a697bc810..9c2d987c549 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map index 2b2873013f1..43a3eb9d838 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index 2b502d41a8f..702b574b614 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 4597d82ebfb..5a3d45c1960 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map index 5f288a1eaac..b3972a3cfc1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map index 5a8c5e83fb1..dfe53a2f98c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map index 31e868764cc..ebf5d6bc886 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index e3ee3f75771..88e6b10a246 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map index 203c42359bd..3f2781e7135 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map index 5a8c5e83fb1..dfe53a2f98c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map index 31e868764cc..ebf5d6bc886 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index e3ee3f75771..88e6b10a246 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map index 203c42359bd..3f2781e7135 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 31e868764cc..ebf5d6bc886 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 203c42359bd..3f2781e7135 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 5a8c5e83fb1..dfe53a2f98c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index c89d3dadb38..939e34eb98b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 31e868764cc..ebf5d6bc886 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 203c42359bd..3f2781e7135 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 5a8c5e83fb1..dfe53a2f98c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index c89d3dadb38..939e34eb98b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 4b6e3515172..2e84a488006 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index db35a4d65e9..1d422734a9f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 4b6e3515172..2e84a488006 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index db35a4d65e9..1d422734a9f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map index 4b5198b3f50..66ee2527678 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 0019838beaf..bf10b5ed9fc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map index a3a4dda9ee2..1934eb39c28 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map index 4b5198b3f50..66ee2527678 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 0019838beaf..bf10b5ed9fc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map index a3a4dda9ee2..1934eb39c28 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 4b5198b3f50..66ee2527678 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a3a4dda9ee2..1934eb39c28 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 8e3a977cca1..cd059036df7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 4b5198b3f50..66ee2527678 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index a3a4dda9ee2..1934eb39c28 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 8e3a977cca1..cd059036df7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map index ca707d32461..fb5adc76d59 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 0450303b15f..7e219ee4efd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map index ca707d32461..fb5adc76d59 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 0450303b15f..7e219ee4efd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index 2019663bd1e..17acf414c6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index 2019663bd1e..17acf414c6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index e9a275d31ee..161f1a1befb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index e9a275d31ee..161f1a1befb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 536d103e9d8..b282a6db091 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map index 3b572c088f6..d6fa9b1eda6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 536d103e9d8..b282a6db091 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index 914b521f34b..75655274f8a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map index 17240f26218..a68bad790ab 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index 914b521f34b..75655274f8a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map index 17240f26218..a68bad790ab 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 17240f26218..a68bad790ab 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index f7eb83a20d1..91537c88524 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 51d14705f9c..17c695312b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 17240f26218..a68bad790ab 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index f7eb83a20d1..91537c88524 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 4e19de36fe8..47e290804f2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 3f529a732cd..32bf6d56977 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 4e19de36fe8..47e290804f2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 3f529a732cd..32bf6d56977 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map index 85a8232bd28..cbb7eed4953 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index 8e10970ffce..a5aeda6cdd8 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map index 004deef64ee..9bac80ea492 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map index 65edb170af6..0826e9e95f3 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index 7a872ddd504..5355f2e907e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map index 004deef64ee..9bac80ea492 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 02e26dc6443..aabf49f904d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index b3ee1024446..46ba86b781c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 77f7dd030d7..045f82046ce 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:../../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:../../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:../../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:../../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:../../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index dc602487a68..e31d90a8f0c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index b3ee1024446..46ba86b781c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 0ae77c78e64..4424c9c0872 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:../../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:../../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:../../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:../../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:../../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 6f1ddfd7dd7..d1972c6fac7 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index 85a8232bd28..cbb7eed4953 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index f798f6bd54d..f7faa24855f 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 6f1ddfd7dd7..d1972c6fac7 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 65edb170af6..0826e9e95f3 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index a6bfcf784e0..9931e5b4418 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index d9a8564525c..eb72bfc3c02 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index 02e26dc6443..aabf49f904d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index a05ce4d647b..b75480da1e7 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:../../../ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index d9a8564525c..eb72bfc3c02 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index dc602487a68..e31d90a8f0c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index adb046a3bcc..165ca8ce022 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:../../../ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map index 85a8232bd28..cbb7eed4953 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index b0bd2c62d2c..55f98059d50 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map index acd0ceb63b8..606f3e8ed8a 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map index 65edb170af6..0826e9e95f3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 8654bc314a4..0036386e6c4 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map index 4f72b9ce65c..3b3ef6b145c 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index cd70f70d5f8..820b088730f 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 816e60641ca..74f971bdbdb 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 73bffe89c3c..ac636fcee16 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index bbb66ad4639..0decd013acd 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:../../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:../../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:../../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:../../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:../../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 67a333ddeae..6df33fbb9e6 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 2ca22f61022..cda16e9fb3e 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 559ad5c3def..5a37db58aa0 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index ce763f05c36..0548113dc81 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:../../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:../../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:../../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:../../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:../../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index 85a8232bd28..cbb7eed4953 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 7817684a640..39744cb62a8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map index acd0ceb63b8..606f3e8ed8a 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 65edb170af6..0826e9e95f3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 75124d203a9..f8d10678ca0 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map index 4f72b9ce65c..3b3ef6b145c 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt index fef556f0ecf..70b8c90eba8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map index c996a776e06..57095af58bb 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt index 91f071d8783..d5247e7eeb0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map index 74e129bdef6..7bae4ed7491 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 59a66655c1e..4a09f6eebdd 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index df91d86d73c..6afbf97db4d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 9093c5dbbb5..b42d5846da5 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 5e71320d77b..fbcf63377be 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 0843e68f0a0..1c53bf2849c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 665b813a7e4..8fda552208b 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index 6ec11f61b55..be5429fa802 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map index c996a776e06..57095af58bb 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index 363b01567fa..4ff8b4fa8c7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map index 74e129bdef6..7bae4ed7491 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index 36df051e9c0..cbe1d27e1a9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map index 675e3349179..a3cd4c20a53 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index 81f0dc2577f..3319b4e31f9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map index 44e7dccedd2..56d42d8bdfd 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 2de14ea4583..652d934d602 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 67f8e2d57c5..856699ba7d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index e63e012df3b..d3470fdb64f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:../../../ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:../../../ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:../../../ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:../../test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:../../test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:../../test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:../../test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index d01d6f28db2..15bddd32fe5 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index eb9f8205703..bcab7aa3bc6 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 74b8b4eb99f..a9427c9fc8b 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:../../../ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:../../test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:../../test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index 3c388273ff4..51755e4c9a3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index fc964104780..bcf72481eda 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map index 675e3349179..a3cd4c20a53 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index 6ed9e2e6323..095951a67d0 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index de6475b368d..205f70497ad 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map index 44e7dccedd2..56d42d8bdfd 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map index 2ac26aa1648..5511f8eed7a 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt index 8606d36acd4..3a0747b7391 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map index 276a8b2a720..c44bc996538 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map index 2ac26aa1648..5511f8eed7a 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt index 8606d36acd4..3a0747b7391 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map index 276a8b2a720..c44bc996538 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index f06d0fae1d2..b9e02d04348 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 521dbe5e313..39003b7de59 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 3563010e709..8bb6ed14650 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index 11ece946281..f46ef4b5d46 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index f06d0fae1d2..b9e02d04348 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 521dbe5e313..39003b7de59 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 3563010e709..8bb6ed14650 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index 11ece946281..f46ef4b5d46 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:../../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:../../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:../../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map index 1812f2fecd5..8df103744b5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index d8299995443..e5f624e893b 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map index 1812f2fecd5..8df103744b5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index d8299995443..e5f624e893b 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt index 7337d98d30b..37f3a793697 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map index 66a78eca4fd..35110f566c5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt index 7337d98d30b..37f3a793697 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map index 66a78eca4fd..35110f566c5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 973e11b0a2b..dcba20cf66a 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 5a197e3071b..dcdfb881785 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index 4b35efc9982..1d4ac548211 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 973e11b0a2b..dcba20cf66a 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 5a197e3071b..dcdfb881785 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index 4b35efc9982..1d4ac548211 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map index 4217335db62..f358b98d465 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 5ace4e9d141..bd56afebe59 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map index 4217335db62..f358b98d465 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 5ace4e9d141..bd56afebe59 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt index e4128b4a255..0b09b971bcb 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map index 21ba47bba40..3cb3f00b46d 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt index e4128b4a255..0b09b971bcb 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map index 21ba47bba40..3cb3f00b46d 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index aab3485a17b..d2bb04b2226 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index 5741483263b..dffdc150f71 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index aab3485a17b..d2bb04b2226 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index 5741483263b..dffdc150f71 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index d42a2d28902..127f06d960e 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map index 4587ff981be..c15b0f9ed70 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index d42a2d28902..127f06d960e 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt index a8cf87e7c6a..d35b75a2de1 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map index 3c65fcf31b8..a91cc4d9881 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map index 5ee69838f4d..da83de7ea2e 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt index a8cf87e7c6a..d35b75a2de1 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map index 3c65fcf31b8..a91cc4d9881 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 071f3dc5770..0024c7c2747 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index c8f714c3481..079673b4779 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 6b66c0c4d64..b8be5eb8e01 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 071f3dc5770..0024c7c2747 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index c8f714c3481..079673b4779 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../../../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../../../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../../../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:../../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:../../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:../../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map index 9593afdf577..6882b70c389 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 5c3d682e6f9..9f06bde3b12 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map index 9593afdf577..6882b70c389 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 5c3d682e6f9..9f06bde3b12 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:../ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:../ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:../ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:../test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:../test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:../test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index bdc09350720..ecf6b4f4fb4 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 22f075a2c26..65a337f5eab 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 8ea7277b999..0f0eb1aa02a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -189,37 +172,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -250,22 +222,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -294,16 +263,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -311,7 +274,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -336,21 +299,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -407,37 +367,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,16 +444,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -512,7 +455,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index c084feb0fd0..2a21f422960 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 406569f1a8f..30caf09e890 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -188,37 +171,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -249,22 +221,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -293,16 +262,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -310,7 +273,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -335,22 +298,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -406,37 +366,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -494,16 +443,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -511,7 +454,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index af09cb956f6..156e391d669 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index c0b44f4c066..c2331c962e7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index af09cb956f6..156e391d669 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index c11097c512b..96a83ac34b2 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 2b043394866..c5ec380afae 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map index bde211ed7de..04f168a6289 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 3b975d27540..d21b9752018 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -226,37 +203,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -314,16 +280,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -331,7 +291,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -401,37 +361,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -489,16 +438,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -506,7 +449,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 2b043394866..c5ec380afae 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map index 827f4db2a5e..0ce68e169af 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outdir/outAndOutDirFolder/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index b7ac7d33ad9..a4436e03b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: outAndOutDirFile.js @@ -225,37 +202,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -313,16 +279,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -330,7 +290,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -400,37 +360,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(14, 1) Source(4, 1) + SourceIndex(1) -2 >Emitted(14, 5) Source(4, 7) + SourceIndex(1) -3 >Emitted(14, 7) Source(4, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (c1) -2 >Emitted(15, 14) Source(4, 7) + SourceIndex(1) name (c1) -3 >Emitted(15, 16) Source(4, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(16, 5) Source(6, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(16, 6) Source(6, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -488,16 +437,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) -2 >Emitted(20, 10) Source(9, 10) + SourceIndex(1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -505,7 +448,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 7263a0ae155..287e688b603 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 40b76f21939..625e81c4738 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 1b74fbd815d..270469d093c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index d76b985a334..f2cac8f7a2a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map index a5693661025..3b00d82ab66 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map index 7f3d01c0a85..8c257bd1111 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 84bf18ede48..adbd280cf16 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -224,37 +201,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> var m2_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -285,22 +251,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_c1 = m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -329,16 +292,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>> function m2_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m2_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -346,7 +303,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -371,21 +328,18 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>> exports.m2_f1 = m2_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -434,37 +388,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(4, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -495,22 +438,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(4, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -539,16 +479,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(9, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -556,7 +490,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -581,22 +515,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(9, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map index c74a9f9eede..74fe0bb17da 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map index 5c7f2c8f36a..058e405b606 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map index 695098ebde0..e7f54a4a2e1 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index d3e0be31cee..eb2dff17042 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -222,37 +199,26 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -283,22 +249,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_c1 = m2_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m2_c1 -3 > -4 > m2_c1 { - > public m2_c1_p1: number; - > } -5 > +3 > { + > public m2_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -327,16 +290,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m2_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -344,7 +301,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m2_f1() { > 2 > return 3 > @@ -369,22 +326,19 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts >>>exports.m2_f1 = m2_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m2_f1 -3 > -4 > m2_f1() { - > return m2_instance1; - > } -5 > +3 > () { + > return m2_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -465,37 +419,26 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 14) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -526,22 +469,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) 2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 14) Source(4, 14) + SourceIndex(0) -4 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -5 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -570,16 +510,10 @@ sourceFile:outputdir_module_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(11, 10) Source(9, 17) + SourceIndex(0) -3 >Emitted(11, 12) Source(9, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -587,7 +521,7 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -612,22 +546,19 @@ sourceFile:outputdir_module_multifolder/test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) 2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 14) Source(9, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -5 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map index 5590b2868b3..4ac74c2fcdb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 2d8655bf2d9..ebdcadc16ac 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index a2cd8b55903..75f6eb83940 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 23ddea644c2..51ff0fd9524 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 3fb8deb4f10..c4f12e28fe8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map index 28f51d9cf9f..6751f2f82cd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 9704c194922..a36050cc7e8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map index 761cf1c1321..9232d211fa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map index 8a497cdfecd..ca45773f423 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 597cf7020bf..4d3c5799e27 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map index f48ab4302b1..41d3e11e995 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 22a1042ad84..9bc68f9c969 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index f2fa457dc41..7fc9e0c1f60 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 120acb4a22c..6d5b4ab1218 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 211d8310054..c97d88b3d59 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map index 3ce04bc4f21..6c5413f630e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB,IAAa,KAAK;QAAlBA,SAAaA,KAAKA;QAElBC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,GAAL,KAEZ,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC,SAAgB,KAAK;QACjBE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 05c95c9165c..b376e70b5af 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -29,37 +29,26 @@ sourceFile:ref/m1.ts --- >>> var m1_c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(4, 18) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(4, 23) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -90,22 +79,19 @@ sourceFile:ref/m1.ts >>> exports.m1_c1 = m1_c1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) 2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 21) Source(2, 14) + SourceIndex(0) -4 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -5 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -134,16 +120,10 @@ sourceFile:ref/m1.ts --- >>> function m1_f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > m1_f1 1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(7, 17) + SourceIndex(0) -3 >Emitted(10, 19) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -151,7 +131,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -176,21 +156,18 @@ sourceFile:ref/m1.ts >>> exports.m1_f1 = m1_f1; 1->^^^^ 2 > ^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ +3 > ^^^^^^^^ +4 > ^ 1-> 2 > m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) 2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 21) Source(7, 17) + SourceIndex(0) -4 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -5 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -232,37 +209,26 @@ sourceFile:test.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 9) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 11) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 18) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 20) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -293,22 +259,19 @@ sourceFile:test.ts >>> exports.c1 = c1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 18) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -337,16 +300,10 @@ sourceFile:test.ts --- >>> function f1() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export function -3 > f1 1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 14) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 16) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -354,7 +311,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -379,22 +336,19 @@ sourceFile:test.ts >>> exports.f1 = f1; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 18) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map index 4fd5727d384..870292fffa0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB,IAAa,EAAE;QAAfA,SAAaA,EAAEA;QAEfC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,GAAF,EAEZ,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC,SAAgB,EAAE;QACdE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,GAAF,EAEf,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map index e4234c0ce9f..35e7e9a48dd 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB,IAAa,KAAK;IAAlBA,SAAaA,KAAKA;IAElBC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,GAAL,KAEZ,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC,SAAgB,KAAK;IACjBE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,GAAL,KAEf,CAAA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 0e378aace84..cf41966a818 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -28,37 +28,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 19) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > export class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->export class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -89,22 +78,19 @@ sourceFile:ref/m1.ts >>>exports.m1_c1 = m1_c1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >m1_c1 -3 > -4 > m1_c1 { - > public m1_c1_p1: number; - > } -5 > +3 > { + > public m1_c1_p1: number; + > } +4 > 1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) 2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 17) Source(2, 14) + SourceIndex(0) -4 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -5 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -133,16 +119,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > m1_f1 1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(7, 17) + SourceIndex(0) -3 >Emitted(9, 15) Source(7, 22) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -150,7 +130,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function m1_f1() { > 2 > return 3 > @@ -175,22 +155,19 @@ sourceFile:ref/m1.ts >>>exports.m1_f1 = m1_f1; 1-> 2 >^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >m1_f1 -3 > -4 > m1_f1() { - > return m1_instance1; - > } -5 > +3 > () { + > return m1_instance1; + > } +4 > 1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) 2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) -4 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -5 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -246,37 +223,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >export class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 16) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 14) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 16) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -307,22 +273,19 @@ sourceFile:test.ts >>>exports.c1 = c1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^-> 1-> 2 >c1 -3 > -4 > c1 { - > public p1: number; - > } -5 > +3 > { + > public p1: number; + > } +4 > 1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) 2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 14) Source(3, 14) + SourceIndex(0) -4 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -5 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -351,16 +314,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >export function -3 > f1 1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(8, 17) + SourceIndex(0) -3 >Emitted(10, 12) Source(8, 19) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -368,7 +325,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^ 5 > ^ -1->() { +1->export function f1() { > 2 > return 3 > @@ -393,22 +350,19 @@ sourceFile:test.ts >>>exports.f1 = f1; 1-> 2 >^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 >f1 -3 > -4 > f1() { - > return instance1; - > } -5 > +3 > () { + > return instance1; + > } +4 > 1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) 2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 14) Source(8, 17) + SourceIndex(0) -4 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -5 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map index 8726f12b557..d0638b6c34c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB,IAAa,EAAE;IAAfA,SAAaA,EAAEA;IAEfC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,GAAF,EAEZ,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC,SAAgB,EAAE;IACdE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,GAAF,EAEf,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index 336519863e2..f5758392a22 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index 336519863e2..f5758392a22 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 5698aa393c1..309061b94ed 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 018b71e572c..64aafef0915 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 4c01d4f1055..63113a47468 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 57143a47b4b..e652c011c17 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 5698aa393c1..309061b94ed 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -191,37 +174,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m2_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) --- >>> return m2_c1; @@ -279,16 +251,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m2_instance1; 1->^^^^ @@ -296,7 +262,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -372,37 +338,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(4, 7) Source(4, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 7) + SourceIndex(0) name (c1) -3 >Emitted(5, 16) Source(4, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -460,16 +415,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) -2 >Emitted(10, 10) Source(9, 10) + SourceIndex(0) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -477,7 +426,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index ece3a005e75..df7254bd000 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 522133b61a4..2903da82815 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index ece3a005e75..df7254bd000 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 522133b61a4..2903da82815 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:outputdir_multifolder/ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -185,37 +168,26 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>var m2_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m2_c1 1->Emitted(12, 1) Source(2, 1) + SourceIndex(1) -2 >Emitted(12, 5) Source(2, 7) + SourceIndex(1) -3 >Emitted(12, 10) Source(2, 12) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m2_c1 1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(13, 14) Source(2, 7) + SourceIndex(1) name (m2_c1) -3 >Emitted(13, 19) Source(2, 12) + SourceIndex(1) name (m2_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m2_c1 { > public m2_c1_p1: number; > 2 > } -1 >Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) 2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) --- >>> return m2_c1; @@ -273,16 +245,10 @@ sourceFile:outputdir_multifolder_ref/m2.ts --- >>>function m2_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m2_f1 1 >Emitted(18, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(18, 10) Source(7, 10) + SourceIndex(1) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(1) --- >>> return m2_instance1; 1->^^^^ @@ -290,7 +256,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m2_f1() { > 2 > return 3 > @@ -360,37 +326,26 @@ sourceFile:outputdir_multifolder/test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(24, 1) Source(4, 1) + SourceIndex(2) -2 >Emitted(24, 5) Source(4, 7) + SourceIndex(2) -3 >Emitted(24, 7) Source(4, 9) + SourceIndex(2) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) -2 >Emitted(25, 14) Source(4, 7) + SourceIndex(2) name (c1) -3 >Emitted(25, 16) Source(4, 9) + SourceIndex(2) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) 2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; @@ -448,16 +403,10 @@ sourceFile:outputdir_multifolder/test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(30, 1) Source(9, 1) + SourceIndex(2) -2 >Emitted(30, 10) Source(9, 10) + SourceIndex(2) -3 >Emitted(30, 12) Source(9, 12) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -465,7 +414,7 @@ sourceFile:outputdir_multifolder/test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt index 0c278b8a07a..6784e74b54c 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt index 0c278b8a07a..6784e74b54c 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 376e7fbb742..b6a9d4f8786 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index c455ec2516d..d920bbe078d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 228d40908fb..ec67c8da25b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 376e7fbb742..b6a9d4f8786 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index 8610dc814fc..a107f15c1bf 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 013a0298c46..a4f350382a6 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index 8610dc814fc..a107f15c1bf 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 013a0298c46..a4f350382a6 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index 5f492905cc1..ac21898e23f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index 5f492905cc1..ac21898e23f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index c37a154dd9f..cdd78604f75 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index c37a154dd9f..cdd78604f75 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 1dd8da6ea41..54961a153f9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index 95cbff86f91..a1be429da80 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 1dd8da6ea41..54961a153f9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (c1) -3 >Emitted(3, 16) Source(2, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -119,16 +108,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 12) Source(7, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index d66cc473768..333f432766e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index d66cc473768..333f432766e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 0d8c0c34ca8..68dc81acc3e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index dead527f9b0..b8fe7026610 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 129e7217134..7a5bbb049d9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 0d8c0c34ca8..68dc81acc3e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -201,37 +184,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -3 >Emitted(3, 7) Source(3, 9) + SourceIndex(0) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c1) -3 >Emitted(4, 16) Source(3, 9) + SourceIndex(0) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) 2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; @@ -289,16 +261,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(9, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(9, 10) Source(8, 10) + SourceIndex(0) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) --- >>> return instance1; 1->^^^^ @@ -306,7 +272,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index 677ccf1596d..6e45ee8da7d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 627fd896eb6..3ca3d1774f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index 677ccf1596d..6e45ee8da7d 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 627fd896eb6..3ca3d1774f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -31,37 +31,26 @@ sourceFile:ref/m1.ts --- >>>var m1_c1 = (function () { 1-> -2 >^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > m1_c1 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(2, 12) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ +2 > ^^-> 1-> -2 > class -3 > m1_c1 1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(3, 14) Source(2, 7) + SourceIndex(0) name (m1_c1) -3 >Emitted(3, 19) Source(2, 12) + SourceIndex(0) name (m1_c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^-> -1 > { +1->class m1_c1 { > public m1_c1_p1: number; > 2 > } -1 >Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) 2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> return m1_c1; @@ -119,16 +108,10 @@ sourceFile:ref/m1.ts --- >>>function m1_f1() { 1 > -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > m1_f1 1 >Emitted(8, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(8, 10) Source(7, 10) + SourceIndex(0) -3 >Emitted(8, 15) Source(7, 15) + SourceIndex(0) --- >>> return m1_instance1; 1->^^^^ @@ -136,7 +119,7 @@ sourceFile:ref/m1.ts 3 > ^ 4 > ^^^^^^^^^^^^ 5 > ^ -1->() { +1->function m1_f1() { > 2 > return 3 > @@ -195,37 +178,26 @@ sourceFile:test.ts --- >>>var c1 = (function () { 1-> -2 >^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 >class -3 > c1 1->Emitted(13, 1) Source(3, 1) + SourceIndex(1) -2 >Emitted(13, 5) Source(3, 7) + SourceIndex(1) -3 >Emitted(13, 7) Source(3, 9) + SourceIndex(1) --- >>> function c1() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > class -3 > c1 1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) -2 >Emitted(14, 14) Source(3, 7) + SourceIndex(1) name (c1) -3 >Emitted(14, 16) Source(3, 9) + SourceIndex(1) name (c1) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->class c1 { > public p1: number; > 2 > } -1 >Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) 2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; @@ -283,16 +255,10 @@ sourceFile:test.ts --- >>>function f1() { 1 > -2 >^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >function -3 > f1 1 >Emitted(19, 1) Source(8, 1) + SourceIndex(1) -2 >Emitted(19, 10) Source(8, 10) + SourceIndex(1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) --- >>> return instance1; 1->^^^^ @@ -300,7 +266,7 @@ sourceFile:test.ts 3 > ^ 4 > ^^^^^^^^^ 5 > ^ -1->() { +1->function f1() { > 2 > return 3 > diff --git a/tests/baselines/reference/properties.js.map b/tests/baselines/reference/properties.js.map index e59b82653b6..28eedbfa450 100644 --- a/tests/baselines/reference/properties.js.map +++ b/tests/baselines/reference/properties.js.map @@ -1,2 +1,2 @@ //// [properties.js.map] -{"version":3,"file":"properties.js","sourceRoot":"","sources":["properties.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count"],"mappings":"AACA,IAAM,OAAO;IAAbA,SAAMA,OAAOA;IAWbC,CAACA;IATGD,sBAAWA,0BAAKA;aAAhBA;YAEIE,MAAMA,CAACA,EAAEA,CAACA;QACdA,CAACA;aAEDF,UAAiBA,KAAaA;YAE1BA,EAAEA;QACNA,CAACA;;;OALAA;IAMLA,cAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"properties.js","sourceRoot":"","sources":["properties.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count"],"mappings":"AACA;IAAAA;IAWAC,CAACA;IATGD,sBAAWA,0BAAKA;aAAhBA;YAEIE,MAAMA,CAACA,EAAEA,CAACA;QACdA,CAACA;aAEDF,UAAiBA,KAAaA;YAE1BA,EAAEA;QACNA,CAACA;;;OALAA;IAMLA,cAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/properties.sourcemap.txt b/tests/baselines/reference/properties.sourcemap.txt index ac124f60230..9e5166f26e3 100644 --- a/tests/baselines/reference/properties.sourcemap.txt +++ b/tests/baselines/reference/properties.sourcemap.txt @@ -10,33 +10,22 @@ sourceFile:properties.ts ------------------------------------------------------------------- >>>var MyClass = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 >class -3 > MyClass 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 12) Source(2, 14) + SourceIndex(0) --- >>> function MyClass() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ +2 > ^^-> 1-> -2 > class -3 > MyClass 1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (MyClass) -2 >Emitted(2, 14) Source(2, 7) + SourceIndex(0) name (MyClass) -3 >Emitted(2, 21) Source(2, 14) + SourceIndex(0) name (MyClass) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > +1->class MyClass >{ > public get Count(): number > { @@ -49,7 +38,7 @@ sourceFile:properties.ts > } > 2 > } -1 >Emitted(3, 5) Source(13, 1) + SourceIndex(0) name (MyClass.constructor) +1->Emitted(3, 5) Source(13, 1) + SourceIndex(0) name (MyClass.constructor) 2 >Emitted(3, 6) Source(13, 2) + SourceIndex(0) name (MyClass.constructor) --- >>> Object.defineProperty(MyClass.prototype, "Count", { diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index 0faf03690d3..19ba558c388 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":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,QAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC,IAAaA,eAAeA;oBAA5BC,SAAaA,eAAeA;oBAQ5BC,CAACA;oBANOD,+BAAKA,GAAZA,cAAiBE,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,GAAfA,eAQZA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,aAAIA,KAAJA,aAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC,IAAaA,UAAUA;gBAKtBC,SALYA,UAAUA,CAKFA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA,IAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;gBAAAA,CAACA,CAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAA,CAACA;gBAEFA,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,GAAVA,UAkBZA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD,IAAM,YAAY;IAAlBc,SAAMA,YAAYA;IAAqEC,CAACA;IAA3CD,sCAAeA,GAAtBA,cAAmCE,MAAMA,CAACA,IAAIA,CAACA,CAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACd,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACS,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC,IAAaA,KAAKA;oBACXC,SADMA,KAAKA,CACSA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA,cAA0BI,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,GAALA,KAWZA,CAAAA;gBAEDA,IAAaA,IAAIA;oBAASM,UAAbA,IAAIA,UAAqBA;oBAAtCA,SAAaA,IAAIA;wBAASC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,GAAJA,IAQZA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBT,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,QAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA,cAAiBE,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,aAAIA,KAAJA,aAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA,IAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;gBAAAA,CAACA,CAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAA,CAACA;gBAEFA,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAc;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA,cAAmCE,MAAMA,CAACA,IAAIA,CAACA,CAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACd,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACS,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA,cAA0BI,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBT,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,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 be632f2f517..dcb1b7d3bb9 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -215,33 +215,22 @@ sourceFile:recursiveClassReferenceTest.ts --- >>> var StartFindAction = (function () { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > StartFindAction 1->Emitted(17, 17) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) -2 >Emitted(17, 21) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(17, 36) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find) --- >>> function StartFindAction() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > StartFindAction 1->Emitted(18, 21) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(18, 30) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(18, 45) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > implements Sample.Thing.IAction { +1->export class StartFindAction implements Sample.Thing.IAction { > > public getId() { return "yo"; } > @@ -251,7 +240,7 @@ sourceFile:recursiveClassReferenceTest.ts > } > 2 > } -1 >Emitted(19, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) +1->Emitted(19, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) 2 >Emitted(19, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) --- >>> StartFindAction.prototype.getId = function () { return "yo"; }; @@ -369,28 +358,25 @@ sourceFile:recursiveClassReferenceTest.ts >>> Find.StartFindAction = StartFindAction; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^ +4 > ^ +5 > ^^^^^^^-> 1-> 2 > StartFindAction -3 > -4 > StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } -5 > +3 > implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } +4 > 1->Emitted(26, 17) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) 2 >Emitted(26, 37) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(26, 40) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) -4 >Emitted(26, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) -5 >Emitted(26, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +3 >Emitted(26, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +4 >Emitted(26, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) --- >>> })(Find = _Thing_1.Find || (_Thing_1.Find = {})); 1->^^^^^^^^^^^^ @@ -694,44 +680,27 @@ sourceFile:recursiveClassReferenceTest.ts --- >>> var FindWidget = (function () { 1->^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > FindWidget 1->Emitted(37, 13) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) -2 >Emitted(37, 17) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(37, 27) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets) --- >>> function FindWidget(codeThing) { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^ -6 > ^^^-> -1-> implements Sample.Thing.IWidget { +2 > ^^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^^ +4 > ^^^-> +1->export class FindWidget implements Sample.Thing.IWidget { > > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} > > private domNode:any = null; > -2 > -3 > FindWidget -4 > implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private -5 > codeThing: Sample.Thing.ICodeThing +2 > constructor(private +3 > codeThing: Sample.Thing.ICodeThing 1->Emitted(38, 17) Source(50, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(38, 26) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(38, 36) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -4 >Emitted(38, 37) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -5 >Emitted(38, 46) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(38, 37) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(38, 46) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- >>> this.codeThing = codeThing; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1024,38 +993,35 @@ sourceFile:recursiveClassReferenceTest.ts >>> Widgets.FindWidget = FindWidget; 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^-> 1-> 2 > FindWidget -3 > -4 > FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } -5 > +3 > implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } +4 > 1->Emitted(54, 13) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) 2 >Emitted(54, 31) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(54, 34) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) -4 >Emitted(54, 44) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) -5 >Emitted(54, 45) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +3 >Emitted(54, 44) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +4 >Emitted(54, 45) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) --- >>> })(Widgets = Thing.Widgets || (Thing.Widgets = {})); 1->^^^^^^^^ @@ -1202,37 +1168,26 @@ sourceFile:recursiveClassReferenceTest.ts --- >>>var AbstractMode = (function () { 1-> -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > >interface IMode { getInitialState(): IState;} > -2 >class -3 > AbstractMode 1->Emitted(58, 1) Source(67, 1) + SourceIndex(0) -2 >Emitted(58, 5) Source(67, 7) + SourceIndex(0) -3 >Emitted(58, 17) Source(67, 19) + SourceIndex(0) --- >>> function AbstractMode() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^^^ +2 > ^^-> 1-> -2 > class -3 > AbstractMode 1->Emitted(59, 5) Source(67, 1) + SourceIndex(0) name (AbstractMode) -2 >Emitted(59, 14) Source(67, 7) + SourceIndex(0) name (AbstractMode) -3 >Emitted(59, 26) Source(67, 19) + SourceIndex(0) name (AbstractMode) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > implements IMode { public getInitialState(): IState { return null;} +1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 2 > } -1 >Emitted(60, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode.constructor) +1->Emitted(60, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode.constructor) 2 >Emitted(60, 6) Source(67, 89) + SourceIndex(0) name (AbstractMode.constructor) --- >>> AbstractMode.prototype.getInitialState = function () { return null; }; @@ -1509,37 +1464,24 @@ sourceFile:recursiveClassReferenceTest.ts --- >>> var State = (function () { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^ -4 > ^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > -2 > export class -3 > State 1->Emitted(72, 17) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(72, 21) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(72, 26) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> function State(mode) { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^ -5 > ^^^^ -6 > ^^^-> -1-> implements IState { +2 > ^^^^^^^^^^^^^^^ +3 > ^^^^ +4 > ^^^-> +1->export class State implements IState { > -2 > -3 > State -4 > implements IState { - > constructor(private -5 > mode: IMode +2 > constructor(private +3 > mode: IMode 1->Emitted(73, 21) Source(79, 9) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(73, 30) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(73, 35) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -4 >Emitted(73, 36) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -5 >Emitted(73, 40) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(73, 36) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(73, 40) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) --- >>> this.mode = mode; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1732,76 +1674,55 @@ sourceFile:recursiveClassReferenceTest.ts >>> PlainText.State = State; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^-> 1-> 2 > State -3 > -4 > State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } -5 > +3 > implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } +4 > 1->Emitted(85, 17) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) 2 >Emitted(85, 32) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(85, 35) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(85, 40) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -5 >Emitted(85, 41) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +3 >Emitted(85, 40) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(85, 41) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> var Mode = (function (_super) { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > -2 > export class -3 > Mode 1->Emitted(86, 17) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(86, 21) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(86, 25) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> __extends(Mode, _super); 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^^ -4 > ^^^^^^^^^^ -1-> extends -2 > -3 > Mode -4 > extends AbstractMode +2 > ^^^^^^^^^^^^^^^^^^^^^^^^ +1->export class Mode extends +2 > AbstractMode 1->Emitted(87, 21) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(87, 31) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(87, 35) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -4 >Emitted(87, 45) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(87, 45) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> function Mode() { 1 >^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 > export class -3 > Mode 1 >Emitted(88, 21) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(88, 30) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(88, 34) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -1-> extends +1->export class Mode extends 2 > AbstractMode 1->Emitted(89, 25) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) 2 >Emitted(89, 55) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) @@ -1928,28 +1849,25 @@ sourceFile:recursiveClassReferenceTest.ts >>> PlainText.Mode = Mode; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > Mode -3 > -4 > Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } -5 > +3 > extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } +4 > 1->Emitted(97, 17) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) 2 >Emitted(97, 31) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(97, 34) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(97, 38) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -5 >Emitted(97, 39) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +3 >Emitted(97, 38) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(97, 39) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> })(PlainText = Languages.PlainText || (Languages.PlainText = {})); 1->^^^^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map index 914d81cee83..f3d245545aa 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js.map +++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-FileWithComments.js.map] -{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist"],"mappings":"AAOA,AADA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAGXA,AADAA,QAAQA;QACKA,KAAKA;QACdC,cAAcA;QACdA,SAFSA,KAAKA,CAEKA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA,cAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,GAALA,KASZA,CAAAA;IAGDA,AADAA,+BAA+BA;QAC3BA,CAACA,GAAGA,EAAEA,CAACA;IAEXA,SAAgBA,GAAGA;IACnBA,CAACA;IADeA,UAAGA,GAAHA,GACfA,CAAAA;IAKDA,AAHAA;;MAEEA;QACEA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAGD,AADA,qBAAqB;IACjB,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist"],"mappings":"AAOA,AADA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAGXA,AADAA,QAAQA;;QAEJC,cAAcA;QACdA,eAAmBA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA,cAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,QASjBA,CAAAA;IAGDA,AADAA,+BAA+BA;QAC3BA,CAACA,GAAGA,EAAEA,CAACA;IAEXA;IACAA,CAACA;IADeA,UAAGA,MAClBA,CAAAA;IAKDA,AAHAA;;MAEEA;QACEA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAGD,AADA,qBAAqB;IACjB,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index 74975cdc583..a300aa502e4 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -100,20 +100,12 @@ sourceFile:sourceMap-FileWithComments.ts 3 >Emitted(4, 13) Source(10, 13) + SourceIndex(0) name (Shapes) --- >>> var Point = (function () { -1->^^^^^^^^ -2 > ^^^^^ -3 > ^^^^^^^^^^-> -1-> - > export class -2 > Point -1->Emitted(5, 9) Source(11, 18) + SourceIndex(0) name (Shapes) -2 >Emitted(5, 14) Source(11, 23) + SourceIndex(0) name (Shapes) ---- >>> // Constructor 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^ 3 > ^^^^^^^^^-> -1-> implements IPoint { +1-> + > export class Point implements IPoint { > 2 > // Constructor 1->Emitted(6, 9) Source(12, 9) + SourceIndex(0) name (Shapes.Point) @@ -121,29 +113,21 @@ sourceFile:sourceMap-FileWithComments.ts --- >>> function Point(x, y) { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^ -4 > ^ -5 > ^ -6 > ^^ -7 > ^ +2 > ^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ 1-> > -2 > -3 > Point -4 > implements IPoint { - > // Constructor - > constructor(public -5 > x: number -6 > , public -7 > y: number +2 > constructor(public +3 > x: number +4 > , public +5 > y: number 1->Emitted(7, 9) Source(13, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(7, 18) Source(11, 18) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(7, 23) Source(11, 23) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(7, 24) Source(13, 28) + SourceIndex(0) name (Shapes.Point) -5 >Emitted(7, 25) Source(13, 37) + SourceIndex(0) name (Shapes.Point) -6 >Emitted(7, 27) Source(13, 46) + SourceIndex(0) name (Shapes.Point) -7 >Emitted(7, 28) Source(13, 55) + SourceIndex(0) name (Shapes.Point) +2 >Emitted(7, 24) Source(13, 28) + SourceIndex(0) name (Shapes.Point) +3 >Emitted(7, 25) Source(13, 37) + SourceIndex(0) name (Shapes.Point) +4 >Emitted(7, 27) Source(13, 46) + SourceIndex(0) name (Shapes.Point) +5 >Emitted(7, 28) Source(13, 55) + SourceIndex(0) name (Shapes.Point) --- >>> this.x = x; 1 >^^^^^^^^^^^^ @@ -373,29 +357,26 @@ sourceFile:sourceMap-FileWithComments.ts >>> Shapes.Point = Point; 1->^^^^ 2 > ^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^^^^^^^^^^^-> +3 > ^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^-> 1-> 2 > Point -3 > -4 > Point implements IPoint { - > // Constructor - > constructor(public x: number, public y: number) { } - > - > // Instance member - > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } - > - > // Static member - > static origin = new Point(0, 0); - > } -5 > +3 > implements IPoint { + > // Constructor + > constructor(public x: number, public y: number) { } + > + > // Instance member + > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } + > + > // Static member + > static origin = new Point(0, 0); + > } +4 > 1->Emitted(17, 5) Source(11, 18) + SourceIndex(0) name (Shapes) 2 >Emitted(17, 17) Source(11, 23) + SourceIndex(0) name (Shapes) -3 >Emitted(17, 20) Source(11, 18) + SourceIndex(0) name (Shapes) -4 >Emitted(17, 25) Source(20, 6) + SourceIndex(0) name (Shapes) -5 >Emitted(17, 26) Source(20, 6) + SourceIndex(0) name (Shapes) +3 >Emitted(17, 25) Source(20, 6) + SourceIndex(0) name (Shapes) +4 >Emitted(17, 26) Source(20, 6) + SourceIndex(0) name (Shapes) --- >>> // Variable comment after class 1->^^^^ @@ -432,45 +413,37 @@ sourceFile:sourceMap-FileWithComments.ts --- >>> function foo() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ +2 > ^^-> 1-> > > -2 > export function -3 > foo 1->Emitted(20, 5) Source(25, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(20, 14) Source(25, 21) + SourceIndex(0) name (Shapes) -3 >Emitted(20, 17) Source(25, 24) + SourceIndex(0) name (Shapes) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^-> -1 >() { +1->export function foo() { > 2 > } -1 >Emitted(21, 5) Source(26, 5) + SourceIndex(0) name (Shapes) +1->Emitted(21, 5) Source(26, 5) + SourceIndex(0) name (Shapes) 2 >Emitted(21, 6) Source(26, 6) + SourceIndex(0) name (Shapes) --- >>> Shapes.foo = foo; 1->^^^^ 2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^-> +3 > ^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^-> 1-> 2 > foo -3 > -4 > foo() { - > } -5 > +3 > () { + > } +4 > 1->Emitted(22, 5) Source(25, 21) + SourceIndex(0) name (Shapes) 2 >Emitted(22, 15) Source(25, 24) + SourceIndex(0) name (Shapes) -3 >Emitted(22, 18) Source(25, 21) + SourceIndex(0) name (Shapes) -4 >Emitted(22, 21) Source(26, 6) + SourceIndex(0) name (Shapes) -5 >Emitted(22, 22) Source(26, 6) + SourceIndex(0) name (Shapes) +3 >Emitted(22, 21) Source(26, 6) + SourceIndex(0) name (Shapes) +4 >Emitted(22, 22) Source(26, 6) + SourceIndex(0) name (Shapes) --- >>> /** comment after function 1->^^^^ diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map index 78a59c1b6c1..615db73973a 100644 --- a/tests/baselines/reference/sourceMapSample.js.map +++ b/tests/baselines/reference/sourceMapSample.js.map @@ -1,2 +1,2 @@ //// [sourceMapSample.js.map] -{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAkCbA;IAlCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,uBAA0BA;iBAA1BA,WAA0BA,CAA1BA,sBAA0BA,CAA1BA,IAA0BA;gBAA1BA,sCAA0BA;;YACtDA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAlCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAkCbA;AAADA,CAACA,EAlCM,GAAG,KAAH,GAAG,QAkCT"} \ No newline at end of file +{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAkCbA;IAlCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA;YACIC,iBAAmBA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,aAAaA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,cAAcA,QAAgBA;YAAEK,uBAA0BA;iBAA1BA,WAA0BA,CAA1BA,sBAA0BA,CAA1BA,IAA0BA;gBAA1BA,sCAA0BA;;YACtDA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAlCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAkCbA;AAADA,CAACA,EAlCM,GAAG,KAAH,GAAG,QAkCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt index 218dfb1c152..df35ff4257f 100644 --- a/tests/baselines/reference/sourceMapSample.sourcemap.txt +++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt @@ -150,37 +150,24 @@ sourceFile:sourceMapSample.ts --- >>> var Greeter = (function () { 1->^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > -2 > class -3 > Greeter 1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(6, 13) Source(4, 11) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(6, 20) Source(4, 18) + SourceIndex(0) name (Foo.Bar) --- >>> function Greeter(greeting) { 1->^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^-> -1-> { +2 > ^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^-> +1->class Greeter { > -2 > -3 > Greeter -4 > { - > constructor(public -5 > greeting: string +2 > constructor(public +3 > greeting: string 1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(7, 22) Source(4, 11) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(7, 29) Source(4, 18) + SourceIndex(0) name (Foo.Bar.Greeter) -4 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) -5 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) +2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) +3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) --- >>> this.greeting = greeting; 1->^^^^^^^^^^^^^^^^ @@ -302,24 +289,18 @@ sourceFile:sourceMapSample.ts --- >>> function foo(greeting) { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^^^^^^^^^-> 1-> > > > -2 > function -3 > foo -4 > ( -5 > greeting: string +2 > function foo( +3 > greeting: string 1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(15, 18) Source(14, 14) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(15, 21) Source(14, 17) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) +2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) +3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) --- >>> return new Greeter(greeting); 1->^^^^^^^^^^^^ @@ -427,23 +408,17 @@ sourceFile:sourceMapSample.ts --- >>> function foo2(greeting) { 1 >^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^^-> +2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^^-> 1 > > > -2 > function -3 > foo2 -4 > ( -5 > greeting: string +2 > function foo2( +3 > greeting: string 1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(20, 18) Source(21, 14) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(20, 22) Source(21, 18) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) +2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) +3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) --- >>> var restGreetings = []; 1->^^^^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map index 661459022b1..8693cf5d0fe 100644 --- a/tests/baselines/reference/sourceMapValidationClass.js.map +++ b/tests/baselines/reference/sourceMapValidationClass.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClass.js.map] -{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA,IAAM,OAAO;IACTA,SADEA,OAAOA,CACUA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA;IACIA,iBAAmBA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt index 1c80abde32e..0e019b487bb 100644 --- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt @@ -10,34 +10,21 @@ sourceFile:sourceMapValidationClass.ts ------------------------------------------------------------------- >>>var Greeter = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > Greeter 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 12) Source(1, 14) + SourceIndex(0) --- >>> function Greeter(greeting) { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^ -1-> { +2 > ^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +1->class Greeter { > -2 > -3 > Greeter -4 > { - > constructor(public -5 > greeting: string +2 > constructor(public +3 > greeting: string 1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(2, 21) Source(1, 14) + SourceIndex(0) name (Greeter) -4 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) name (Greeter) -5 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) name (Greeter) +2 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) name (Greeter) +3 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) name (Greeter) --- >>> var b = []; 1 >^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map index 0ed561de563..07abb96ca91 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructor.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructor.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructor.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA,IAAM,OAAO;IAAbA,SAAMA,OAAOA;QACFC,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructor.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructor.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QACWC,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt index 57f9686f062..ede638b64d9 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt @@ -10,27 +10,15 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts ------------------------------------------------------------------- >>>var Greeter = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > Greeter 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 12) Source(1, 14) + SourceIndex(0) --- >>> function Greeter() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^-> +2 > ^^^^^^^^^^^^^^^^^-> 1-> -2 > class -3 > Greeter 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(2, 21) Source(1, 14) + SourceIndex(0) name (Greeter) --- >>> this.a = 10; 1->^^^^^^^^ @@ -39,7 +27,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 4 > ^^ 5 > ^ 6 > ^^^^^^^^-> -1-> { +1->class Greeter { > public 2 > a 3 > = diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map index c06771070a8..b0325217c7a 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA,IAAM,OAAO;IAAbA,SAAMA,OAAOA;QAAbC,iBAGCA;QAFUA,MAACA,GAAGA,EAAEA,CAACA;QACPA,YAAOA,GAAGA,cAAMA,OAAAA,KAAIA,CAACA,CAACA,EAANA,CAAMA,CAACA;IAClCA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QAAAC,iBAGCA;QAFUA,MAACA,GAAGA,EAAEA,CAACA;QACPA,YAAOA,GAAGA,cAAMA,OAAAA,KAAIA,CAACA,CAACA,EAANA,CAAMA,CAACA;IAClCA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt index 82a592e4bd2..555f1c096c2 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt @@ -10,27 +10,15 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen ------------------------------------------------------------------- >>>var Greeter = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > Greeter 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 12) Source(1, 14) + SourceIndex(0) --- >>> function Greeter() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 > class -3 > Greeter 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(2, 21) Source(1, 14) + SourceIndex(0) name (Greeter) --- >>> var _this = this; 1->^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map index d379fa629ca..60a26845043 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":["AbstractGreeter","AbstractGreeter.constructor","Greeter","Greeter.constructor"],"mappings":";;;;;;AAAA,IAAM,eAAe;IAArBA,SAAMA,eAAeA;IACrBC,CAACA;IAADD,sBAACA;AAADA,CAACA,AADD,IACC;AAED,IAAM,OAAO;IAASE,UAAhBA,OAAOA,UAAwBA;IAArCA,SAAMA,OAAOA;QAASC,8BAAeA;QAC1BA,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,EAAsB,eAAe,EAGpC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":["AbstractGreeter","AbstractGreeter.constructor","Greeter","Greeter.constructor"],"mappings":";;;;;;AAAA;IAAAA;IACAC,CAACA;IAADD,sBAACA;AAADA,CAACA,AADD,IACC;AAED;IAAsBE,2BAAeA;IAArCA;QAAsBC,8BAAeA;QAC1BA,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,EAAsB,eAAe,EAGpC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt index 010ad8ea1e1..96b52724320 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt @@ -16,35 +16,24 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts >>>}; >>>var AbstractGreeter = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > AbstractGreeter 1 >Emitted(7, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(7, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(7, 20) Source(1, 22) + SourceIndex(0) --- >>> function AbstractGreeter() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^ +2 > ^^-> 1-> -2 > class -3 > AbstractGreeter 1->Emitted(8, 5) Source(1, 1) + SourceIndex(0) name (AbstractGreeter) -2 >Emitted(8, 14) Source(1, 7) + SourceIndex(0) name (AbstractGreeter) -3 >Emitted(8, 29) Source(1, 22) + SourceIndex(0) name (AbstractGreeter) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->class AbstractGreeter { > 2 > } -1 >Emitted(9, 5) Source(2, 1) + SourceIndex(0) name (AbstractGreeter.constructor) +1->Emitted(9, 5) Source(2, 1) + SourceIndex(0) name (AbstractGreeter.constructor) 2 >Emitted(9, 6) Source(2, 2) + SourceIndex(0) name (AbstractGreeter.constructor) --- >>> return AbstractGreeter; @@ -73,48 +62,30 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts --- >>>var Greeter = (function (_super) { 1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > -2 >class -3 > Greeter 1->Emitted(12, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(12, 5) Source(4, 7) + SourceIndex(0) -3 >Emitted(12, 12) Source(4, 14) + SourceIndex(0) --- >>> __extends(Greeter, _super); 1->^^^^ -2 > ^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^ -1-> extends -2 > -3 > Greeter -4 > extends AbstractGreeter +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1->class Greeter extends +2 > AbstractGreeter 1->Emitted(13, 5) Source(4, 23) + SourceIndex(0) name (Greeter) -2 >Emitted(13, 15) Source(4, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(13, 22) Source(4, 14) + SourceIndex(0) name (Greeter) -4 >Emitted(13, 32) Source(4, 38) + SourceIndex(0) name (Greeter) +2 >Emitted(13, 32) Source(4, 38) + SourceIndex(0) name (Greeter) --- >>> function Greeter() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 > class -3 > Greeter 1 >Emitted(14, 5) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(14, 14) Source(4, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(14, 21) Source(4, 14) + SourceIndex(0) name (Greeter) --- >>> _super.apply(this, arguments); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -1-> extends +1->class Greeter extends 2 > AbstractGreeter 1->Emitted(15, 9) Source(4, 23) + SourceIndex(0) name (Greeter.constructor) 2 >Emitted(15, 39) Source(4, 38) + SourceIndex(0) name (Greeter.constructor) diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map index 68ded9631e2..e3ffe2de454 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js.map +++ b/tests/baselines/reference/sourceMapValidationClasses.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClasses.js.map] -{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAmCbA;IAnCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,kBAAiBA,mBAAmBA,MAAUA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,cAAiBA,mBAAmBA,yBAAUA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,EAAEA,0BAA0BA,AAA3BA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QAEpCA,AADAA,qCAAqCA;QACrCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAmCbA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAmCbA;IAnCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA;YACIC,iBAAmBA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,aAAaA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,cAAcA,QAAgBA;YAAEK,kBAAiBA,mBAAmBA,MAAUA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,cAAiBA,mBAAmBA,yBAAUA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,EAAEA,0BAA0BA,AAA3BA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QAEpCA,AADAA,qCAAqCA;QACrCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAmCbA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index 6cd77b696ff..6d937785cc8 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -152,37 +152,24 @@ sourceFile:sourceMapValidationClasses.ts --- >>> var Greeter = (function () { 1->^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > -2 > class -3 > Greeter 1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(6, 13) Source(4, 11) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(6, 20) Source(4, 18) + SourceIndex(0) name (Foo.Bar) --- >>> function Greeter(greeting) { 1->^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^-> -1-> { +2 > ^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^-> +1->class Greeter { > -2 > -3 > Greeter -4 > { - > constructor(public -5 > greeting: string +2 > constructor(public +3 > greeting: string 1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(7, 22) Source(4, 11) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(7, 29) Source(4, 18) + SourceIndex(0) name (Foo.Bar.Greeter) -4 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) -5 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) +2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) +3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) --- >>> this.greeting = greeting; 1->^^^^^^^^^^^^^^^^ @@ -304,24 +291,18 @@ sourceFile:sourceMapValidationClasses.ts --- >>> function foo(greeting) { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^^^^^^^^^-> 1-> > > > -2 > function -3 > foo -4 > ( -5 > greeting: string +2 > function foo( +3 > greeting: string 1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(15, 18) Source(14, 14) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(15, 21) Source(14, 17) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) +2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) +3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) --- >>> return new Greeter(greeting); 1->^^^^^^^^^^^^ @@ -429,23 +410,17 @@ sourceFile:sourceMapValidationClasses.ts --- >>> function foo2(greeting) { 1 >^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > > -2 > function -3 > foo2 -4 > ( -5 > greeting: string +2 > function foo2( +3 > greeting: string 1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(20, 18) Source(21, 14) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(20, 22) Source(21, 18) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) +2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) +3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) --- >>> var restGreetings /* more greeting */ = []; 1->^^^^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map index c44a5e54c3b..2846bc70e06 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignment.js.map] -{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":["a","a.constructor"],"mappings":";IAAA,IAAM,CAAC;QAAPA,SAAMA,CAACA;QAEPC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IACU,AAAX,OAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":["a","a.constructor"],"mappings":";IAAA;QAAAA;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IACU,AAAX,OAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt index 86dd911d5a8..58810df106b 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt @@ -11,36 +11,25 @@ sourceFile:sourceMapValidationExportAssignment.ts >>>define(["require", "exports"], function (require, exports) { >>> var a = (function () { 1 >^^^^ -2 > ^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^-> 1 > -2 > class -3 > a 1 >Emitted(2, 5) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 9) Source(1, 7) + SourceIndex(0) -3 >Emitted(2, 10) Source(1, 8) + SourceIndex(0) --- >>> function a() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > a 1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) name (a) -2 >Emitted(3, 18) Source(1, 7) + SourceIndex(0) name (a) -3 >Emitted(3, 19) Source(1, 8) + SourceIndex(0) name (a) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class a { > public c; > 2 > } -1 >Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (a.constructor) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (a.constructor) 2 >Emitted(4, 10) Source(3, 2) + SourceIndex(0) name (a.constructor) --- >>> return a; diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map index 18e89d37465..f3d29aaebf8 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignmentCommonjs.js.map] -{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAEPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACU,AAAX,iBAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACU,AAAX,iBAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt index 308e29c37a5..a78364591f9 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt @@ -10,36 +10,25 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts ------------------------------------------------------------------- >>>var a = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > a 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0) --- >>> function a() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > a 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (a) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (a) -3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (a) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class a { > public c; > 2 > } -1 >Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor) +1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor) 2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (a.constructor) --- >>> return a; diff --git a/tests/baselines/reference/sourceMapValidationFunctions.js.map b/tests/baselines/reference/sourceMapValidationFunctions.js.map index c04ec524d2d..bb98f5b19d2 100644 --- a/tests/baselines/reference/sourceMapValidationFunctions.js.map +++ b/tests/baselines/reference/sourceMapValidationFunctions.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationFunctions.js.map] -{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":["greet","greet2","foo"],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,SAAS,KAAK,CAAC,QAAgB;IAC3BA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,MAAM,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IACzEA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,GAAG,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IAEtEA,MAAMA,CAACA;AACXA,CAACA"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":["greet","greet2","foo"],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,eAAe,QAAgB;IAC3BA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,gBAAgB,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IACzEA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,aAAa,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IAEtEA,MAAMA,CAACA;AACXA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt index a9e43e404a7..830e9c459d7 100644 --- a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt @@ -31,21 +31,15 @@ sourceFile:sourceMapValidationFunctions.ts --- >>>function greet(greeting) { 1-> -2 >^^^^^^^^^ -3 > ^^^^^ -4 > ^ -5 > ^^^^^^^^ +2 >^^^^^^^^^^^^^^^ +3 > ^^^^^^^^ 1-> > -2 >function -3 > greet -4 > ( -5 > greeting: string +2 >function greet( +3 > greeting: string 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 10) Source(2, 10) + SourceIndex(0) -3 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 16) + SourceIndex(0) -5 >Emitted(2, 24) Source(2, 32) + SourceIndex(0) +2 >Emitted(2, 16) Source(2, 16) + SourceIndex(0) +3 >Emitted(2, 24) Source(2, 32) + SourceIndex(0) --- >>> greetings++; 1 >^^^^ @@ -93,34 +87,28 @@ sourceFile:sourceMapValidationFunctions.ts --- >>>function greet2(greeting, n, x) { 1-> -2 >^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^ -7 > ^ -8 > ^^ -9 > ^ -10> ^^^^-> +2 >^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^ +8 > ^^^^-> 1-> > -2 >function -3 > greet2 -4 > ( -5 > greeting: string -6 > , -7 > n = 10 -8 > , -9 > x?: string +2 >function greet2( +3 > greeting: string +4 > , +5 > n = 10 +6 > , +7 > x?: string 1->Emitted(6, 1) Source(6, 1) + SourceIndex(0) -2 >Emitted(6, 10) Source(6, 10) + SourceIndex(0) -3 >Emitted(6, 16) Source(6, 16) + SourceIndex(0) -4 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) -5 >Emitted(6, 25) Source(6, 33) + SourceIndex(0) -6 >Emitted(6, 27) Source(6, 35) + SourceIndex(0) -7 >Emitted(6, 28) Source(6, 41) + SourceIndex(0) -8 >Emitted(6, 30) Source(6, 43) + SourceIndex(0) -9 >Emitted(6, 31) Source(6, 53) + SourceIndex(0) +2 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) +3 >Emitted(6, 25) Source(6, 33) + SourceIndex(0) +4 >Emitted(6, 27) Source(6, 35) + SourceIndex(0) +5 >Emitted(6, 28) Source(6, 41) + SourceIndex(0) +6 >Emitted(6, 30) Source(6, 43) + SourceIndex(0) +7 >Emitted(6, 31) Source(6, 53) + SourceIndex(0) --- >>> if (n === void 0) { n = 10; } 1->^^^^ @@ -220,34 +208,28 @@ sourceFile:sourceMapValidationFunctions.ts --- >>>function foo(greeting, n, x) { 1-> -2 >^^^^^^^^^ -3 > ^^^ -4 > ^ -5 > ^^^^^^^^ -6 > ^^ -7 > ^ -8 > ^^ -9 > ^ -10> ^^^^^^^-> +2 >^^^^^^^^^^^^^ +3 > ^^^^^^^^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^ +8 > ^^^^^^^-> 1-> > -2 >function -3 > foo -4 > ( -5 > greeting: string -6 > , -7 > n = 10 -8 > , -9 > x?: string +2 >function foo( +3 > greeting: string +4 > , +5 > n = 10 +6 > , +7 > x?: string 1->Emitted(15, 1) Source(10, 1) + SourceIndex(0) -2 >Emitted(15, 10) Source(10, 10) + SourceIndex(0) -3 >Emitted(15, 13) Source(10, 13) + SourceIndex(0) -4 >Emitted(15, 14) Source(10, 14) + SourceIndex(0) -5 >Emitted(15, 22) Source(10, 30) + SourceIndex(0) -6 >Emitted(15, 24) Source(10, 32) + SourceIndex(0) -7 >Emitted(15, 25) Source(10, 38) + SourceIndex(0) -8 >Emitted(15, 27) Source(10, 40) + SourceIndex(0) -9 >Emitted(15, 28) Source(10, 50) + SourceIndex(0) +2 >Emitted(15, 14) Source(10, 14) + SourceIndex(0) +3 >Emitted(15, 22) Source(10, 30) + SourceIndex(0) +4 >Emitted(15, 24) Source(10, 32) + SourceIndex(0) +5 >Emitted(15, 25) Source(10, 38) + SourceIndex(0) +6 >Emitted(15, 27) Source(10, 40) + SourceIndex(0) +7 >Emitted(15, 28) Source(10, 50) + SourceIndex(0) --- >>> if (n === void 0) { n = 10; } 1->^^^^ diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index 59cfbf86a91..a5b9c2b0317 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":["m","m.c","m.c.constructor"],"mappings":"AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACbA,IAAaA,CAACA;QAAdC,SAAaA,CAACA;QACdC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,GAACA,GAADA,CACZA,CAAAA;AACLA,CAACA,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":["m","m.c","m.c.constructor"],"mappings":"AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACbA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,GAACA,IACbA,CAAAA;AACLA,CAACA,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 38ed0c972f5..73d7e48fb28 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -46,36 +46,25 @@ sourceFile:sourceMapValidationImport.ts --- >>> var c = (function () { 1->^^^^ -2 > ^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c 1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (m) -2 >Emitted(3, 9) Source(2, 18) + SourceIndex(0) name (m) -3 >Emitted(3, 10) Source(2, 19) + SourceIndex(0) name (m) --- >>> function c() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > export class -3 > c 1->Emitted(4, 9) Source(2, 5) + SourceIndex(0) name (m.c) -2 >Emitted(4, 18) Source(2, 18) + SourceIndex(0) name (m.c) -3 >Emitted(4, 19) Source(2, 19) + SourceIndex(0) name (m.c) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->export class c { > 2 > } -1 >Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m.c.constructor) +1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m.c.constructor) 2 >Emitted(5, 10) Source(3, 6) + SourceIndex(0) name (m.c.constructor) --- >>> return c; @@ -105,21 +94,18 @@ sourceFile:sourceMapValidationImport.ts >>> m.c = c; 1->^^^^ 2 > ^^^ -3 > ^^^ -4 > ^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > c -3 > -4 > c { - > } -5 > +3 > { + > } +4 > 1->Emitted(8, 5) Source(2, 18) + SourceIndex(0) name (m) 2 >Emitted(8, 8) Source(2, 19) + SourceIndex(0) name (m) -3 >Emitted(8, 11) Source(2, 18) + SourceIndex(0) name (m) -4 >Emitted(8, 12) Source(3, 6) + SourceIndex(0) name (m) -5 >Emitted(8, 13) Source(3, 6) + SourceIndex(0) name (m) +3 >Emitted(8, 12) Source(3, 6) + SourceIndex(0) name (m) +4 >Emitted(8, 13) Source(3, 6) + SourceIndex(0) name (m) --- >>>})(m = exports.m || (exports.m = {})); 1-> diff --git a/tests/baselines/reference/sourceMapValidationModule.js.map b/tests/baselines/reference/sourceMapValidationModule.js.map index c601c045cc7..b56797bbf98 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js.map +++ b/tests/baselines/reference/sourceMapValidationModule.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationModule.js.map] -{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":["m2","m3","m3.m4","m3.foo"],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA,EAAEA,CAACA;AACRA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAOA,EAAEA,CAERA;IAFDA,WAAOA,EAAEA,EAACA,CAACA;QACIC,IAACA,GAAGA,EAAEA,CAACA;IACtBA,CAACA,EAFMD,EAAEA,KAAFA,EAAEA,QAERA;IAEDA,SAAgBA,GAAGA;QACfE,MAAMA,CAACA,EAAEA,CAACA,CAACA,CAACA;IAChBA,CAACA;IAFeF,MAAGA,GAAHA,GAEfA,CAAAA;AACLA,CAACA,EARM,EAAE,KAAF,EAAE,QAQR"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":["m2","m3","m3.m4","m3.foo"],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA,EAAEA,CAACA;AACRA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAOA,EAAEA,CAERA;IAFDA,WAAOA,EAAEA,EAACA,CAACA;QACIC,IAACA,GAAGA,EAAEA,CAACA;IACtBA,CAACA,EAFMD,EAAEA,KAAFA,EAAEA,QAERA;IAEDA;QACIE,MAAMA,CAACA,EAAEA,CAACA,CAACA,CAACA;IAChBA,CAACA;IAFeF,MAAGA,MAElBA,CAAAA;AACLA,CAACA,EARM,EAAE,KAAF,EAAE,QAQR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt index f20aff9ad97..286fffb4469 100644 --- a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt @@ -230,17 +230,11 @@ sourceFile:sourceMapValidationModule.ts --- >>> function foo() { 1 >^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^-> +2 > ^^^^^^^^^^^^^^^^^-> 1 > > > -2 > export function -3 > foo 1 >Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (m3) -2 >Emitted(12, 14) Source(10, 21) + SourceIndex(0) name (m3) -3 >Emitted(12, 17) Source(10, 24) + SourceIndex(0) name (m3) --- >>> return m4.x; 1->^^^^^^^^ @@ -250,7 +244,7 @@ sourceFile:sourceMapValidationModule.ts 5 > ^ 6 > ^ 7 > ^ -1->() { +1->export function foo() { > 2 > return 3 > @@ -279,22 +273,19 @@ sourceFile:sourceMapValidationModule.ts >>> m3.foo = foo; 1->^^^^ 2 > ^^^^^^ -3 > ^^^ -4 > ^^^ -5 > ^ -6 > ^^^^-> +3 > ^^^^^^ +4 > ^ +5 > ^^^^-> 1-> 2 > foo -3 > -4 > foo() { - > return m4.x; - > } -5 > +3 > () { + > return m4.x; + > } +4 > 1->Emitted(15, 5) Source(10, 21) + SourceIndex(0) name (m3) 2 >Emitted(15, 11) Source(10, 24) + SourceIndex(0) name (m3) -3 >Emitted(15, 14) Source(10, 21) + SourceIndex(0) name (m3) -4 >Emitted(15, 17) Source(12, 6) + SourceIndex(0) name (m3) -5 >Emitted(15, 18) Source(12, 6) + SourceIndex(0) name (m3) +3 >Emitted(15, 17) Source(12, 6) + SourceIndex(0) name (m3) +4 >Emitted(15, 18) Source(12, 6) + SourceIndex(0) name (m3) --- >>>})(m3 || (m3 = {})); 1-> diff --git a/tests/baselines/reference/sourceMapValidationStatements.js.map b/tests/baselines/reference/sourceMapValidationStatements.js.map index 7bf883de6c3..a1ea3b1db79 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.js.map +++ b/tests/baselines/reference/sourceMapValidationStatements.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationStatements.js.map] -{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA,SAAS,CAAC;IACNA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA;IACIA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt index 586063c7c12..2a2daed01db 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt @@ -10,15 +10,9 @@ sourceFile:sourceMapValidationStatements.ts ------------------------------------------------------------------- >>>function f() { 1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^-> +2 >^^^^^^^^^^^-> 1 > -2 >function -3 > f 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 10) Source(1, 10) + SourceIndex(0) -3 >Emitted(1, 11) Source(1, 11) + SourceIndex(0) --- >>> var y; 1->^^^^ @@ -26,7 +20,7 @@ sourceFile:sourceMapValidationStatements.ts 3 > ^ 4 > ^ 5 > ^^^^^-> -1->() { +1->function f() { > 2 > var 3 > y diff --git a/tests/baselines/reference/sourceMapValidationWithComments.js.map b/tests/baselines/reference/sourceMapValidationWithComments.js.map index 75563cf9b95..fe250495802 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.js.map +++ b/tests/baselines/reference/sourceMapValidationWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationWithComments.js.map] -{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":["DebugClass","DebugClass.constructor","DebugClass.debugFunc"],"mappings":"AAAA,IAAM,UAAU;IAAhBA,SAAMA,UAAUA;IAoBhBC,CAACA;IAlBiBD,oBAASA,GAAvBA;QAGIE,AADAA,2BAA2BA;YACvBA,CAACA,GAAGA,CAACA,CAACA;QACVA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QAIJA,AAHAA,yBAAyBA;QAGzBA,MAAMA,CAACA,IAAIA,CAACA;IAChBA,CAACA;IACLF,iBAACA;AAADA,CAACA,AApBD,IAoBC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":["DebugClass","DebugClass.constructor","DebugClass.debugFunc"],"mappings":"AAAA;IAAAA;IAoBAC,CAACA;IAlBiBD,oBAASA,GAAvBA;QAGIE,AADAA,2BAA2BA;YACvBA,CAACA,GAAGA,CAACA,CAACA;QACVA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QAIJA,AAHAA,yBAAyBA;QAGzBA,MAAMA,CAACA,IAAIA,CAACA;IAChBA,CAACA;IACLF,iBAACA;AAADA,CAACA,AApBD,IAoBC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt index 929091139f7..5d2716cd127 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt @@ -10,32 +10,21 @@ sourceFile:sourceMapValidationWithComments.ts ------------------------------------------------------------------- >>>var DebugClass = (function () { 1 > -2 >^^^^ -3 > ^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > DebugClass 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 15) Source(1, 17) + SourceIndex(0) --- >>> function DebugClass() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^ +2 > ^^-> 1-> -2 > class -3 > DebugClass 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (DebugClass) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (DebugClass) -3 >Emitted(2, 24) Source(1, 17) + SourceIndex(0) name (DebugClass) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->class DebugClass { > > public static debugFunc() { > @@ -57,7 +46,7 @@ sourceFile:sourceMapValidationWithComments.ts > } > 2 > } -1 >Emitted(3, 5) Source(21, 1) + SourceIndex(0) name (DebugClass.constructor) +1->Emitted(3, 5) Source(21, 1) + SourceIndex(0) name (DebugClass.constructor) 2 >Emitted(3, 6) Source(21, 2) + SourceIndex(0) name (DebugClass.constructor) --- >>> DebugClass.debugFunc = function () { diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map index 384caae23ea..cc528f82334 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;IAClI,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;;IACxIA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD;IAAAE;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt index b67d4e3be57..b26b7c71db6 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt @@ -32,34 +32,21 @@ sourceFile:../testFiles/app.ts 2 >Emitted(2, 137) Source(2, 137) + SourceIndex(0) --- >>>var c = (function () { -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > c -1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0) ---- >>> function c() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> -2 > class -3 > c -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c) -3 >Emitted(4, 15) Source(3, 8) + SourceIndex(0) name (c) +1 >^^^^ +2 > ^^-> +1 > + > +1 >Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class c { > 2 > } -1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) 2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) --- >>> return c; @@ -92,35 +79,24 @@ sourceFile:../testFiles/app2.ts ------------------------------------------------------------------- >>>var d = (function () { 1-> -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1-> -2 >class -3 > d 1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 5) Source(1, 7) + SourceIndex(1) -3 >Emitted(8, 6) Source(1, 8) + SourceIndex(1) --- >>> function d() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > d 1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) name (d) -2 >Emitted(9, 14) Source(1, 7) + SourceIndex(1) name (d) -3 >Emitted(9, 15) Source(1, 8) + SourceIndex(1) name (d) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class d { > 2 > } -1 >Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) +1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) 2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) name (d.constructor) --- >>> return d; diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map index e665c70c15b..b27ad076cc8 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map @@ -1,3 +1,3 @@ //// [app.js.map] -{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;IAClI,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] -{"version":3,"file":"app2.js","sourceRoot":"","sources":["../testFiles/app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;;IACxIA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] +{"version":3,"file":"app2.js","sourceRoot":"","sources":["../testFiles/app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt index 7d94304c359..6064ee003df 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -32,34 +32,21 @@ sourceFile:../testFiles/app.ts 2 >Emitted(2, 137) Source(2, 137) + SourceIndex(0) --- >>>var c = (function () { -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > c -1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0) ---- >>> function c() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> -2 > class -3 > c -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c) -3 >Emitted(4, 15) Source(3, 8) + SourceIndex(0) name (c) +1 >^^^^ +2 > ^^-> +1 > + > +1 >Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class c { > 2 > } -1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) 2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) --- >>> return c; @@ -98,35 +85,24 @@ sourceFile:../testFiles/app2.ts ------------------------------------------------------------------- >>>var d = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > d 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0) --- >>> function d() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > d 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (d) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (d) -3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (d) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class d { > 2 > } -1 >Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) 2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (d.constructor) --- >>> return d; diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map index 1142b4313a7..bac55383fff 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["M","m1","m1.c1","m1.c1.constructor"],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACKA,GAACA,GAAGA,CAACA,CAACA;AACrBA,CAACA,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAaA,EAAEA;QAAfC,SAAaA,EAAEA;QACfC,CAACA;QAADD,SAACA;IAADA,CAACA,AADDD,IACCA;IADYA,KAAEA,GAAFA,EACZA,CAAAA;AACLA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["M","m1","m1.c1","m1.c1.constructor"],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACKA,GAACA,GAAGA,CAACA,CAACA;AACrBA,CAACA,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPC;QAAAC;QACAC,CAACA;QAADD,SAACA;IAADA,CAACA,AADDD,IACCA;IADYA,KAAEA,KACdA,CAAAA;AACLA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt index e58ed879c6f..63d4cec6ef1 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt @@ -129,36 +129,25 @@ sourceFile:tests/cases/compiler/b.ts --- >>> var c1 = (function () { 1->^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c1 1->Emitted(7, 5) Source(2, 5) + SourceIndex(1) name (m1) -2 >Emitted(7, 9) Source(2, 18) + SourceIndex(1) name (m1) -3 >Emitted(7, 11) Source(2, 20) + SourceIndex(1) name (m1) --- >>> function c1() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ +2 > ^^-> 1-> -2 > export class -3 > c1 1->Emitted(8, 9) Source(2, 5) + SourceIndex(1) name (m1.c1) -2 >Emitted(8, 18) Source(2, 18) + SourceIndex(1) name (m1.c1) -3 >Emitted(8, 20) Source(2, 20) + SourceIndex(1) name (m1.c1) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^-> -1 > { +1->export class c1 { > 2 > } -1 >Emitted(9, 9) Source(3, 5) + SourceIndex(1) name (m1.c1.constructor) +1->Emitted(9, 9) Source(3, 5) + SourceIndex(1) name (m1.c1.constructor) 2 >Emitted(9, 10) Source(3, 6) + SourceIndex(1) name (m1.c1.constructor) --- >>> return c1; @@ -188,21 +177,18 @@ sourceFile:tests/cases/compiler/b.ts >>> m1.c1 = c1; 1->^^^^ 2 > ^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -6 > ^^^^^^-> +3 > ^^^^^ +4 > ^ +5 > ^^^^^^-> 1-> 2 > c1 -3 > -4 > c1 { - > } -5 > +3 > { + > } +4 > 1->Emitted(12, 5) Source(2, 18) + SourceIndex(1) name (m1) 2 >Emitted(12, 10) Source(2, 20) + SourceIndex(1) name (m1) -3 >Emitted(12, 13) Source(2, 18) + SourceIndex(1) name (m1) -4 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) name (m1) -5 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) name (m1) +3 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) name (m1) +4 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) name (m1) --- >>>})(m1 || (m1 = {})); 1-> diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map index 0a164a2a2c2..e3262d8c686 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;IACpG,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;;IAC1GA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD;IAAAE;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt index 1923426adc6..560fd29616d 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt @@ -32,34 +32,21 @@ sourceFile:app.ts 2 >Emitted(2, 107) Source(2, 107) + SourceIndex(0) --- >>>var c = (function () { -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > c -1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0) ---- >>> function c() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> -2 > class -3 > c -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c) -3 >Emitted(4, 15) Source(3, 8) + SourceIndex(0) name (c) +1 >^^^^ +2 > ^^-> +1 > + > +1 >Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class c { > 2 > } -1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) 2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) --- >>> return c; @@ -92,35 +79,24 @@ sourceFile:app2.ts ------------------------------------------------------------------- >>>var d = (function () { 1-> -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1-> -2 >class -3 > d 1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 5) Source(1, 7) + SourceIndex(1) -3 >Emitted(8, 6) Source(1, 8) + SourceIndex(1) --- >>> function d() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > d 1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) name (d) -2 >Emitted(9, 14) Source(1, 7) + SourceIndex(1) name (d) -3 >Emitted(9, 15) Source(1, 8) + SourceIndex(1) name (d) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class d { > 2 > } -1 >Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) +1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) 2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) name (d.constructor) --- >>> return d; diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map index 027c795967c..9fff2ee3f66 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map @@ -1,3 +1,3 @@ //// [app.js.map] -{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;IACpG,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] -{"version":3,"file":"app2.js","sourceRoot":"","sources":["app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;;IAC1GA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] +{"version":3,"file":"app2.js","sourceRoot":"","sources":["app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt index cfcd91a6552..f91aaea6ab9 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -32,34 +32,21 @@ sourceFile:app.ts 2 >Emitted(2, 107) Source(2, 107) + SourceIndex(0) --- >>>var c = (function () { -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^-> -1 > - >class -2 > c -1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0) -2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0) ---- >>> function c() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -1-> -2 > class -3 > c -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) -2 >Emitted(4, 14) Source(3, 7) + SourceIndex(0) name (c) -3 >Emitted(4, 15) Source(3, 8) + SourceIndex(0) name (c) +1 >^^^^ +2 > ^^-> +1 > + > +1 >Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class c { > 2 > } -1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) 2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) --- >>> return c; @@ -98,35 +85,24 @@ sourceFile:app2.ts ------------------------------------------------------------------- >>>var d = (function () { 1 > -2 >^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^^-> 1 > -2 >class -3 > d 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0) --- >>> function d() { 1->^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > class -3 > d 1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (d) -2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (d) -3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (d) --- >>> } -1 >^^^^ +1->^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->class d { > 2 > } -1 >Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) 2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (d.constructor) --- >>> return d; diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map index 69e580b7629..65bb725231c 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map @@ -1,2 +1,2 @@ //// [sourcemapValidationDuplicateNames.js.map] -{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":["m1","m1.c","m1.c.constructor"],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAaA,CAACA;QAAdC,SAAaA,CAACA;QACdC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,IAACA,GAADA,CACZA,CAAAA;AACLA,CAACA,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,IAAIA,EAAEA,CAACA,CAACA,EAAEA,CAACA;AACvBA,CAACA,EAFM,EAAE,KAAF,EAAE,QAER"} \ No newline at end of file +{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":["m1","m1.c","m1.c.constructor"],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,IAACA,IACbA,CAAAA;AACLA,CAACA,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,IAAIA,EAAEA,CAACA,CAACA,EAAEA,CAACA;AACvBA,CAACA,EAFM,EAAE,KAAF,EAAE,QAER"} \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt index 805658a0bd7..a5d1f637a15 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt @@ -68,36 +68,25 @@ sourceFile:sourcemapValidationDuplicateNames.ts --- >>> var c = (function () { 1->^^^^ -2 > ^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > c 1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) name (m1) -2 >Emitted(4, 9) Source(3, 18) + SourceIndex(0) name (m1) -3 >Emitted(4, 10) Source(3, 19) + SourceIndex(0) name (m1) --- >>> function c() { 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^ +2 > ^^-> 1-> -2 > export class -3 > c 1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m1.c) -2 >Emitted(5, 18) Source(3, 18) + SourceIndex(0) name (m1.c) -3 >Emitted(5, 19) Source(3, 19) + SourceIndex(0) name (m1.c) --- >>> } -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^-> -1 > { +1->export class c { > 2 > } -1 >Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (m1.c.constructor) +1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (m1.c.constructor) 2 >Emitted(6, 10) Source(4, 6) + SourceIndex(0) name (m1.c.constructor) --- >>> return c; @@ -127,21 +116,18 @@ sourceFile:sourcemapValidationDuplicateNames.ts >>> m1.c = c; 1->^^^^ 2 > ^^^^ -3 > ^^^ -4 > ^ -5 > ^ -6 > ^^^^^^^^-> +3 > ^^^^ +4 > ^ +5 > ^^^^^^^^-> 1-> 2 > c -3 > -4 > c { - > } -5 > +3 > { + > } +4 > 1->Emitted(9, 5) Source(3, 18) + SourceIndex(0) name (m1) 2 >Emitted(9, 9) Source(3, 19) + SourceIndex(0) name (m1) -3 >Emitted(9, 12) Source(3, 18) + SourceIndex(0) name (m1) -4 >Emitted(9, 13) Source(4, 6) + SourceIndex(0) name (m1) -5 >Emitted(9, 14) Source(4, 6) + SourceIndex(0) name (m1) +3 >Emitted(9, 13) Source(4, 6) + SourceIndex(0) name (m1) +4 >Emitted(9, 14) Source(4, 6) + SourceIndex(0) name (m1) --- >>>})(m1 || (m1 = {})); 1-> diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index a7bdf6606c9..476bc3ad652 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,2 +1,2 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,IAAaA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAmBnBC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBAEIE,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,GAANA,MAmBZA,CAAAA;gBACDA,IAAaA,MAAMA;oBAAnBI,SAAaA,MAAMA;oBAsBnBC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAG/CA,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAGzDA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,GAANA,MAsBZA,CAAAA;gBAEDA,IAAMA,iBAAiBA;oBACnBO,SADEA,iBAAiBA;wBAEfC,SAASA,EAAEA;4BAEPC,AADAA,uCAAuCA;gCACnCA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAGDA,AADAA,0EAA0EA;gBACpEA,MAAMA;gBACRW,SADEA,MAAMA;oBAEJC,SAASA,EAAEA;wBACPC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBAEzBC,AADAA,6DAA6DA;oBAChDA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBG,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CH,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBK,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CL,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA,IAAMA,MAAMA;YAAZuB,SAAMA,MAAMA;YAEZC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBA,CAACA;YACvBA,aAACA;QAADA,CAACA,AAFDvB,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtByB,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAAGC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,GAANA,MAAUA,CAAAA;QAC3BA,CAACA,EAFMzB,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB4B,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAEnBC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBA,CAACA;gBACzBA,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,GAANA,MAEZA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBAEIE,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAG/CA,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAGzDA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BAEIC,AADAA,uCAAuCA;gCACnCA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAGDA,AADAA,0EAA0EA;;gBAEtEW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBAEzBC,AADAA,6DAA6DA;;oBAC7DC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAG;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CH,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAK;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBA,CAACA;oBAACA,aAACA;gBAADA,CAACA,AAA/CL,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAAuB;YAEAC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBA,CAACA;YACvBA,aAACA;QAADA,CAACA,AAFDvB,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtByB;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFMzB,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB4B,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBA,CAACA;gBACzBA,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index d233e267f9f..e0d44b47750 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -337,33 +337,22 @@ sourceFile:typeResolution.ts --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > ClassA 1->Emitted(8, 17) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(8, 21) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(8, 27) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassA 1->Emitted(9, 21) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(9, 30) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -3 >Emitted(9, 36) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->export class ClassA { > public AisIn1_1_1() { > // Try all qualified names of this type > var a1: ClassA; a1.AisIn1_1_1(); @@ -384,7 +373,7 @@ sourceFile:typeResolution.ts > } > 2 > } -1 >Emitted(10, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) +1->Emitted(10, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) 2 >Emitted(10, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) --- >>> ClassA.prototype.AisIn1_1_1 = function () { @@ -825,68 +814,54 @@ sourceFile:typeResolution.ts >>> SubSubModule1.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ +3 > ^^^^^^^^^ +4 > ^ 1-> 2 > ClassA -3 > -4 > ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } -5 > +3 > { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } +4 > 1->Emitted(37, 17) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) 2 >Emitted(37, 37) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(37, 40) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(37, 46) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -5 >Emitted(37, 47) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +3 >Emitted(37, 46) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(37, 47) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export class -3 > ClassB 1 >Emitted(38, 17) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(38, 21) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(38, 27) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassB 1->Emitted(39, 21) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(39, 30) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -3 >Emitted(39, 36) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->export class ClassB { > public BisIn1_1_1() { > /** Exactly the same as above in AisIn1_1_1 **/ > @@ -910,7 +885,7 @@ sourceFile:typeResolution.ts > } > 2 > } -1 >Emitted(40, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) +1->Emitted(40, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) 2 >Emitted(40, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) --- >>> ClassB.prototype.BisIn1_1_1 = function () { @@ -1400,88 +1375,67 @@ sourceFile:typeResolution.ts >>> SubSubModule1.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ -6 > ^^^^^^^^^-> +3 > ^^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^-> 1-> 2 > ClassB -3 > -4 > ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } -5 > +3 > { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } +4 > 1->Emitted(70, 17) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) 2 >Emitted(70, 37) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(70, 40) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(70, 46) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -5 >Emitted(70, 47) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +3 >Emitted(70, 46) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(70, 47) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> var NonExportedClassQ = (function () { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > export interface InterfaceX { XisIn1_1_1(); } > -2 > class -3 > NonExportedClassQ 1->Emitted(71, 17) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(71, 21) Source(48, 19) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(71, 38) Source(48, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function NonExportedClassQ() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -1-> { +2 > ^^^^^^^^^^^^^^^^^^^^-> +1->class NonExportedClassQ { > -2 > -3 > NonExportedClassQ 1->Emitted(72, 21) Source(49, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -2 >Emitted(72, 30) Source(48, 19) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -3 >Emitted(72, 47) Source(48, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) --- >>> function QQ() { -1 >^^^^^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { - > constructor() { +1->^^^^^^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1->constructor() { > -2 > function -3 > QQ -1 >Emitted(73, 25) Source(50, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) -2 >Emitted(73, 34) Source(50, 30) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) -3 >Emitted(73, 36) Source(50, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +1->Emitted(73, 25) Source(50, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) --- >>> /* Sampling of stuff from AisIn1_1_1 */ 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 2 > 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -1->() { +1->function QQ() { > /* Sampling of stuff from AisIn1_1_1 */ > 2 > @@ -1785,41 +1739,20 @@ sourceFile:typeResolution.ts 3 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> var ClassA = (function () { -1 >^^^^^^^^^^^^^^^^ -2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^-> -1 > - > class -2 > ClassA -1 >Emitted(89, 17) Source(62, 15) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(89, 23) Source(62, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1) ---- >>> function ClassA() { -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^-> -1-> { +1 >^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^-> +1 > + > class ClassA { > -2 > -3 > ClassA -1->Emitted(90, 17) Source(63, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -2 >Emitted(90, 26) Source(62, 15) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -3 >Emitted(90, 32) Source(62, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +1 >Emitted(90, 17) Source(63, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) --- >>> function AA() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^ -4 > ^-> -1-> { - > constructor() { +2 > ^^^^^^^^^^^^-> +1->constructor() { > -2 > function -3 > AA 1->Emitted(91, 21) Source(64, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) -2 >Emitted(91, 30) Source(64, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) -3 >Emitted(91, 32) Source(64, 28) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) --- >>> var a2; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1827,7 +1760,7 @@ sourceFile:typeResolution.ts 3 > ^^ 4 > ^ 5 > ^^^^^^^^^^-> -1->() { +1->function AA() { > 2 > var 3 > a2: SubSubModule1.ClassA @@ -2233,33 +2166,20 @@ sourceFile:typeResolution.ts 3 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassA = (function () { -1 >^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^-> -1 > - > export class -2 > ClassA -1 >Emitted(111, 21) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(111, 27) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) ---- >>> function ClassA() { -1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ -1-> -2 > export class -3 > ClassA -1->Emitted(112, 21) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(112, 30) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(112, 36) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^^-> +1 > + > +1 >Emitted(112, 21) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { public AisIn1_2_2() { } +1->export class ClassA { public AisIn1_2_2() { } 2 > } -1 >Emitted(113, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) +1->Emitted(113, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) 2 >Emitted(113, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) --- >>> ClassA.prototype.AisIn1_2_2 = function () { }; @@ -2305,51 +2225,37 @@ sourceFile:typeResolution.ts >>> SubSubModule2.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ +3 > ^^^^^^^^^ +4 > ^ 1-> 2 > ClassA -3 > -4 > ClassA { public AisIn1_2_2() { } } -5 > +3 > { public AisIn1_2_2() { } } +4 > 1->Emitted(117, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) 2 >Emitted(117, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(117, 40) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -5 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export class -3 > ClassB 1 >Emitted(118, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(118, 21) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(118, 27) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassB 1->Emitted(119, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(119, 30) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(119, 36) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { public BisIn1_2_2() { } +1->export class ClassB { public BisIn1_2_2() { } 2 > } -1 >Emitted(120, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +1->Emitted(120, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) 2 >Emitted(120, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) --- >>> ClassB.prototype.BisIn1_2_2 = function () { }; @@ -2395,51 +2301,37 @@ sourceFile:typeResolution.ts >>> SubSubModule2.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ +3 > ^^^^^^^^^ +4 > ^ 1-> 2 > ClassB -3 > -4 > ClassB { public BisIn1_2_2() { } } -5 > +3 > { public BisIn1_2_2() { } } +4 > 1->Emitted(124, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) 2 >Emitted(124, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(124, 40) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -5 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassC = (function () { 1 >^^^^^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -2 > export class -3 > ClassC 1 >Emitted(125, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(125, 21) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(125, 27) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassC() { 1->^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassC 1->Emitted(126, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(126, 30) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(126, 36) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) --- >>> } -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { public CisIn1_2_2() { } +1->export class ClassC { public CisIn1_2_2() { } 2 > } -1 >Emitted(127, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +1->Emitted(127, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) 2 >Emitted(127, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) --- >>> ClassC.prototype.CisIn1_2_2 = function () { }; @@ -2485,20 +2377,17 @@ sourceFile:typeResolution.ts >>> SubSubModule2.ClassC = ClassC; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > ClassC -3 > -4 > ClassC { public CisIn1_2_2() { } } -5 > +3 > { public CisIn1_2_2() { } } +4 > 1->Emitted(131, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) 2 >Emitted(131, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(131, 40) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -5 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); 1->^^^^^^^^^^^^^^^^ @@ -2590,38 +2479,27 @@ sourceFile:typeResolution.ts --- >>> var ClassA = (function () { 1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > > -2 > class -3 > ClassA 1 >Emitted(134, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(134, 13) Source(89, 11) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(134, 19) Source(89, 17) + SourceIndex(0) name (TopLevelModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > class -3 > ClassA 1->Emitted(135, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(135, 22) Source(89, 11) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(135, 28) Source(89, 17) + SourceIndex(0) name (TopLevelModule1.ClassA) --- >>> } -1 >^^^^^^^^^^^^ +1->^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->class ClassA { > public AisIn1() { } > 2 > } -1 >Emitted(136, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +1->Emitted(136, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) 2 >Emitted(136, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) --- >>> ClassA.prototype.AisIn1 = function () { }; @@ -2710,35 +2588,24 @@ sourceFile:typeResolution.ts --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > ClassA 1->Emitted(142, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(142, 17) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(142, 23) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassA 1->Emitted(143, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(143, 26) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -3 >Emitted(143, 32) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) --- >>> } -1 >^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^-> -1 > { +1->export class ClassA { 2 > } -1 >Emitted(144, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +1->Emitted(144, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) 2 >Emitted(144, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) --- >>> return ClassA; @@ -2767,20 +2634,17 @@ sourceFile:typeResolution.ts >>> NotExportedModule.ClassA = ClassA; 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^-> +3 > ^^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^-> 1-> 2 > ClassA -3 > -4 > ClassA { } -5 > +3 > { } +4 > 1->Emitted(147, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) 2 >Emitted(147, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(147, 40) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -5 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +3 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +4 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> })(NotExportedModule || (NotExportedModule = {})); 1->^^^^^^^^ @@ -3018,37 +2882,26 @@ sourceFile:typeResolution.ts --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -2 > export class -3 > ClassA 1->Emitted(154, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(154, 17) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(154, 23) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^^^^^^ +2 > ^^-> 1-> -2 > export class -3 > ClassA 1->Emitted(155, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(155, 26) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(155, 32) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) --- >>> } -1 >^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^ 2 > ^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > { +1->export class ClassA { > public AisIn2_3() { } > 2 > } -1 >Emitted(156, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +1->Emitted(156, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) 2 >Emitted(156, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) --- >>> ClassA.prototype.AisIn2_3 = function () { }; @@ -3097,22 +2950,19 @@ sourceFile:typeResolution.ts >>> SubModule3.ClassA = ClassA; 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > ClassA -3 > -4 > ClassA { - > public AisIn2_3() { } - > } -5 > +3 > { + > public AisIn2_3() { } + > } +4 > 1->Emitted(160, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) 2 >Emitted(160, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(160, 33) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) -5 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +3 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +4 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); 1->^^^^^^^^ From f2be34a302ec2e1ee76e1ac2b37bb3d0917c089f Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 15:56:40 -0800 Subject: [PATCH 011/251] Support emit of unnamed export default function/class --- src/compiler/emitter.ts | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d97838ef9b7..90e952cd1f1 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3825,6 +3825,15 @@ module ts { return node.kind === SyntaxKind.ArrowFunction && languageVersion >= ScriptTarget.ES6; } + function emitDeclarationName(node: Declaration) { + if (node.name) { + emitNode(node.name); + } + else { + write(resolver.getGeneratedNameForNode(node)); + } + } + function emitFunctionDeclaration(node: FunctionLikeDeclaration) { if (nodeIsMissing(node.body)) { return emitPinnedOrTripleSlashComments(node); @@ -3842,10 +3851,10 @@ module ts { } if (node.kind === SyntaxKind.FunctionDeclaration || (node.kind === SyntaxKind.FunctionExpression && node.name)) { - emitNode(node.name); + emitDeclarationName(node); } emitSignatureAndBody(node); - if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.FunctionDeclaration && node.parent === currentSourceFile) { + if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.FunctionDeclaration && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments((node).name); } if (node.kind !== SyntaxKind.MethodDeclaration && node.kind !== SyntaxKind.MethodSignature) { @@ -3917,7 +3926,7 @@ module ts { emitStart(node); emitModuleMemberName(node); write(" = "); - emitNode(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } @@ -4125,7 +4134,7 @@ module ts { emitStart(member); emitStart((member).name); if (staticFlag) { - emitNode(node.name); + emitDeclarationName(node); } else { write("this"); @@ -4152,7 +4161,7 @@ module ts { emitLeadingComments(member); emitStart(member); emitStart((member).name); - emitNode(node.name); // TODO (shkamat,drosen): comment for why emitNode instead of emit. + emitDeclarationName(node); if (!(member.flags & NodeFlags.Static)) { write(".prototype"); } @@ -4174,7 +4183,7 @@ module ts { emitStart(member); write("Object.defineProperty("); emitStart((member).name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & NodeFlags.Static)) { write(".prototype"); } @@ -4221,7 +4230,7 @@ module ts { function emitClassDeclaration(node: ClassDeclaration) { write("var "); - emitNode(node.name); + emitDeclarationName(node); write(" = (function ("); var baseTypeNode = getClassBaseTypeNode(node); if (baseTypeNode) { @@ -4234,7 +4243,7 @@ module ts { writeLine(); emitStart(baseTypeNode); write("__extends("); - emitNode(node.name); + emitDeclarationName(node); write(", _super);"); emitEnd(baseTypeNode); } @@ -4245,7 +4254,7 @@ module ts { writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end, () => { write("return "); - emitNode(node.name); + emitDeclarationName(node); }); write(";"); decreaseIndent(); @@ -4264,7 +4273,7 @@ module ts { emitStart(node); emitModuleMemberName(node); write(" = "); - emitNode(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } @@ -4292,7 +4301,7 @@ module ts { } emitStart(ctor || node); write("function "); - emitNode(node.name); + emitDeclarationName(node); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); @@ -4796,7 +4805,7 @@ module ts { emit((exportDefault).propertyName); } else { - emit((exportDefault).name); + emitDeclarationName(exportDefault); } write(";"); emitEnd(exportDefault); From 61167b68ba438db4decf9802c7c31590a01ce380 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 17:06:44 -0800 Subject: [PATCH 012/251] Fixing a few issues --- src/compiler/checker.ts | 2 +- src/compiler/types.ts | 4 ++-- src/services/navigationBar.ts | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d3a10ca0d1c..dfe7add357b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9684,7 +9684,7 @@ module ts { } } } - else if (node.kind !== SyntaxKind.ExportAssignment && node.flags & NodeFlags.Export) { + else if (node.kind !== SyntaxKind.ExportAssignment && node.flags & NodeFlags.Export && !(node.flags & NodeFlags.Default)) { return true; } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 24f2b23db60..03dc3912aea 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -501,7 +501,7 @@ module ts { } export interface FunctionDeclaration extends FunctionLikeDeclaration, Statement { - name: Identifier; + name?: Identifier; body?: Block; } @@ -825,7 +825,7 @@ module ts { } export interface ClassDeclaration extends Declaration, ModuleElement { - name: Identifier; + name?: Identifier; typeParameters?: NodeArray; heritageClauses?: NodeArray; members: NodeArray; diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index e32ac03caef..cb9c649c525 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -415,6 +415,11 @@ module ts.NavigationBar { } function createClassItem(node: ClassDeclaration): ts.NavigationBarItem { + if (!node.name) { + // An export default class may be nameless + return undefined; + } + var childItems: NavigationBarItem[]; if (node.members) { From 27179b427cf33ecff65c1ee8a3431c014d929a77 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 17:46:17 -0800 Subject: [PATCH 013/251] Adding some comments --- src/compiler/binder.ts | 4 ++++ src/compiler/checker.ts | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 65b5c9035a2..481596b9aaf 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -129,7 +129,9 @@ module ts { function declareSymbol(symbols: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol { Debug.assert(!hasDynamicName(node)); + // The exported symbol for an export default function/class node is always named "default" var name = node.flags & NodeFlags.Default && parent ? "default" : getDeclarationName(node); + if (name !== undefined) { var symbol = hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { @@ -495,9 +497,11 @@ module ts { break; case SyntaxKind.ExportAssignment: if ((node).expression.kind === SyntaxKind.Identifier) { + // An export default clause with an identifier exports all meanings of that identifier declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Import, SymbolFlags.ImportExcludes); } else { + // An export default clause with an expression exports a value declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } bindChildren(node, 0, /*isBlockScopeContainer*/ false); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dfe7add357b..12f2f7a8528 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -571,18 +571,24 @@ module ts { } } + // When an import symbol (i.e. an alias) is referenced, we need to mark the entity it references as referenced and in turn + // repeat that until we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking + // the target of the alias as an expression (which recursively takes us back here if the target references another alias). function markImportSymbolAsReferenced(symbol: Symbol) { var links = getSymbolLinks(symbol); if (!links.referenced) { links.referenced = true; var node = getDeclarationOfImportSymbol(symbol); if (node.kind === SyntaxKind.ExportAssignment) { + // export default checkExpressionCached((node).expression); } else if (node.kind === SyntaxKind.ExportSpecifier) { + // export { } or export { as foo } checkExpressionCached((node).propertyName || (node).name); } else if (isInternalModuleImportEqualsDeclaration(node)) { + // import foo = checkExpressionCached((node).moduleReference); } } @@ -717,6 +723,7 @@ module ts { function getExportsForModule(moduleSymbol: Symbol): SymbolTable { if (compilerOptions.target < ScriptTarget.ES6) { + // A default export hides all other exports in CommonJS and AMD modules var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); if (defaultSymbol) { return { @@ -729,6 +736,8 @@ module ts { visit(moduleSymbol); return result || moduleSymbol.exports; + // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example, + // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error. function visit(symbol: Symbol) { if (!contains(visitedSymbols, symbol)) { visitedSymbols.push(symbol); @@ -738,6 +747,7 @@ module ts { } extendSymbolTable(result, symbol.exports); } + // All export * declarations are collected in an __export symbol by the binder var exportStars = symbol.exports["__export"]; if (exportStars) { forEach(exportStars.declarations, node => { From b2a0e1beaa9870989855e2f6630636f7e427f27e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 3 Mar 2015 17:47:17 -0800 Subject: [PATCH 014/251] Another comment --- 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 03dc3912aea..4415b7326d1 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1227,7 +1227,7 @@ module ts { ExportValue = 0x00100000, // Exported value marker (see comment in declareModuleMember in binder) ExportType = 0x00200000, // Exported type marker (see comment in declareModuleMember in binder) ExportNamespace = 0x00400000, // Exported namespace marker (see comment in declareModuleMember in binder) - Import = 0x00800000, // Import + Import = 0x00800000, // An alias for another symbol Instantiated = 0x01000000, // Instantiated symbol Merged = 0x02000000, // Merged symbol (created during program binding) Transient = 0x04000000, // Transient symbol (created during type check) From e49d51a088ad957501ff9a1abb64d13d88648b75 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 3 Mar 2015 21:34:20 -0800 Subject: [PATCH 015/251] look through the entire chain of name scopes to ensure that name is unique --- src/compiler/emitter.ts | 16 ++++++- .../reference/downlevelLetConst19.js | 39 +++++++++++++++ .../reference/downlevelLetConst19.types | 47 +++++++++++++++++++ tests/cases/compiler/downlevelLetConst19.ts | 19 ++++++++ 4 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/downlevelLetConst19.js create mode 100644 tests/baselines/reference/downlevelLetConst19.types create mode 100644 tests/cases/compiler/downlevelLetConst19.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a24e69e3005..054ecb1fc77 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1693,8 +1693,20 @@ module ts { } function isExistingName(location: Node, name: string) { - return !resolver.isUnknownIdentifier(location, name) || - (currentScopeNames && hasProperty(currentScopeNames, name)); + if (!resolver.isUnknownIdentifier(location, name)) { + return true; + } + if (currentScopeNames && hasProperty(currentScopeNames, name)) { + return true; + } + var frame = lastFrame; + while (frame) { + if (hasProperty(frame.names, name)) { + return true; + } + frame = frame.previous; + } + return false; } function initializeEmitterWithSourceMaps() { diff --git a/tests/baselines/reference/downlevelLetConst19.js b/tests/baselines/reference/downlevelLetConst19.js new file mode 100644 index 00000000000..adcc2e256a8 --- /dev/null +++ b/tests/baselines/reference/downlevelLetConst19.js @@ -0,0 +1,39 @@ +//// [downlevelLetConst19.ts] +'use strict' +declare function use(a: any); +var x; +function a() { + { + let x; + use(x); + + function b() { + { + let x; + use(x); + } + use(x); + } + } + use(x) +} +use(x) + +//// [downlevelLetConst19.js] +'use strict'; +var x; +function a() { + { + var _x; + use(_x); + function b() { + { + var _x_1; + use(_x_1); + } + use(_x); + } + } + use(x); +} +use(x); diff --git a/tests/baselines/reference/downlevelLetConst19.types b/tests/baselines/reference/downlevelLetConst19.types new file mode 100644 index 00000000000..492d10b59c9 --- /dev/null +++ b/tests/baselines/reference/downlevelLetConst19.types @@ -0,0 +1,47 @@ +=== tests/cases/compiler/downlevelLetConst19.ts === +'use strict' +declare function use(a: any); +>use : (a: any) => any +>a : any + +var x; +>x : any + +function a() { +>a : () => void + { + let x; +>x : any + + use(x); +>use(x) : any +>use : (a: any) => any +>x : any + + function b() { +>b : () => void + { + let x; +>x : any + + use(x); +>use(x) : any +>use : (a: any) => any +>x : any + } + use(x); +>use(x) : any +>use : (a: any) => any +>x : any + } + } + use(x) +>use(x) : any +>use : (a: any) => any +>x : any +} +use(x) +>use(x) : any +>use : (a: any) => any +>x : any + diff --git a/tests/cases/compiler/downlevelLetConst19.ts b/tests/cases/compiler/downlevelLetConst19.ts new file mode 100644 index 00000000000..e7aa48421f7 --- /dev/null +++ b/tests/cases/compiler/downlevelLetConst19.ts @@ -0,0 +1,19 @@ +'use strict' +declare function use(a: any); +var x; +function a() { + { + let x; + use(x); + + function b() { + { + let x; + use(x); + } + use(x); + } + } + use(x) +} +use(x) \ No newline at end of file From 212aeb5e534e0a8109ff70913fca88408b38e5ef Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Mar 2015 22:12:06 -0800 Subject: [PATCH 016/251] Revert "Run jake in interactive mode so output isn't lost." --- .travis.yml | 3 +- Jakefile | 112 +++++++++++++++++++++++++++----------------- package.json | 2 +- src/compiler/tsc.ts | 2 +- tests/perfsys.ts | 105 +++++++++++++++++++++++++++++++++++++++++ tests/perftsc.ts | 30 ++++++++++++ 6 files changed, 208 insertions(+), 46 deletions(-) create mode 100644 tests/perfsys.ts create mode 100644 tests/perftsc.ts diff --git a/.travis.yml b/.travis.yml index 50ff61e20f4..305fad1e4a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ node_js: sudo: false -before_script: - - npm install -g codeclimate-test-reporter +before_script: npm install -g codeclimate-test-reporter after_script: - cat coverage/lcov.info | codeclimate diff --git a/Jakefile b/Jakefile index 4c971efe0c9..324356a4af5 100644 --- a/Jakefile +++ b/Jakefile @@ -3,6 +3,7 @@ var fs = require("fs"); var os = require("os"); var path = require("path"); +var child_process = require("child_process"); // Variables var compilerDirectory = "src/compiler/"; @@ -25,8 +26,7 @@ var thirdParty = "ThirdPartyNoticeText.txt"; var nodeModulesPathPrefix = path.resolve("./node_modules/.bin/") + path.delimiter; if (process.env.path !== undefined) { process.env.path = nodeModulesPathPrefix + process.env.path; -} -else if (process.env.PATH !== undefined) { +} else if (process.env.PATH !== undefined) { process.env.PATH = nodeModulesPathPrefix + process.env.PATH; } @@ -203,8 +203,7 @@ function concatenateFiles(destinationFile, sourceFiles) { var useDebugMode = true; var host = (process.env.host || process.env.TYPESCRIPT_HOST || "node"); var compilerFilename = "tsc.js"; - - /* Compiles a file from a list of sources +/* Compiles a file from a list of sources * @param outFile: the target file name * @param sources: an array of the names of the source files * @param prereqs: prerequisite tasks to compiling the file @@ -215,9 +214,8 @@ var compilerFilename = "tsc.js"; * @param outDir: true to compile using --outDir * @param keepComments: false to compile using --removeComments * @param callback: a function to execute after the compilation process ends - * @async */ - function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) { +function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) { file(outFile, prereqs, function() { var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory; var options = "--module commonjs -noImplicitAny"; @@ -256,9 +254,17 @@ var compilerFilename = "tsc.js"; var cmd = host + " " + dir + compilerFilename + " " + options + " "; cmd = cmd + sources.join(" "); + console.log(cmd + "\n"); - exec(cmd, function() { - console.log("") + var ex = jake.createExec([cmd]); + // Add listeners for output and error + ex.addListener("stdout", function(output) { + process.stdout.write(output); + }); + ex.addListener("stderr", function(error) { + process.stderr.write(error); + }); + ex.addListener("cmdEnd", function() { if (!useDebugMode && prefixes && fs.existsSync(outFile)) { for (var i in prefixes) { prependFile(prefixes[i], outFile); @@ -268,14 +274,14 @@ var compilerFilename = "tsc.js"; if (callback) { callback(); } - else { - complete(); - } - }, /* errorHandler */ function() { + + complete(); + }); + ex.addListener("error", function() { fs.unlinkSync(outFile); fail("Compilation of " + outFile + " unsuccessful"); }); - + ex.run(); }, {async: true}); } @@ -318,8 +324,19 @@ compileFile(processDiagnosticMessagesJs, // The generated diagnostics map; built for the compiler and for the 'generate-diagnostics' task file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () { var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson; - - exec(cmd); + console.log(cmd); + var ex = jake.createExec([cmd]); + // Add listeners for output and error + ex.addListener("stdout", function(output) { + process.stdout.write(output); + }); + ex.addListener("stderr", function(error) { + process.stderr.write(error); + }); + ex.addListener("cmdEnd", function() { + complete(); + }); + ex.run(); }, {async: true}) desc("Generates a diagnostic file in TypeScript based on an input JSON file"); @@ -384,7 +401,6 @@ compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright // Delete the temp dir jake.rmRf(tempDirPath, {silent: true}); - complete(); }); var serverFile = path.join(builtLocalDirectory, "tsserver.js"); @@ -433,8 +449,10 @@ compileFile(word2mdJs, file(specMd, [word2mdJs, specWord], function () { var specWordFullPath = path.resolve(specWord); var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + specMd; - - exec(cmd); + console.log(cmd); + child_process.exec(cmd, function () { + complete(); + }); }, {async: true}) @@ -485,24 +503,22 @@ var refTest262Baseline = path.join(internalTests, "baselines/test262/reference") desc("Builds the test infrastructure using the built compiler"); task("tests", ["local", run].concat(libraryTargets)); -/* Executes a command - * @param cmd: command to execute - * @param completeHandler?: a function to execute after the command ends - * @param errorHandler?: a function to execute if an error occurs - * @async - */ -function exec(cmd, completeHandler, errorHandler) { - console.log(cmd); - var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true}); +function exec(cmd, completeHandler) { + var ex = jake.createExec([cmd], {windowsVerbatimArguments: true}); + // Add listeners for output and error + ex.addListener("stdout", function(output) { + process.stdout.write(output); + }); + ex.addListener("stderr", function(error) { + process.stderr.write(error); + }); ex.addListener("cmdEnd", function() { if (completeHandler) { completeHandler(); } - else { - complete(); - } + complete(); }); - ex.addListener("error", errorHandler || function(e, status) { + ex.addListener("error", function(e, status) { fail("Process exited with code " + status); }) @@ -521,7 +537,7 @@ function cleanTestDirs() { } jake.mkdirP(localRwcBaseline); - jake.mkdirP(localTest262Baseline); + jake.mkdirP(localTest262Baseline); jake.mkdirP(localBaseline); } @@ -532,14 +548,10 @@ function writeTestConfigFile(tests, testConfigFile) { fs.writeFileSync('test.config', testConfigContents); } -/* Removes project output - * @async - */ function deleteTemporaryProjectOutput() { if (fs.existsSync(path.join(localBaseline, "projectOutput/"))) { jake.rmRf(path.join(localBaseline, "projectOutput/")); } - complete(); } var testTimeout = 20000; @@ -568,14 +580,14 @@ task("runtests", ["tests", builtLocalDirectory], function() { // timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer var cmd = host + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run; - + console.log(cmd); exec(cmd, deleteTemporaryProjectOutput); }, {async: true}); desc("Generates code coverage data via instanbul") task("generate-code-coverage", ["tests", builtLocalDirectory], function () { var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run; - + console.log(cmd); exec(cmd); }, { async: true }); @@ -607,6 +619,7 @@ task("runtests-browser", ["tests", "browserify", builtLocalDirectory], function( tests = tests ? tests : ''; var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests + console.log(cmd); exec(cmd); }, {async: true}); @@ -622,12 +635,14 @@ function getDiffTool() { desc("Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable"); task('diff', function () { var cmd = '"' + getDiffTool() + '" ' + refBaseline + ' ' + localBaseline; + console.log(cmd) exec(cmd); }, {async: true}); desc("Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable"); task('diff-rwc', function () { var cmd = '"' + getDiffTool() + '" ' + refRwcBaseline + ' ' + localRwcBaseline; + console.log(cmd) exec(cmd); }, {async: true}); @@ -674,6 +689,13 @@ task("webhost", [webhostJsPath], function() { jake.cpR(path.join(builtLocalDirectory, "lib.d.ts"), "tests/webhost/", {silent: true}); }); +// Perf compiler +var perftscPath = "tests/perftsc.ts"; +var perftscJsPath = "built/local/perftsc.js"; +compileFile(perftscJsPath, [perftscPath], [tscFile, perftscPath, "tests/perfsys.ts"].concat(libraryTargets), [], /*useBuiltCompiler*/ true); +desc("Builds augmented version of the compiler for perf tests"); +task("perftsc", [perftscJsPath]); + // Instrumented compiler var loggedIOpath = harnessDirectory + 'loggedIO.ts'; var loggedIOJsPath = builtLocalDirectory + 'loggedIO.js'; @@ -682,12 +704,14 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() { jake.mkdirP(temp); var options = "--outdir " + temp + ' ' + loggedIOpath; var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " "; - - exec(cmd, function() { + console.log(cmd + "\n"); + var ex = jake.createExec([cmd]); + ex.addListener("cmdEnd", function() { fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath); jake.rmRf(temp); complete(); }); + ex.run(); }, {async: true}); var instrumenterPath = harnessDirectory + 'instrumenter.ts'; @@ -697,6 +721,10 @@ compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath], desc("Builds an instrumented tsc.js"); task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() { var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename; - - exec(cmd); + console.log(cmd); + var ex = jake.createExec([cmd]); + ex.addListener("cmdEnd", function() { + complete(); + }); + ex.run(); }, { async: true }); diff --git a/package.json b/package.json index b53916b37b3..9261174b68f 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,6 @@ "codeclimate-test-reporter": "latest" }, "scripts": { - "test": "jake --trace generate-code-coverage" + "test": "jake generate-code-coverage" } } diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 68507b34574..57c2298d3d3 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -258,7 +258,7 @@ module ts { reportDiagnostic(createCompilerDiagnostic(Diagnostics.Compilation_complete_Watching_for_file_changes)); } - function getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void) { + function getSourceFile(fileName: string, languageVersion: ScriptTarget, onError ?: (message: string) => void) { // Return existing SourceFile object if one is available if (cachedProgram) { var sourceFile = cachedProgram.getSourceFile(fileName); diff --git a/tests/perfsys.ts b/tests/perfsys.ts new file mode 100644 index 00000000000..143d0d637d4 --- /dev/null +++ b/tests/perfsys.ts @@ -0,0 +1,105 @@ +/// +/// + +module perftest { + + interface IOLog { + resolvePath: ts.Map; + fileNames: string[]; + } + + export interface IO { + getOut(): string; + } + + export var readFile = ts.sys.readFile; + var writeFile = ts.sys.writeFile; + export var write = ts.sys.write; + var resolvePath = ts.sys.resolvePath; + export var getExecutingFilePath = ts.sys.getExecutingFilePath; + export var getCurrentDirectory = ts.sys.getCurrentDirectory; + var exit = ts.sys.exit; + + var args = ts.sys.args; + + // augment sys so first ts.executeCommandLine call will be finish silently + ts.sys.write = (s: string) => { }; + ts.sys.exit = (code: number) => { }; + ts.sys.args = [] + + export function restoreSys() { + ts.sys.args = args; + ts.sys.write = write; + } + + export function hasLogIOFlag() { + return args.length > 2 && args[0] === "--logio"; + } + + export function getArgsWithoutLogIOFlag() { + return args.slice(2); + } + + export function getArgsWithoutIOLogFile() { + return args.slice(1); + } + + var resolvePathLog: ts.Map = {}; + + export function interceptIO() { + ts.sys.resolvePath = (s) => { + var result = resolvePath(s); + resolvePathLog[s] = result; + return result; + }; + } + + export function writeIOLog(fileNames: string[]) { + var path = args[1]; + var log: IOLog = { + fileNames: fileNames, + resolvePath: resolvePathLog + }; + + writeFile(path, JSON.stringify(log)); + } + + export function prepare(): IO { + var log = JSON.parse(readFile(args[0])); + + var files: ts.Map = {}; + log.fileNames.forEach(f => { files[f] = readFile(f); }) + + ts.sys.createDirectory = (s: string) => { }; + ts.sys.directoryExists = (s: string) => true; + ts.sys.fileExists = (s: string) => true; + + var currentDirectory = ts.sys.getCurrentDirectory(); + ts.sys.getCurrentDirectory = () => currentDirectory; + + var executingFilePath = ts.sys.getExecutingFilePath(); + ts.sys.getExecutingFilePath = () => executingFilePath; + + ts.sys.readFile = (s: string) => { + return files[s]; + } + + ts.sys.resolvePath = (s: string) => { + var path = log.resolvePath[s]; + if (!path) { + throw new Error("Unexpected path '" + s + "'"); + } + return path + } + + ts.sys.writeFile = (path: string, data: string) => { }; + + var out: string = ""; + + ts.sys.write = (s: string) => { out += s; }; + + return { + getOut: () => out, + }; + } +} diff --git a/tests/perftsc.ts b/tests/perftsc.ts new file mode 100644 index 00000000000..e0189896a15 --- /dev/null +++ b/tests/perftsc.ts @@ -0,0 +1,30 @@ +/// +/// + +// resolve all files used in this compilation +if (perftest.hasLogIOFlag()) { + perftest.interceptIO(); + + var compilerHost: ts.CompilerHost = { + getSourceFile: (s, v) => { + var content = perftest.readFile(s); + return content !== undefined ? ts.createSourceFile(s, content, v) : undefined; + }, + getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"), + writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); }, + getCurrentDirectory: () => perftest.getCurrentDirectory(), + getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(), + useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames, + getNewLine: () => ts.sys.newLine + }; + + var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag()); + var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost); + var fileNames = program.getSourceFiles().map(f => f.filename); + perftest.writeIOLog(fileNames); +} +else { + var io = perftest.prepare(); + ts.executeCommandLine(perftest.getArgsWithoutIOLogFile()); + perftest.write(io.getOut()); +} From 2a6b59a3ba448d8da0086eb7a16c9b471349f630 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 3 Mar 2015 23:46:51 -0800 Subject: [PATCH 017/251] addressed PR feedback --- src/compiler/emitter.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 054ecb1fc77..b1dcbfbcd95 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1693,12 +1693,29 @@ module ts { } function isExistingName(location: Node, name: string) { + // check if resolver is aware of this name (if name was seen during the typecheck) if (!resolver.isUnknownIdentifier(location, name)) { return true; } + + // check if name is present in generated names that were introduced by the emitter if (currentScopeNames && hasProperty(currentScopeNames, name)) { return true; } + + // check generated names in outer scopes + // var x; + // function foo() { + // let x; // 1 + // function bar() { + // { + // let x; // 2 + // } + // console.log(x); // 3 + // } + //} + // here both x(1) and x(2) should be renamed and their names should be different + // so x in (3) will refer to x(1) var frame = lastFrame; while (frame) { if (hasProperty(frame.names, name)) { From e4a11cb0c70cd08f4f48159a5809680dd402bcbe Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 4 Mar 2015 06:25:45 -0800 Subject: [PATCH 018/251] More comments --- src/compiler/checker.ts | 7 +++++++ src/compiler/types.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 12f2f7a8528..a859d37f64f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -460,6 +460,13 @@ module ts { return result; } + // An import symbol is created by one of the following declarations: + // import = ... + // import from ... + // import * as from ... + // import { x as } from ... + // export { x as } from ... + // export default ... function isImportSymbolDeclaration(node: Node): boolean { return node.kind === SyntaxKind.ImportEqualsDeclaration || node.kind === SyntaxKind.ImportClause && !!(node).name || diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4415b7326d1..97d8c122bfb 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1227,7 +1227,7 @@ module ts { ExportValue = 0x00100000, // Exported value marker (see comment in declareModuleMember in binder) ExportType = 0x00200000, // Exported type marker (see comment in declareModuleMember in binder) ExportNamespace = 0x00400000, // Exported namespace marker (see comment in declareModuleMember in binder) - Import = 0x00800000, // An alias for another symbol + Import = 0x00800000, // An alias for another symbol (see comment in isImportSymbolDeclaration in checker) Instantiated = 0x01000000, // Instantiated symbol Merged = 0x02000000, // Merged symbol (created during program binding) Transient = 0x04000000, // Transient symbol (created during type check) From bb33c150dc4d7c818d9fe02802c33af064dfbf7f Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 4 Mar 2015 06:52:18 -0800 Subject: [PATCH 019/251] Fixing error reporting issue in checkExternalModuleExports --- 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 7fadfd3dc5b..b004be4e61f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9953,7 +9953,7 @@ module ts { var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); if (defaultSymbol) { if (hasExportedMembers(moduleSymbol)) { - var declaration = getDeclarationOfImportSymbol(defaultSymbol); + var declaration = getDeclarationOfImportSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); } } From a87c45711fba499ab0da4aeef62ebfca67b18021 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 4 Mar 2015 10:26:38 -0800 Subject: [PATCH 020/251] Renaming SymbolFlags.Import to SymbolFlags.Alias --- src/compiler/binder.ts | 8 +- src/compiler/checker.ts | 149 +++++++++++++++++++------------------- src/compiler/emitter.ts | 4 +- src/compiler/types.ts | 8 +- src/services/services.ts | 18 ++--- src/services/utilities.ts | 2 +- 6 files changed, 94 insertions(+), 95 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index c4fcee1792b..5731d636103 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -197,7 +197,7 @@ module ts { function declareModuleMember(node: Declaration, symbolKind: SymbolFlags, symbolExcludes: SymbolFlags) { var hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export; - if (symbolKind & SymbolFlags.Import) { + if (symbolKind & SymbolFlags.Alias) { if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) { declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes); } @@ -486,11 +486,11 @@ module ts { case SyntaxKind.NamespaceImport: case SyntaxKind.ImportSpecifier: case SyntaxKind.ExportSpecifier: - bindDeclaration(node, SymbolFlags.Import, SymbolFlags.ImportExcludes, /*isBlockScopeContainer*/ false); + bindDeclaration(node, SymbolFlags.Alias, SymbolFlags.AliasExcludes, /*isBlockScopeContainer*/ false); break; case SyntaxKind.ImportClause: if ((node).name) { - bindDeclaration(node, SymbolFlags.Import, SymbolFlags.ImportExcludes, /*isBlockScopeContainer*/ false); + bindDeclaration(node, SymbolFlags.Alias, SymbolFlags.AliasExcludes, /*isBlockScopeContainer*/ false); } else { bindChildren(node, 0, /*isBlockScopeContainer*/ false); @@ -506,7 +506,7 @@ module ts { case SyntaxKind.ExportAssignment: if ((node).expression.kind === SyntaxKind.Identifier) { // An export default clause with an identifier exports all meanings of that identifier - declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Import, SymbolFlags.ImportExcludes); + declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes); } else { // An export default clause with an expression exports a value diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b004be4e61f..8e2b3b465e4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -54,7 +54,7 @@ module ts { isValidPropertyAccess, getSignatureFromDeclaration, isImplementationOfOverload, - getAliasedSymbol: resolveImport, + getAliasedSymbol: resolveAlias, getEmitResolver, getExportsOfExternalModule, }; @@ -167,7 +167,7 @@ module ts { if (flags & SymbolFlags.SetAccessor) result |= SymbolFlags.SetAccessorExcludes; if (flags & SymbolFlags.TypeParameter) result |= SymbolFlags.TypeParameterExcludes; if (flags & SymbolFlags.TypeAlias) result |= SymbolFlags.TypeAliasExcludes; - if (flags & SymbolFlags.Import) result |= SymbolFlags.ImportExcludes; + if (flags & SymbolFlags.Alias) result |= SymbolFlags.AliasExcludes; return result; } @@ -283,10 +283,9 @@ module ts { return symbol; } - if (symbol.flags & SymbolFlags.Import) { - var target = resolveImport(symbol); - // unknown symbol will mean that there were reported error during import resolution - // treat it as positive answer to avoid cascading errors + if (symbol.flags & SymbolFlags.Alias) { + var target = resolveAlias(symbol); + // Unknown symbol means an error occurred in alias resolution, treat it as positive answer to avoid cascading errors if (target === unknownSymbol || target.flags & meaning) { return symbol; } @@ -333,7 +332,7 @@ module ts { if (!isExternalModule(location)) break; case SyntaxKind.ModuleDeclaration: if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & SymbolFlags.ModuleMember)) { - if (!(result.flags & SymbolFlags.Import && getDeclarationOfImportSymbol(result).kind === SyntaxKind.ExportSpecifier)) { + if (!(result.flags & SymbolFlags.Alias && getDeclarationOfAliasSymbol(result).kind === SyntaxKind.ExportSpecifier)) { break loop; } result = undefined; @@ -456,14 +455,14 @@ module ts { return result; } - // An import symbol is created by one of the following declarations: + // An alias symbol is created by one of the following declarations: // import = ... // import from ... // import * as from ... // import { x as } from ... // export { x as } from ... // export default ... - function isImportSymbolDeclaration(node: Node): boolean { + function isAliasSymbolDeclaration(node: Node): boolean { return node.kind === SyntaxKind.ImportEqualsDeclaration || node.kind === SyntaxKind.ImportClause && !!(node).name || node.kind === SyntaxKind.NamespaceImport || @@ -472,8 +471,8 @@ module ts { node.kind === SyntaxKind.ExportAssignment; } - function getDeclarationOfImportSymbol(symbol: Symbol): Declaration { - return forEach(symbol.declarations, d => isImportSymbolDeclaration(d) ? d : undefined); + function getDeclarationOfAliasSymbol(symbol: Symbol): Declaration { + return forEach(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined); } function getTargetOfImportEqualsDeclaration(node: ImportEqualsDeclaration): Symbol { @@ -510,7 +509,7 @@ module ts { error(name, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), declarationNameToString(name)); return; } - return symbol.flags & (SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace) ? symbol : resolveImport(symbol); + return symbol.flags & (SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace) ? symbol : resolveAlias(symbol); } } } @@ -546,12 +545,12 @@ module ts { } } - function resolveImport(symbol: Symbol): Symbol { - Debug.assert((symbol.flags & SymbolFlags.Import) !== 0, "Should only get Imports here."); + function resolveAlias(symbol: Symbol): Symbol { + Debug.assert((symbol.flags & SymbolFlags.Alias) !== 0, "Should only get Alias here."); var links = getSymbolLinks(symbol); if (!links.target) { links.target = resolvingSymbol; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); var target = getTargetOfImportDeclaration(node); if (links.target === resolvingSymbol) { links.target = target || unknownSymbol; @@ -568,20 +567,20 @@ module ts { function markExportAsReferenced(node: ImportEqualsDeclaration | ExportAssignment | ExportSpecifier) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target && target !== unknownSymbol && target.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(target)) { - markImportSymbolAsReferenced(symbol); + markAliasSymbolAsReferenced(symbol); } } - // When an import symbol (i.e. an alias) is referenced, we need to mark the entity it references as referenced and in turn - // repeat that until we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking - // the target of the alias as an expression (which recursively takes us back here if the target references another alias). - function markImportSymbolAsReferenced(symbol: Symbol) { + // When an alias symbol is referenced, we need to mark the entity it references as referenced and in turn repeat that until + // we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking the target of + // the alias as an expression (which recursively takes us back here if the target references another alias). + function markAliasSymbolAsReferenced(symbol: Symbol) { var links = getSymbolLinks(symbol); if (!links.referenced) { links.referenced = true; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); if (node.kind === SyntaxKind.ExportAssignment) { // export default checkExpressionCached((node).expression); @@ -628,7 +627,7 @@ module ts { return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol); } - // Resolves a qualified name and any involved import aliases + // Resolves a qualified name and any involved aliases function resolveEntityName(name: EntityName, meaning: SymbolFlags): Symbol { if (getFullWidth(name) === 0) { return undefined; @@ -652,7 +651,7 @@ module ts { } } Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); - return symbol.flags & meaning ? symbol : resolveImport(symbol); + return symbol.flags & meaning ? symbol : resolveAlias(symbol); } function isExternalModuleNameRelative(moduleName: string): boolean { @@ -709,8 +708,8 @@ module ts { if (symbol.flags & (SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace)) { return symbol; } - if (symbol.flags & SymbolFlags.Import) { - return resolveImport(symbol); + if (symbol.flags & SymbolFlags.Alias) { + return resolveAlias(symbol); } } } @@ -792,9 +791,9 @@ module ts { return true; } - // If it is an import, then it is a value if the symbol it resolves to is a value. - if (symbol.flags & SymbolFlags.Import) { - return (resolveImport(symbol).flags & SymbolFlags.Value) !== 0; + // If it is an alias, then it is a value if the symbol it resolves to is a value. + if (symbol.flags & SymbolFlags.Alias) { + return (resolveAlias(symbol).flags & SymbolFlags.Value) !== 0; } return false; @@ -936,13 +935,13 @@ module ts { // Check if symbol is any of the alias return forEachValue(symbols, symbolFromSymbolTable => { - if (symbolFromSymbolTable.flags & SymbolFlags.Import) { + if (symbolFromSymbolTable.flags & SymbolFlags.Alias) { if (!useOnlyExternalAliasing || // We can use any type of alias to get the name // Is this external alias, then use it to name ts.forEach(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration)) { - var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); - if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); + if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) { return [symbolFromSymbolTable]; } @@ -978,7 +977,7 @@ module ts { } // Qualify if the symbol from symbol table has same meaning as expected - symbolFromSymbolTable = (symbolFromSymbolTable.flags & SymbolFlags.Import) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & SymbolFlags.Alias) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -1675,9 +1674,9 @@ module ts { return true; } - // if symbolOfNode is import declaration, resolve the symbol declaration and check - if (symbolOfNode.flags & SymbolFlags.Import) { - return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + // if symbolOfNode is alias declaration, resolve the symbol declaration and check + if (symbolOfNode.flags & SymbolFlags.Alias) { + return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); } } @@ -1687,9 +1686,9 @@ module ts { return true; } - if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Import)) { - // if export assigned symbol is import declaration, resolve the import - resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + 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; } @@ -2113,10 +2112,10 @@ module ts { return links.type; } - function getTypeOfImport(symbol: Symbol): Type { + function getTypeOfAlias(symbol: Symbol): Type { var links = getSymbolLinks(symbol); if (!links.type) { - links.type = getTypeOfSymbol(resolveImport(symbol)); + links.type = getTypeOfSymbol(resolveAlias(symbol)); } return links.type; } @@ -2145,8 +2144,8 @@ module ts { if (symbol.flags & SymbolFlags.Accessor) { return getTypeOfAccessors(symbol); } - if (symbol.flags & SymbolFlags.Import) { - return getTypeOfImport(symbol); + if (symbol.flags & SymbolFlags.Alias) { + return getTypeOfAlias(symbol); } return unknownType; } @@ -2312,10 +2311,10 @@ module ts { return links.declaredType; } - function getDeclaredTypeOfImport(symbol: Symbol): Type { + function getDeclaredTypeOfAlias(symbol: Symbol): Type { var links = getSymbolLinks(symbol); if (!links.declaredType) { - links.declaredType = getDeclaredTypeOfSymbol(resolveImport(symbol)); + links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)); } return links.declaredType; } @@ -2337,8 +2336,8 @@ module ts { if (symbol.flags & SymbolFlags.TypeParameter) { return getDeclaredTypeOfTypeParameter(symbol); } - if (symbol.flags & SymbolFlags.Import) { - return getDeclaredTypeOfImport(symbol); + if (symbol.flags & SymbolFlags.Alias) { + return getDeclaredTypeOfAlias(symbol); } return unknownType; } @@ -5032,8 +5031,8 @@ module ts { error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & SymbolFlags.Import && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol))) { - markImportSymbolAsReferenced(symbol); + if (symbol.flags & SymbolFlags.Alias && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) { + markAliasSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); @@ -8320,7 +8319,7 @@ module ts { return SymbolFlags.ExportType | SymbolFlags.ExportValue; case SyntaxKind.ImportEqualsDeclaration: var result: SymbolFlags = 0; - var target = resolveImport(getSymbolOfNode(d)); + var target = resolveAlias(getSymbolOfNode(d)); forEach(target.declarations, d => { result |= getDeclarationSpaces(d); }); return result; default: @@ -9803,9 +9802,9 @@ module ts { return true; } - function checkImportSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) { + function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & SymbolFlags.Value ? SymbolFlags.Value : 0) | @@ -9823,7 +9822,7 @@ module ts { function checkImportBinding(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); - checkImportSymbol(node); + checkAliasSymbol(node); } function checkImportDeclaration(node: ImportDeclaration) { @@ -9856,7 +9855,7 @@ module ts { markExportAsReferenced(node); } if (isInternalModuleImportEqualsDeclaration(node)) { - var target = resolveImport(getSymbolOfNode(node)); + var target = resolveAlias(getSymbolOfNode(node)); if (target !== unknownSymbol) { if (target.flags & SymbolFlags.Value) { // Target is a value symbol, check that it is not hidden by a local declaration with the same name @@ -9885,7 +9884,7 @@ module ts { } function checkExportSpecifier(node: ExportSpecifier) { - checkImportSymbol(node); + checkAliasSymbol(node); if (!(node.parent.parent).moduleSpecifier) { markExportAsReferenced(node); } @@ -9953,7 +9952,7 @@ module ts { var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); if (defaultSymbol) { if (hasExportedMembers(moduleSymbol)) { - var declaration = getDeclarationOfImportSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; + var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); } } @@ -10421,7 +10420,7 @@ module ts { if (entityName.parent.kind === SyntaxKind.ExportAssignment) { return resolveEntityName(entityName, - /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Import); + /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias); } if (entityName.kind !== SyntaxKind.PropertyAccessExpression) { @@ -10442,9 +10441,9 @@ module ts { } if (entityName.kind === SyntaxKind.Identifier) { - // Include Import in the meaning, this ensures that we do not follow aliases to where they point and instead + // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead // return the alias symbol. - var meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Import; + var meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias; return resolveEntityName(entityName, meaning); } else if (entityName.kind === SyntaxKind.PropertyAccessExpression) { @@ -10464,9 +10463,9 @@ module ts { } else if (isTypeReferenceIdentifier(entityName)) { var meaning = entityName.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace; - // Include Import in the meaning, this ensures that we do not follow aliases to where they point and instead + // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead // return the alias symbol. - meaning |= SymbolFlags.Import; + meaning |= SymbolFlags.Alias; return resolveEntityName(entityName, meaning); } @@ -10647,8 +10646,8 @@ module ts { function isUniqueLocalName(name: string, container: Node): boolean { for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) { if (node.locals && hasProperty(node.locals, name)) { - // We conservatively include import symbols to cover cases where they're emitted as locals - if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Import)) { + // We conservatively include alias symbols to cover cases where they're emitted as locals + if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) { return false; } } @@ -10763,8 +10762,8 @@ module ts { return getGeneratedNameForNode(node); } - function getImportNameSubstitution(symbol: Symbol): string { - var declaration = getDeclarationOfImportSymbol(symbol); + function getAliasNameSubstitution(symbol: Symbol): string { + var declaration = getDeclarationOfAliasSymbol(symbol); if (declaration && declaration.kind === SyntaxKind.ImportSpecifier) { var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent); var propertyName = (declaration).propertyName || (declaration).name; @@ -10802,8 +10801,8 @@ module ts { return getExportNameSubstitution(exportSymbol, node.parent); } // Named imports from ES6 import declarations are rewritten - if (symbol.flags & SymbolFlags.Import) { - return getImportNameSubstitution(symbol); + if (symbol.flags & SymbolFlags.Alias) { + return getAliasNameSubstitution(symbol); } } } @@ -10818,11 +10817,11 @@ module ts { // parent is not source file or it is not reference to internal module return false; } - return isImportResolvedToValue(getSymbolOfNode(node)); + return isAliasResolvedToValue(getSymbolOfNode(node)); } - function isImportResolvedToValue(symbol: Symbol): boolean { - var target = resolveImport(symbol); + function isAliasResolvedToValue(symbol: Symbol): boolean { + var target = resolveAlias(symbol); // const enums and modules that contain only const enums are not considered values from the emit perespective return target !== unknownSymbol && target.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(target); } @@ -10831,14 +10830,14 @@ module ts { return isConstEnumSymbol(s) || s.constEnumOnlyModule; } - function isReferencedImportDeclaration(node: Node): boolean { - if (isImportSymbolDeclaration(node)) { + function isReferencedAliasDeclaration(node: Node): boolean { + if (isAliasSymbolDeclaration(node)) { var symbol = getSymbolOfNode(node); if (getSymbolLinks(symbol).referenced) { return true; } } - return forEachChild(node, isReferencedImportDeclaration); + return forEachChild(node, isReferencedAliasDeclaration); } function isImplementationOfOverload(node: FunctionLikeDeclaration) { @@ -10932,7 +10931,7 @@ module ts { var symbol = declarationSymbol || getNodeLinks(n).resolvedSymbol || - resolveName(n, n.text, SymbolFlags.BlockScopedVariable | SymbolFlags.Import, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined); + resolveName(n, n.text, SymbolFlags.BlockScopedVariable | SymbolFlags.Alias, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined); var isLetOrConst = symbol && @@ -10953,7 +10952,7 @@ module ts { getGeneratedNameForNode, getExpressionNameSubstitution, hasExportDefaultValue, - isReferencedImportDeclaration, + isReferencedAliasDeclaration, getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible, diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a98ab99603c..ec9ab083fbc 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4800,7 +4800,7 @@ module ts { // preserve old compiler's behavior: emit 'var' for import declaration (even if we do not consider them referenced) when // - current file is not external module // - import declaration is top level and target is value imported by entity name - if (resolver.isReferencedImportDeclaration(node) || + if (resolver.isReferencedAliasDeclaration(node) || (!isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); @@ -4922,7 +4922,7 @@ module ts { else { var info = createExternalImportInfo(node); if (info) { - if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedImportDeclaration(node)) { + if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) { externalImports.push(info); } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4a73677b69b..de3b8c0b581 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1191,7 +1191,7 @@ module ts { getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; - isReferencedImportDeclaration(node: Node): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -1230,7 +1230,7 @@ module ts { ExportValue = 0x00100000, // Exported value marker (see comment in declareModuleMember in binder) ExportType = 0x00200000, // Exported type marker (see comment in declareModuleMember in binder) ExportNamespace = 0x00400000, // Exported namespace marker (see comment in declareModuleMember in binder) - Import = 0x00800000, // An alias for another symbol (see comment in isImportSymbolDeclaration in checker) + Alias = 0x00800000, // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker) Instantiated = 0x01000000, // Instantiated symbol Merged = 0x02000000, // Merged symbol (created during program binding) Transient = 0x04000000, // Transient symbol (created during type check) @@ -1270,9 +1270,9 @@ module ts { SetAccessorExcludes = Value & ~GetAccessor, TypeParameterExcludes = Type & ~TypeParameter, TypeAliasExcludes = Type, - ImportExcludes = Import, // Imports collide with all other imports with the same name + AliasExcludes = Alias, - ModuleMember = Variable | Function | Class | Interface | Enum | Module | TypeAlias | Import, + ModuleMember = Variable | Function | Class | Interface | Enum | Module | TypeAlias | Alias, ExportHasLocal = Function | Class | Enum | ValueModule, diff --git a/src/services/services.ts b/src/services/services.ts index fc4d1eff223..cd8fc13a2b7 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2530,7 +2530,7 @@ module ts { var symbol = typeInfoResolver.getSymbolAtLocation(node); // This is an alias, follow what it aliases - if (symbol && symbol.flags & SymbolFlags.Import) { + if (symbol && symbol.flags & SymbolFlags.Alias) { symbol = typeInfoResolver.getAliasedSymbol(symbol); } @@ -2594,7 +2594,7 @@ module ts { isNewIdentifierLocation = isNewIdentifierDefinitionLocation(previousToken); /// TODO filter meaning based on the current context - var symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Import; + var symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; var symbols = typeInfoResolver.getSymbolsInScope(node, symbolMeanings); getCompletionEntriesFromSymbols(symbols, activeCompletionSession); @@ -2971,7 +2971,7 @@ module ts { if (result === ScriptElementKind.unknown) { if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement; - if (flags & SymbolFlags.Import) return ScriptElementKind.alias; + if (flags & SymbolFlags.Alias) return ScriptElementKind.alias; if (flags & SymbolFlags.Module) return ScriptElementKind.moduleElement; } @@ -3059,7 +3059,7 @@ module ts { var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, typeResolver, location); var hasAddedSymbolInfo: boolean; // Class at constructor site need to be shown as constructor apart from property,method, vars - if (symbolKind !== ScriptElementKind.unknown || symbolFlags & SymbolFlags.Class || symbolFlags & SymbolFlags.Import) { + if (symbolKind !== ScriptElementKind.unknown || symbolFlags & SymbolFlags.Class || symbolFlags & SymbolFlags.Alias) { // If it is accessor they are allowed only if location is at name of the accessor if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) { symbolKind = ScriptElementKind.memberVariableElement; @@ -3106,7 +3106,7 @@ module ts { symbolKind = ScriptElementKind.constructorImplementationElement; addPrefixForAnyFunctionOrVar(type.symbol, symbolKind); } - else if (symbolFlags & SymbolFlags.Import) { + else if (symbolFlags & SymbolFlags.Alias) { symbolKind = ScriptElementKind.alias; displayParts.push(punctuationPart(SyntaxKind.OpenParenToken)); displayParts.push(textPart(symbolKind)); @@ -3259,7 +3259,7 @@ module ts { } } } - if (symbolFlags & SymbolFlags.Import) { + if (symbolFlags & SymbolFlags.Alias) { addNewLineIfDisplayPartsExist(); displayParts.push(keywordPart(SyntaxKind.ImportKeyword)); displayParts.push(spacePart()); @@ -3468,7 +3468,7 @@ module ts { // get the aliased symbol instead. This allows for goto def on an import e.g. // import {A, B} from "mod"; // to jump to the implementation directelly. - if (symbol.flags & SymbolFlags.Import) { + if (symbol.flags & SymbolFlags.Alias) { var declaration = symbol.declarations[0]; if (node.kind === SyntaxKind.Identifier && node.parent === declaration) { symbol = typeInfoResolver.getAliasedSymbol(symbol); @@ -4224,7 +4224,7 @@ module ts { } function isImportOrExportSpecifierImportSymbol(symbol: Symbol) { - return (symbol.flags & SymbolFlags.Import) && forEach(symbol.declarations, declaration => { + return (symbol.flags & SymbolFlags.Alias) && forEach(symbol.declarations, declaration => { return declaration.kind === SyntaxKind.ImportSpecifier || declaration.kind === SyntaxKind.ExportSpecifier; }); } @@ -4299,7 +4299,7 @@ module ts { // If the symbol is an import we would like to find it if we are looking for what it imports. // So consider it visibile outside its declaration scope. - if (symbol.flags & SymbolFlags.Import) { + if (symbol.flags & SymbolFlags.Alias) { return undefined; } diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 13156523045..ee92ed8af0d 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -414,7 +414,7 @@ module ts { else if (flags & SymbolFlags.Method) { return SymbolDisplayPartKind.methodName; } else if (flags & SymbolFlags.TypeParameter) { return SymbolDisplayPartKind.typeParameterName; } else if (flags & SymbolFlags.TypeAlias) { return SymbolDisplayPartKind.aliasName; } - else if (flags & SymbolFlags.Import) { return SymbolDisplayPartKind.aliasName; } + else if (flags & SymbolFlags.Alias) { return SymbolDisplayPartKind.aliasName; } return SymbolDisplayPartKind.text; From b54b71085bae4d1adc0b6baa25749eed03970fbc Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 4 Mar 2015 10:31:42 -0800 Subject: [PATCH 021/251] Accepting new baselines --- tests/baselines/reference/APISample_compile.js | 6 +++--- tests/baselines/reference/APISample_compile.types | 12 ++++++------ tests/baselines/reference/APISample_linter.js | 6 +++--- tests/baselines/reference/APISample_linter.types | 12 ++++++------ tests/baselines/reference/APISample_transform.js | 6 +++--- tests/baselines/reference/APISample_transform.types | 12 ++++++------ tests/baselines/reference/APISample_watcher.js | 6 +++--- tests/baselines/reference/APISample_watcher.types | 12 ++++++------ 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 16484ece6e1..bd1c52ff966 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -929,7 +929,7 @@ declare module "typescript" { getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; - isReferencedImportDeclaration(node: Node): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -966,7 +966,7 @@ declare module "typescript" { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, @@ -998,7 +998,7 @@ declare module "typescript" { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 6786fe7c274..b4308ff4df7 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -2977,8 +2977,8 @@ declare module "typescript" { >node : SourceFile >SourceFile : SourceFile - isReferencedImportDeclaration(node: Node): boolean; ->isReferencedImportDeclaration : (node: Node) => boolean + isReferencedAliasDeclaration(node: Node): boolean; +>isReferencedAliasDeclaration : (node: Node) => boolean >node : Node >Node : Node @@ -3134,8 +3134,8 @@ declare module "typescript" { ExportNamespace = 4194304, >ExportNamespace : SymbolFlags - Import = 8388608, ->Import : SymbolFlags + Alias = 8388608, +>Alias : SymbolFlags Instantiated = 16777216, >Instantiated : SymbolFlags @@ -3230,8 +3230,8 @@ declare module "typescript" { TypeAliasExcludes = 793056, >TypeAliasExcludes : SymbolFlags - ImportExcludes = 8388608, ->ImportExcludes : SymbolFlags + AliasExcludes = 8388608, +>AliasExcludes : SymbolFlags ModuleMember = 8914931, >ModuleMember : SymbolFlags diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 7496a56c851..2a833e7838e 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -960,7 +960,7 @@ declare module "typescript" { getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; - isReferencedImportDeclaration(node: Node): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -997,7 +997,7 @@ declare module "typescript" { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, @@ -1029,7 +1029,7 @@ declare module "typescript" { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index ce3aec7b886..6e213706575 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3123,8 +3123,8 @@ declare module "typescript" { >node : SourceFile >SourceFile : SourceFile - isReferencedImportDeclaration(node: Node): boolean; ->isReferencedImportDeclaration : (node: Node) => boolean + isReferencedAliasDeclaration(node: Node): boolean; +>isReferencedAliasDeclaration : (node: Node) => boolean >node : Node >Node : Node @@ -3280,8 +3280,8 @@ declare module "typescript" { ExportNamespace = 4194304, >ExportNamespace : SymbolFlags - Import = 8388608, ->Import : SymbolFlags + Alias = 8388608, +>Alias : SymbolFlags Instantiated = 16777216, >Instantiated : SymbolFlags @@ -3376,8 +3376,8 @@ declare module "typescript" { TypeAliasExcludes = 793056, >TypeAliasExcludes : SymbolFlags - ImportExcludes = 8388608, ->ImportExcludes : SymbolFlags + AliasExcludes = 8388608, +>AliasExcludes : SymbolFlags ModuleMember = 8914931, >ModuleMember : SymbolFlags diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 326fc1bf97f..b757be0788a 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -961,7 +961,7 @@ declare module "typescript" { getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; - isReferencedImportDeclaration(node: Node): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -998,7 +998,7 @@ declare module "typescript" { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, @@ -1030,7 +1030,7 @@ declare module "typescript" { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index e27b143a319..ff78dde3975 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3073,8 +3073,8 @@ declare module "typescript" { >node : SourceFile >SourceFile : SourceFile - isReferencedImportDeclaration(node: Node): boolean; ->isReferencedImportDeclaration : (node: Node) => boolean + isReferencedAliasDeclaration(node: Node): boolean; +>isReferencedAliasDeclaration : (node: Node) => boolean >node : Node >Node : Node @@ -3230,8 +3230,8 @@ declare module "typescript" { ExportNamespace = 4194304, >ExportNamespace : SymbolFlags - Import = 8388608, ->Import : SymbolFlags + Alias = 8388608, +>Alias : SymbolFlags Instantiated = 16777216, >Instantiated : SymbolFlags @@ -3326,8 +3326,8 @@ declare module "typescript" { TypeAliasExcludes = 793056, >TypeAliasExcludes : SymbolFlags - ImportExcludes = 8388608, ->ImportExcludes : SymbolFlags + AliasExcludes = 8388608, +>AliasExcludes : SymbolFlags ModuleMember = 8914931, >ModuleMember : SymbolFlags diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index d7731130cc9..77dc280869f 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -998,7 +998,7 @@ declare module "typescript" { getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; hasExportDefaultValue(node: SourceFile): boolean; - isReferencedImportDeclaration(node: Node): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -1035,7 +1035,7 @@ declare module "typescript" { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, @@ -1067,7 +1067,7 @@ declare module "typescript" { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 8b441711c7d..381a68d5853 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -3246,8 +3246,8 @@ declare module "typescript" { >node : SourceFile >SourceFile : SourceFile - isReferencedImportDeclaration(node: Node): boolean; ->isReferencedImportDeclaration : (node: Node) => boolean + isReferencedAliasDeclaration(node: Node): boolean; +>isReferencedAliasDeclaration : (node: Node) => boolean >node : Node >Node : Node @@ -3403,8 +3403,8 @@ declare module "typescript" { ExportNamespace = 4194304, >ExportNamespace : SymbolFlags - Import = 8388608, ->Import : SymbolFlags + Alias = 8388608, +>Alias : SymbolFlags Instantiated = 16777216, >Instantiated : SymbolFlags @@ -3499,8 +3499,8 @@ declare module "typescript" { TypeAliasExcludes = 793056, >TypeAliasExcludes : SymbolFlags - ImportExcludes = 8388608, ->ImportExcludes : SymbolFlags + AliasExcludes = 8388608, +>AliasExcludes : SymbolFlags ModuleMember = 8914931, >ModuleMember : SymbolFlags From 4dfed9c84ced83e3cac6f0a5b0d906519a9ba522 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Wed, 4 Mar 2015 13:13:54 -0800 Subject: [PATCH 022/251] Adding test to ensure comment before block is conserved --- tests/baselines/reference/commentOnBlock1.js | 11 +++++++++++ tests/baselines/reference/commentOnBlock1.types | 7 +++++++ tests/cases/compiler/commentOnBlock1.ts | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 tests/baselines/reference/commentOnBlock1.js create mode 100644 tests/baselines/reference/commentOnBlock1.types create mode 100644 tests/cases/compiler/commentOnBlock1.ts diff --git a/tests/baselines/reference/commentOnBlock1.js b/tests/baselines/reference/commentOnBlock1.js new file mode 100644 index 00000000000..ed5437c1f66 --- /dev/null +++ b/tests/baselines/reference/commentOnBlock1.js @@ -0,0 +1,11 @@ +//// [commentOnBlock1.ts] +// asdf +function f() { + /*asdf*/{} +} + +//// [commentOnBlock1.js] +// asdf +function f() { + /*asdf*/ { } +} diff --git a/tests/baselines/reference/commentOnBlock1.types b/tests/baselines/reference/commentOnBlock1.types new file mode 100644 index 00000000000..cc01efddb1c --- /dev/null +++ b/tests/baselines/reference/commentOnBlock1.types @@ -0,0 +1,7 @@ +=== tests/cases/compiler/commentOnBlock1.ts === +// asdf +function f() { +>f : () => void + + /*asdf*/{} +} diff --git a/tests/cases/compiler/commentOnBlock1.ts b/tests/cases/compiler/commentOnBlock1.ts new file mode 100644 index 00000000000..1c9947d15b5 --- /dev/null +++ b/tests/cases/compiler/commentOnBlock1.ts @@ -0,0 +1,4 @@ +// asdf +function f() { + /*asdf*/{} +} \ No newline at end of file From 981ef7f0eba6258e796ff33368e1c968f50aabe9 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 4 Mar 2015 14:53:44 -0800 Subject: [PATCH 023/251] Excluding "default" member from "export *" per ES6 specification --- 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 8e2b3b465e4..1996fc6ab1f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -248,14 +248,6 @@ module ts { } } - function extendSymbolTable(target: SymbolTable, source: SymbolTable) { - for (var id in source) { - if (!hasProperty(target, id)) { - target[id] = source[id]; - } - } - } - function getSymbolLinks(symbol: Symbol): SymbolLinks { if (symbol.flags & SymbolFlags.Transient) return symbol; if (!symbol.id) symbol.id = nextSymbolId++; @@ -723,6 +715,14 @@ module ts { return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); } + function extendExportSymbols(target: SymbolTable, source: SymbolTable) { + for (var id in source) { + if (id !== "default" && !hasProperty(target, id)) { + target[id] = source[id]; + } + } + } + function getExportsForModule(moduleSymbol: Symbol): SymbolTable { if (compilerOptions.target < ScriptTarget.ES6) { // A default export hides all other exports in CommonJS and AMD modules @@ -747,7 +747,7 @@ module ts { if (!result) { result = cloneSymbolTable(moduleSymbol.exports); } - extendSymbolTable(result, symbol.exports); + extendExportSymbols(result, symbol.exports); } // All export * declarations are collected in an __export symbol by the binder var exportStars = symbol.exports["__export"]; From d3fbebf3fb6079856d9e01621f78f0ed097e48a1 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Wed, 4 Mar 2015 18:15:55 -0800 Subject: [PATCH 024/251] Never use the entire span of a function declaration or function expression when reporting a checker error. --- src/compiler/checker.ts | 23 +-- src/compiler/program.ts | 14 +- src/compiler/utilities.ts | 62 +++++-- .../reference/ambientErrors.errors.txt | 4 +- .../reference/anyIdenticalToItself.errors.txt | 4 +- ...ambdaToNominalSubtypeOfFunction.errors.txt | 2 +- ...uperAndLocalFunctionInAccessors.errors.txt | 28 ++-- ...erAndLocalFunctionInConstructor.errors.txt | 14 +- ...onSuperAndLocalFunctionInMethod.errors.txt | 14 +- ...SuperAndLocalFunctionInProperty.errors.txt | 7 +- ...tOverloadFunctionNoSubtypeError.errors.txt | 12 +- ...ertyIsRelatableToTargetProperty.errors.txt | 4 +- .../exportAssignDottedName.errors.txt | 10 +- .../exportAssignImportedIdentifier.errors.txt | 10 +- ...nAndInterfaceWithSeparateErrors.errors.txt | 4 +- .../functionImplementationErrors.errors.txt | 84 ++++------ .../functionOverloadErrors.errors.txt | 12 +- .../reference/functionOverloads11.errors.txt | 4 +- .../reference/functionOverloads17.errors.txt | 4 +- .../reference/functionOverloads18.errors.txt | 4 +- .../reference/functionOverloads19.errors.txt | 4 +- .../reference/functionOverloads20.errors.txt | 4 +- .../reference/functionOverloads22.errors.txt | 4 +- .../reference/functionOverloads4.errors.txt | 4 +- ...ionWithMultipleReturnStatements.errors.txt | 156 ++++++------------ ...onWithMultipleReturnStatements2.errors.txt | 44 ++--- .../functionWithNoBestCommonType1.errors.txt | 13 ++ .../functionWithNoBestCommonType1.js | 16 ++ .../functionWithNoBestCommonType2.errors.txt | 13 ++ .../functionWithNoBestCommonType2.js | 16 ++ .../reference/implicitAnyAmbients.errors.txt | 8 +- .../implicitAnyCastedValue.errors.txt | 10 +- ...reFunctionExprWithoutFormalType.errors.txt | 8 +- ...mplicitAnyFromCircularInference.errors.txt | 8 +- ...nyFunctionReturnNullOrUndefined.errors.txt | 8 +- ...licitAnyInAmbientDeclaration2.d.errors.txt | 4 +- ...edFunctionReturnTypeIsEmptyType.errors.txt | 25 +-- .../noImplicitAnyFunctions.errors.txt | 18 +- .../reference/noImplicitAnyModule.errors.txt | 4 +- .../noImplicitAnyWithOverloads.errors.txt | 8 +- .../overloadAssignmentCompat.errors.txt | 4 +- ...verloadOnConstConstraintChecks4.errors.txt | 4 +- ...rloadOnConstDuplicateOverloads1.errors.txt | 8 +- ...loadOnConstantsInvalidOverload1.errors.txt | 14 +- .../overloadingOnConstants2.errors.txt | 12 +- ...dingOnConstantsInImplementation.errors.txt | 17 +- .../reference/parserArgumentList1.errors.txt | 12 +- ...rserModifierOnStatementInBlock1.errors.txt | 8 +- ...rserModifierOnStatementInBlock3.errors.txt | 9 +- .../parserParameterList15.errors.txt | 4 +- .../parserUnaryExpression2.errors.txt | 2 +- .../recursiveFunctionTypes.errors.txt | 4 +- ...lizedOverloadWithRestParameters.errors.txt | 8 +- ...ubtypeOfNonSpecializedSignature.errors.txt | 4 +- ...ingLiteralTypeIsSubtypeOfString.errors.txt | 28 ++-- ...TypesInImplementationSignatures.errors.txt | 12 +- ...ypesInImplementationSignatures2.errors.txt | 4 +- .../reference/targetTypeVoidFunc.errors.txt | 2 +- ...teStringInFunctionParameterType.errors.txt | 6 +- ...tringInFunctionParameterTypeES6.errors.txt | 6 +- .../voidAsNonAmbiguousReturnType.errors.txt | 4 +- .../compiler/functionWithNoBestCommonType1.ts | 7 + .../compiler/functionWithNoBestCommonType2.ts | 7 + 63 files changed, 423 insertions(+), 458 deletions(-) create mode 100644 tests/baselines/reference/functionWithNoBestCommonType1.errors.txt create mode 100644 tests/baselines/reference/functionWithNoBestCommonType1.js create mode 100644 tests/baselines/reference/functionWithNoBestCommonType2.errors.txt create mode 100644 tests/baselines/reference/functionWithNoBestCommonType2.js create mode 100644 tests/cases/compiler/functionWithNoBestCommonType1.ts create mode 100644 tests/cases/compiler/functionWithNoBestCommonType2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9daa87daed4..7220182bfe9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8605,7 +8605,7 @@ module ts { // since LHS will be block scoped name instead of function scoped if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); - error(getErrorSpanForNode(node), Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); + error(node, Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); } } } @@ -11817,19 +11817,11 @@ module ts { return sourceFile.parseDiagnostics.length > 0; } - function scanToken(scanner: Scanner, pos: number) { - scanner.setTextPos(pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return start; - } - function grammarErrorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean { var sourceFile = getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = createScanner(languageVersion, /*skipTrivia*/ true, sourceFile.text); - var start = scanToken(scanner, node.pos); - diagnostics.add(createFileDiagnostic(sourceFile, start, scanner.getTextPos() - start, message, arg0, arg1, arg2)); + var span = getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2)); return true; } } @@ -11844,9 +11836,7 @@ module ts { function grammarErrorOnNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean { var sourceFile = getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var span = getErrorSpanForNode(node); - var start = span.end > span.pos ? skipTrivia(sourceFile.text, span.pos) : span.pos; - diagnostics.add(createFileDiagnostic(sourceFile, start, span.end - start, message, arg0, arg1, arg2)); + diagnostics.add(createDiagnosticForNode(node, message, arg0, arg1, arg2)); return true; } } @@ -11983,9 +11973,8 @@ module ts { function grammarErrorAfterFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean { var sourceFile = getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = createScanner(languageVersion, /*skipTrivia*/ true, sourceFile.text); - scanToken(scanner, node.pos); - diagnostics.add(createFileDiagnostic(sourceFile, scanner.getTextPos(), 0, message, arg0, arg1, arg2)); + var span = getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(createFileDiagnostic(sourceFile, textSpanEnd(span), /*length*/ 0, message, arg0, arg1, arg2)); return true; } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 88ab2825fd2..9d1dc652441 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -423,13 +423,11 @@ module ts { return; } - var firstExternalModule = forEach(files, f => isExternalModule(f) ? f : undefined); - if (firstExternalModule && !options.module) { - // We cannot use createDiagnosticFromNode because nodes do not have parents yet - var externalModuleErrorSpan = getErrorSpanForNode(firstExternalModule.externalModuleIndicator); - var errorStart = skipTrivia(firstExternalModule.text, externalModuleErrorSpan.pos); - var errorLength = externalModuleErrorSpan.end - errorStart; - diagnostics.add(createFileDiagnostic(firstExternalModule, errorStart, errorLength, Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); + var firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined); + if (firstExternalModuleSourceFile && !options.module) { + // We cannot use createDiagnosticFromNode because nodes do not have parents yet + var span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + diagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); } // there has to be common source directory if user specified --outdir || --sourcRoot @@ -437,7 +435,7 @@ module ts { if (options.outDir || // there is --outDir specified options.sourceRoot || // there is --sourceRoot specified (options.mapRoot && // there is --mapRoot Specified and there would be multiple js files generated - (!options.out || firstExternalModule !== undefined))) { + (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents: string[]; forEach(files, sourceFile => { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cb8f7f537bc..f2687a151af 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -218,32 +218,39 @@ module ts { } export function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - - var start = getTokenPosOfNode(node, file); - var length = node.end - start; - - return createFileDiagnostic(file, start, length, message, arg0, arg1, arg2); + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); } export function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): Diagnostic { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = skipTrivia(file.text, node.pos); - var length = node.end - start; + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); return { - file, - start, - length, + file: sourceFile, + start: span.start, + length: span.length, code: messageChain.code, category: messageChain.category, messageText: messageChain.next ? messageChain : messageChain.messageText }; } - export function getErrorSpanForNode(node: Node): Node { - var errorSpan: Node; + interface FileTextRange extends TextRange { + sourceFile: SourceFile; + } + + /* @internal */ + export function getSpanOfTokenAtPosition(sourceFile: SourceFile, pos: number): TextSpan { + var scanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.text); + scanner.setTextPos(pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return createTextSpanFromBounds(start, scanner.getTextPos()); + } + + export function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan { + var errorNode: Node; switch (node.kind) { // This list is a work in progress. Add missing node kinds to improve their error // spans. @@ -254,16 +261,35 @@ module ts { case SyntaxKind.ModuleDeclaration: case SyntaxKind.EnumDeclaration: case SyntaxKind.EnumMember: - errorSpan = (node).name; + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.FunctionExpression: + errorNode = (node).name; break; } + + if (node.kind === SyntaxKind.FunctionExpression) { + var functionExpression = node; + if (nodeIsMissing(functionExpression.name)) { + // If it's an anonymous function expression, put the error on the first token. + return getSpanOfTokenAtPosition(sourceFile, node.pos); + } + else { + errorNode = functionExpression.name; + } + } // We now have the ideal error span, but it may be a node that is optional and absent // (e.g. the name of a function expression), in which case errorSpan will be undefined. // Alternatively, it might be required and missing (e.g. the name of a module), in which // case its pos will equal its end (length 0). In either of these cases, we should fall // back to the original node that the error was issued on. - return errorSpan && errorSpan.pos < errorSpan.end ? errorSpan : node; + errorNode = nodeIsMissing(errorNode) ? node : errorNode; + + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : skipTrivia(sourceFile.text, errorNode.pos); + + return createTextSpanFromBounds(pos, errorNode.end); } export function isExternalModule(file: SourceFile): boolean { diff --git a/tests/baselines/reference/ambientErrors.errors.txt b/tests/baselines/reference/ambientErrors.errors.txt index c8159708dd8..a741536e078 100644 --- a/tests/baselines/reference/ambientErrors.errors.txt +++ b/tests/baselines/reference/ambientErrors.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/ambient/ambientErrors.ts(2,15): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/ambient/ambientErrors.ts(6,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/ambient/ambientErrors.ts(6,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/ambient/ambientErrors.ts(17,22): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. tests/cases/conformance/ambient/ambientErrors.ts(20,24): error TS1184: An implementation cannot be declared in ambient contexts. tests/cases/conformance/ambient/ambientErrors.ts(24,5): error TS1066: Ambient enum elements can only have integer literal initializers. @@ -25,7 +25,7 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export // Ambient functions with invalid overloads declare function fn(x: number): string; declare function fn(x: 'foo'): number; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. // Ambient functions with duplicate signatures diff --git a/tests/baselines/reference/anyIdenticalToItself.errors.txt b/tests/baselines/reference/anyIdenticalToItself.errors.txt index 6b82f3af73c..bcd3b52daef 100644 --- a/tests/baselines/reference/anyIdenticalToItself.errors.txt +++ b/tests/baselines/reference/anyIdenticalToItself.errors.txt @@ -1,11 +1,11 @@ -tests/cases/compiler/anyIdenticalToItself.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/anyIdenticalToItself.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/compiler/anyIdenticalToItself.ts(6,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/anyIdenticalToItself.ts(10,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. ==== tests/cases/compiler/anyIdenticalToItself.ts (3 errors) ==== function foo(x: any); - ~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo(x: any); function foo(x: any, y: number) { } diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt index 580c6fa3c45..f462fd347e6 100644 --- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt +++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.errors.txt @@ -16,7 +16,7 @@ tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts(8,4): error TS234 !!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'. !!! error TS2345: Property 'x' is missing in type '(a: any, b: any) => boolean'. fn(function (a, b) { return true; }) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2345: Argument of type '(a: any, b: any) => boolean' is not assignable to parameter of type 'IResultCallback'. !!! error TS2345: Property 'x' is missing in type '(a: any, b: any) => boolean'. \ No newline at end of file diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.errors.txt b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.errors.txt index 6a459b222c7..16b4edced7b 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.errors.txt +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.errors.txt @@ -1,13 +1,13 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(4,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(9,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(15,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(16,9): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(16,18): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(20,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(21,9): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(21,18): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(26,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(28,13): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(28,22): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(33,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(35,13): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(35,22): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. ==== tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts (10 errors) ==== @@ -33,20 +33,18 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(35,13): error ~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } return 10; } set prop2(val: number) { ~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } class c extends Foo { @@ -55,10 +53,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(35,13): error !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. var x = () => { function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } return 10; } @@ -67,10 +64,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInAccessors.ts(35,13): error !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. var x = () => { function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } } \ No newline at end of file diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.errors.txt b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.errors.txt index 8fce8f63f9d..5e1ec686bfd 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.errors.txt +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(12,9): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. -tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(20,13): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(12,18): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(20,22): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. ==== tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts (2 errors) ==== @@ -15,10 +15,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(20,13): erro constructor() { super(); function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } class c extends Foo { @@ -26,10 +25,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInConstructor.ts(20,13): erro super(); var x = () => { function _super() { // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } } \ No newline at end of file diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.errors.txt b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.errors.txt index e45219e43c3..e899858fcc9 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.errors.txt +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(13,9): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. -tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(22,13): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(13,18): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(22,22): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. ==== tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts (2 errors) ==== @@ -16,10 +16,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(22,13): error TS2 class b extends Foo { public foo() { function _super() { // should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } _super() { // No Error } @@ -28,10 +27,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInMethod.ts(22,13): error TS2 public foo() { var x = () => { function _super() { // should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } _super() { // No error diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.errors.txt b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.errors.txt index 6313eb2d830..f5c585525e0 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.errors.txt +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/collisionSuperAndLocalFunctionInProperty.ts(14,13): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. +tests/cases/compiler/collisionSuperAndLocalFunctionInProperty.ts(14,22): error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. ==== tests/cases/compiler/collisionSuperAndLocalFunctionInProperty.ts (1 errors) ==== @@ -16,10 +16,9 @@ tests/cases/compiler/collisionSuperAndLocalFunctionInProperty.ts(14,13): error T public prop2 = { doStuff: () => { function _super() { // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~~~~~~~~~ + ~~~~~~ !!! error TS2401: Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference. + } } } } \ No newline at end of file diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt index b0a4a871f21..3c5e6f8efca 100644 --- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt +++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt @@ -1,6 +1,6 @@ -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(6,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(7,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(8,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. ==== tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts (3 errors) ==== @@ -10,13 +10,13 @@ tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(8,1): error TS238 class Derived3 extends Base { biz() { } } function foo(tagName: 'canvas'): Derived3; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(tagName: 'div'): Derived2; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(tagName: 'span'): Derived1; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(tagName: number): Base; function foo(tagName: any): Base { diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt index 717d76309a5..450d180e884 100644 --- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt +++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(5,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'. Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo'. @@ -9,7 +9,7 @@ tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): e } class D extends C { } function foo(x: "hi", items: string[]): typeof foo; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: string, items: string[]): typeof foo { return null; diff --git a/tests/baselines/reference/exportAssignDottedName.errors.txt b/tests/baselines/reference/exportAssignDottedName.errors.txt index 264e32c9cad..c2f732e0b45 100644 --- a/tests/baselines/reference/exportAssignDottedName.errors.txt +++ b/tests/baselines/reference/exportAssignDottedName.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. +tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided. tests/cases/conformance/externalModules/foo2.ts(2,14): error TS1005: ';' expected. tests/cases/conformance/externalModules/foo2.ts(2,15): error TS2304: Cannot find name 'x'. @@ -13,10 +13,8 @@ tests/cases/conformance/externalModules/foo2.ts(2,15): error TS2304: Cannot find ==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== export function x(){ - ~~~~~~~~~~~~~~~~~~~~ - return true; - ~~~~~~~~~~~~~ - } - ~ + ~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. + return true; + } \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt index 8aa25aee2ad..a3e4702f1e6 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt +++ b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. +tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided. ==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ==== @@ -6,12 +6,10 @@ tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compi var x = foo2(); // should be boolean ==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== export function x(){ - ~~~~~~~~~~~~~~~~~~~~ - return true; - ~~~~~~~~~~~~~ - } - ~ + ~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. + return true; + } ==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== import foo1 = require('./foo1'); diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt index 72f24af0c63..51287c87393 100644 --- a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt +++ b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts(6,5): error TS2411: Property 'prop' of type 'number' is not assignable to string index type 'string'. ==== tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts (2 errors) ==== function Foo(s: string); - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function Foo(n: number) { } diff --git a/tests/baselines/reference/functionImplementationErrors.errors.txt b/tests/baselines/reference/functionImplementationErrors.errors.txt index 8ebd5aa272d..0c74588c316 100644 --- a/tests/baselines/reference/functionImplementationErrors.errors.txt +++ b/tests/baselines/reference/functionImplementationErrors.errors.txt @@ -1,15 +1,15 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(2,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/functions/functionImplementationErrors.ts(6,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/functions/functionImplementationErrors.ts(6,19): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(10,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(16,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(25,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement. tests/cases/conformance/functions/functionImplementationErrors.ts(30,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it. tests/cases/conformance/functions/functionImplementationErrors.ts(35,17): error TS2373: Initializer of parameter 'n' cannot reference identifier 'm' declared after it. tests/cases/conformance/functions/functionImplementationErrors.ts(40,28): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement. -tests/cases/conformance/functions/functionImplementationErrors.ts(49,1): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/functions/functionImplementationErrors.ts(49,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(53,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(57,11): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/functions/functionImplementationErrors.ts(61,1): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/functions/functionImplementationErrors.ts(61,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(65,11): error TS2354: No best common type exists among return expressions. tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error TS2354: No best common type exists among return expressions. @@ -17,23 +17,17 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error ==== tests/cases/conformance/functions/functionImplementationErrors.ts (14 errors) ==== // FunctionExpression with no return type annotation with multiple return statements with unrelated types var f1 = function () { - ~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~ - return 3; - ~~~~~~~~~~~~~ - }; - ~ + ~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. + return ''; + return 3; + }; var f2 = function x() { - ~~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~ - return 3; - ~~~~~~~~~~~~~ - }; - ~ + ~ !!! error TS2354: No best common type exists among return expressions. + return ''; + return 3; + }; var f3 = () => { ~~~~~~~ return ''; @@ -46,20 +40,14 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error // FunctionExpression with no return type annotation with return branch of number[] and other of string[] var f4 = function () { - ~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return ['']; - ~~~~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return [1]; - ~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return ['']; + } else { + return [1]; + } + } // Function implemetnation with non -void return type annotation with no return function f5(): number { @@ -95,23 +83,17 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error class Derived1 extends Base { private m; } class Derived2 extends Base { private n; } function f8() { - ~~~~~~~~~~~~~~~ + ~~ +!!! error TS2354: No best common type exists among return expressions. return new Derived1(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ return new Derived2(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } - ~ -!!! error TS2354: No best common type exists among return expressions. var f9 = function () { - ~~~~~~~~~~~~~ - return new Derived1(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ - return new Derived2(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ - }; - ~ + ~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. + return new Derived1(); + return new Derived2(); + }; var f10 = () => { ~~~~~~~ return new Derived1(); @@ -122,23 +104,17 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(69,11): error ~ !!! error TS2354: No best common type exists among return expressions. function f11() { - ~~~~~~~~~~~~~~~~ + ~~~ +!!! error TS2354: No best common type exists among return expressions. return new Base(); - ~~~~~~~~~~~~~~~~~~~~~~ return new AnotherClass(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } - ~ -!!! error TS2354: No best common type exists among return expressions. var f12 = function () { - ~~~~~~~~~~~~~ - return new Base(); - ~~~~~~~~~~~~~~~~~~~~~~ - return new AnotherClass(); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - }; - ~ + ~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. + return new Base(); + return new AnotherClass(); + }; var f13 = () => { ~~~~~~~ return new Base(); diff --git a/tests/baselines/reference/functionOverloadErrors.errors.txt b/tests/baselines/reference/functionOverloadErrors.errors.txt index bc4fea0a98b..ae1dfeae4d1 100644 --- a/tests/baselines/reference/functionOverloadErrors.errors.txt +++ b/tests/baselines/reference/functionOverloadErrors.errors.txt @@ -8,9 +8,9 @@ tests/cases/conformance/functions/functionOverloadErrors.ts(75,21): error TS2383 tests/cases/conformance/functions/functionOverloadErrors.ts(79,14): error TS2383: Overload signatures must all be exported or not exported. tests/cases/conformance/functions/functionOverloadErrors.ts(85,18): error TS2384: Overload signatures must all be ambient or non-ambient. tests/cases/conformance/functions/functionOverloadErrors.ts(90,18): error TS2384: Overload signatures must all be ambient or non-ambient. -tests/cases/conformance/functions/functionOverloadErrors.ts(94,1): error TS2394: Overload signature is not compatible with function implementation. -tests/cases/conformance/functions/functionOverloadErrors.ts(99,1): error TS2394: Overload signature is not compatible with function implementation. -tests/cases/conformance/functions/functionOverloadErrors.ts(103,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/functions/functionOverloadErrors.ts(94,10): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/functions/functionOverloadErrors.ts(99,10): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/functions/functionOverloadErrors.ts(103,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/functions/functionOverloadErrors.ts(116,19): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. @@ -129,20 +129,20 @@ tests/cases/conformance/functions/functionOverloadErrors.ts(116,19): error TS237 //Function overloads with fewer params than implementation signature function fewerParams(); - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function fewerParams(n: string) { } //Function implementation whose parameter types are not assignable to all corresponding overload signature parameters function fn13(n: string); - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function fn13(n: number) { } //Function overloads where return types are not all subtype of implementation return type function fn14(n: string): string; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function fn14() { return 3; diff --git a/tests/baselines/reference/functionOverloads11.errors.txt b/tests/baselines/reference/functionOverloads11.errors.txt index 18155cbe69f..005ee9bb143 100644 --- a/tests/baselines/reference/functionOverloads11.errors.txt +++ b/tests/baselines/reference/functionOverloads11.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/functionOverloads11.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads11.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads11.ts (1 errors) ==== function foo():number; - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo():string { return "" } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads17.errors.txt b/tests/baselines/reference/functionOverloads17.errors.txt index 44565702632..febd2c03ac8 100644 --- a/tests/baselines/reference/functionOverloads17.errors.txt +++ b/tests/baselines/reference/functionOverloads17.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/functionOverloads17.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads17.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads17.ts (1 errors) ==== function foo():{a:number;} - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo():{a:string;} { return {a:""} } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads18.errors.txt b/tests/baselines/reference/functionOverloads18.errors.txt index 384c1e3fa8f..bec6a45ed89 100644 --- a/tests/baselines/reference/functionOverloads18.errors.txt +++ b/tests/baselines/reference/functionOverloads18.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/functionOverloads18.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads18.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads18.ts (1 errors) ==== function foo(bar:{a:number;}); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo(bar:{a:string;}) { return {a:""} } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads19.errors.txt b/tests/baselines/reference/functionOverloads19.errors.txt index 4c6935493e9..d87ba17562a 100644 --- a/tests/baselines/reference/functionOverloads19.errors.txt +++ b/tests/baselines/reference/functionOverloads19.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/functionOverloads19.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads19.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads19.ts (1 errors) ==== function foo(bar:{b:string;}); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo(bar:{a:string;}); function foo(bar:{a:any;}) { return {a:""} } diff --git a/tests/baselines/reference/functionOverloads20.errors.txt b/tests/baselines/reference/functionOverloads20.errors.txt index 2a51afefe0c..6b33795bc3e 100644 --- a/tests/baselines/reference/functionOverloads20.errors.txt +++ b/tests/baselines/reference/functionOverloads20.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/functionOverloads20.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads20.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads20.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(bar:{a:any;}): string {return ""} diff --git a/tests/baselines/reference/functionOverloads22.errors.txt b/tests/baselines/reference/functionOverloads22.errors.txt index bc075e0c3ef..c9fc8aa2b2f 100644 --- a/tests/baselines/reference/functionOverloads22.errors.txt +++ b/tests/baselines/reference/functionOverloads22.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/functionOverloads22.ts(2,1): error TS2394: Overload signature is not compatible with function implementation. +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/functionOverloads4.errors.txt b/tests/baselines/reference/functionOverloads4.errors.txt index 1e41fde6021..78d772a0f6f 100644 --- a/tests/baselines/reference/functionOverloads4.errors.txt +++ b/tests/baselines/reference/functionOverloads4.errors.txt @@ -1,8 +1,8 @@ -tests/cases/compiler/functionOverloads4.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads4.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/functionOverloads4.ts (1 errors) ==== function foo():number; - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo():string { return "a" } \ No newline at end of file diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt index d9a25e24566..8a57d8e08e6 100644 --- a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt +++ b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(4,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(12,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(22,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(31,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(43,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(48,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,1): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(4,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(12,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(22,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(31,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(43,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(48,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(56,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(56,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. @@ -14,126 +14,80 @@ tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMulti // it is an error if there is no single BCT, these are error cases function f1() { - ~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return 1; - ~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return 1; + } else { + return ''; + } + } function f2() { - ~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return 1; - ~~~~~~~~~~~~~~~~~ - } else if (false) { - ~~~~~~~~~~~~~~~~~~~~~~~ - return 2; - ~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return 1; + } else if (false) { + return 2; + } else { + return ''; + } + } function f3() { - ~~~~~~~~~~~~~~~ - try { - ~~~~~~~~~ - return 1; - ~~~~~~~~~~~~~~~~~ - } - ~~~~~ - catch (e) { - ~~~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + try { + return 1; + } + catch (e) { + return ''; + } + } function f4() { - ~~~~~~~~~~~~~~~ - try { - ~~~~~~~~~ - return 1; - ~~~~~~~~~~~~~~~~~ - } - ~~~~~ - catch (e) { - ~~~~~~~~~~~~~~~ - - - } - ~~~~~ - finally { - ~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + try { + return 1; + } + catch (e) { + + } + finally { + return ''; + } + } function f5() { - ~~~~~~~~~~~~~~~ - return 1; - ~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + return 1; + return ''; + } function f6(x: T, y:U) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return x; - ~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return y; - ~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return x; + } else { + return y; + } + } 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 { - ~~~~~~~~~~~~ return y; - ~~~~~~~~~~~~~~~~~ } - ~~~~~ } - ~ -!!! error TS2354: No best common type exists among return expressions. \ No newline at end of file diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt b/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt index 2b14bd97bad..bbaa5a85578 100644 --- a/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt +++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.errors.txt @@ -1,5 +1,5 @@ -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(58,1): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(67,1): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(58,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts(67,10): error TS2354: No best common type exists among return expressions. ==== tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.ts (2 errors) ==== @@ -61,37 +61,25 @@ tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMulti var b: { x: number; z?: number }; // returns typeof a function f9() { - ~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return a; - ~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return b; - ~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return a; + } else { + return b; + } + } // returns typeof b function f10() { - ~~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return b; - ~~~~~~~~~~~~~~~~~ - } else { - ~~~~~~~~~~~~ - return a; - ~~~~~~~~~~~~~~~~~ - } - ~~~~~ - } - ~ + ~~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return b; + } else { + return a; + } + } // returns number => void function f11() { diff --git a/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt b/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt new file mode 100644 index 00000000000..3c8fef3eb49 --- /dev/null +++ b/tests/baselines/reference/functionWithNoBestCommonType1.errors.txt @@ -0,0 +1,13 @@ +tests/cases/compiler/functionWithNoBestCommonType1.ts(1,10): error TS2354: No best common type exists among return expressions. + + +==== tests/cases/compiler/functionWithNoBestCommonType1.ts (1 errors) ==== + function foo() { + ~~~ +!!! error TS2354: No best common type exists among return expressions. + return true; + return bar(); + } + + function bar(): void { + } \ No newline at end of file diff --git a/tests/baselines/reference/functionWithNoBestCommonType1.js b/tests/baselines/reference/functionWithNoBestCommonType1.js new file mode 100644 index 00000000000..f7114fb40d8 --- /dev/null +++ b/tests/baselines/reference/functionWithNoBestCommonType1.js @@ -0,0 +1,16 @@ +//// [functionWithNoBestCommonType1.ts] +function foo() { + return true; + return bar(); +} + +function bar(): void { +} + +//// [functionWithNoBestCommonType1.js] +function foo() { + return true; + return bar(); +} +function bar() { +} diff --git a/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt b/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt new file mode 100644 index 00000000000..981e330d9b5 --- /dev/null +++ b/tests/baselines/reference/functionWithNoBestCommonType2.errors.txt @@ -0,0 +1,13 @@ +tests/cases/compiler/functionWithNoBestCommonType2.ts(1,9): error TS2354: No best common type exists among return expressions. + + +==== tests/cases/compiler/functionWithNoBestCommonType2.ts (1 errors) ==== + var v = function () { + ~~~~~~~~ +!!! error TS2354: No best common type exists among return expressions. + return true; + return bar(); + }; + + function bar(): void { + } \ No newline at end of file diff --git a/tests/baselines/reference/functionWithNoBestCommonType2.js b/tests/baselines/reference/functionWithNoBestCommonType2.js new file mode 100644 index 00000000000..8e903518ec0 --- /dev/null +++ b/tests/baselines/reference/functionWithNoBestCommonType2.js @@ -0,0 +1,16 @@ +//// [functionWithNoBestCommonType2.ts] +var v = function () { + return true; + return bar(); +}; + +function bar(): void { +} + +//// [functionWithNoBestCommonType2.js] +var v = function () { + return true; + return bar(); +}; +function bar() { +} diff --git a/tests/baselines/reference/implicitAnyAmbients.errors.txt b/tests/baselines/reference/implicitAnyAmbients.errors.txt index 699bd4b7f34..e71fd6f72ea 100644 --- a/tests/baselines/reference/implicitAnyAmbients.errors.txt +++ b/tests/baselines/reference/implicitAnyAmbients.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/implicitAnyAmbients.ts(3,9): error TS7005: Variable 'x' implicitly has an 'any' type. -tests/cases/compiler/implicitAnyAmbients.ts(6,5): error TS7010: 'f', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyAmbients.ts(6,14): error TS7010: 'f', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyAmbients.ts(6,16): error TS7006: Parameter 'x' implicitly has an 'any' type. -tests/cases/compiler/implicitAnyAmbients.ts(7,5): error TS7010: 'f2', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyAmbients.ts(7,14): error TS7010: 'f2', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyAmbients.ts(11,9): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyAmbients.ts(12,9): error TS7010: 'foo2', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyAmbients.ts(17,9): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. @@ -18,12 +18,12 @@ tests/cases/compiler/implicitAnyAmbients.ts(23,13): error TS7005: Variable 'y' i var y: any; function f(x); // error - ~~~~~~~~~~~~~~ + ~ !!! error TS7010: 'f', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'x' implicitly has an 'any' type. function f2(x: any); // error - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS7010: 'f2', which lacks return-type annotation, implicitly has an 'any' return type. function f3(x: any): any; diff --git a/tests/baselines/reference/implicitAnyCastedValue.errors.txt b/tests/baselines/reference/implicitAnyCastedValue.errors.txt index 613aa4820d2..773fb2ed94e 100644 --- a/tests/baselines/reference/implicitAnyCastedValue.errors.txt +++ b/tests/baselines/reference/implicitAnyCastedValue.errors.txt @@ -4,7 +4,7 @@ tests/cases/compiler/implicitAnyCastedValue.ts(12,16): error TS1056: Accessors a tests/cases/compiler/implicitAnyCastedValue.ts(26,5): error TS7008: Member 'getValue' implicitly has an 'any' type. tests/cases/compiler/implicitAnyCastedValue.ts(28,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/implicitAnyCastedValue.ts(32,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/implicitAnyCastedValue.ts(41,1): error TS7010: 'notCastedNull', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyCastedValue.ts(41,10): error TS7010: 'notCastedNull', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyCastedValue.ts(53,24): error TS7006: Parameter 'x' implicitly has an 'any' type. tests/cases/compiler/implicitAnyCastedValue.ts(62,24): error TS7006: Parameter 'x' implicitly has an 'any' type. @@ -63,12 +63,10 @@ tests/cases/compiler/implicitAnyCastedValue.ts(62,24): error TS7006: Parameter ' } function notCastedNull() { - ~~~~~~~~~~~~~~~~~~~~~~~~~~ - return null; // this should be an error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~ + ~~~~~~~~~~~~~ !!! error TS7010: 'notCastedNull', which lacks return-type annotation, implicitly has an 'any' return type. + return null; // this should be an error + } function returnTypeBar(): any { return null; // this should not be an error diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.errors.txt b/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.errors.txt index 34aa58c4199..bc2a9437e4a 100644 --- a/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.errors.txt +++ b/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.errors.txt @@ -2,9 +2,9 @@ tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(2,15): e tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(3,15): error TS7006: Parameter 'll1' implicitly has an 'any' type. tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(4,33): error TS7006: Parameter 'myParam' implicitly has an 'any' type. tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(5,14): error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type. -tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(8,15): error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(8,24): error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(9,15): error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type. -tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(10,15): error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(10,24): error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(11,15): error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type. @@ -25,13 +25,13 @@ tests/cases/compiler/implicitAnyDeclareFunctionExprWithoutFormalType.ts(11,15): // these should be error for implicit any return type var lambda5 = function temp() { return null; } - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. var lambda6 = () => { return null; } ~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type. var lambda7 = function temp() { return undefined; } - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS7010: 'temp', which lacks return-type annotation, implicitly has an 'any' return type. var lambda8 = () => { return undefined; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt b/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt index 7b80d6405c9..18292c635e6 100644 --- a/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt +++ b/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt @@ -36,12 +36,10 @@ tests/cases/compiler/implicitAnyFromCircularInference.ts(46,5): error TS7023: 'x // Error expected var f1 = function () { - ~~~~~~~~~~~~~ - return f1(); - ~~~~~~~~~~~~~~~~ - }; - ~ + ~~~~~~~~ !!! error TS7024: Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions. + return f1(); + }; // Error expected var f2 = () => f2(); diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt index de1c57dd797..9ad1c550d72 100644 --- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt +++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(2,1): error TS7010: 'nullWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. -tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(3,1): error TS7010: 'undefinedWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(2,10): error TS7010: 'nullWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(3,10): error TS7010: 'undefinedWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(6,5): error TS7010: 'nullWidenFuncOfC', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(10,5): error TS7010: 'underfinedWidenFuncOfC', which lacks return-type annotation, implicitly has an 'any' return type. @@ -7,10 +7,10 @@ tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(10,5): error TS ==== tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts (4 errors) ==== // this should be an error function nullWidenFunction() { return null;} // error at "nullWidenFunction" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~ !!! error TS7010: 'nullWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. function undefinedWidenFunction() { return undefined; } // error at "undefinedWidenFunction" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7010: 'undefinedWidenFunction', which lacks return-type annotation, implicitly has an 'any' return type. class C { diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt index 260dc6c9899..11f2ae90d35 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(1,1): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(1,18): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. 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. @@ -10,7 +10,7 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006: ==== tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts (8 errors) ==== declare function foo(x); // this should be an error - ~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS7010: 'foo', 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/inferredFunctionReturnTypeIsEmptyType.errors.txt b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt index 915e75dd6da..99819ecad2c 100644 --- a/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt +++ b/tests/baselines/reference/inferredFunctionReturnTypeIsEmptyType.errors.txt @@ -1,22 +1,15 @@ -tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts(1,1): error TS2354: No best common type exists among return expressions. +tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts(1,10): error TS2354: No best common type exists among return expressions. ==== tests/cases/compiler/inferredFunctionReturnTypeIsEmptyType.ts (1 errors) ==== function foo() { - ~~~~~~~~~~~~~~~~ - if (true) { - ~~~~~~~~~~~~~~~ - return 42; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - else { - ~~~~~~~~~~ - return "42"; - ~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ - }; - ~ + ~~~ !!! error TS2354: No best common type exists among return expressions. + if (true) { + return 42; + } + else { + return "42"; + } + }; \ No newline at end of file diff --git a/tests/baselines/reference/noImplicitAnyFunctions.errors.txt b/tests/baselines/reference/noImplicitAnyFunctions.errors.txt index 622dd953150..158690deef0 100644 --- a/tests/baselines/reference/noImplicitAnyFunctions.errors.txt +++ b/tests/baselines/reference/noImplicitAnyFunctions.errors.txt @@ -1,14 +1,14 @@ -tests/cases/compiler/noImplicitAnyFunctions.ts(2,1): error TS7010: 'f1', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyFunctions.ts(2,18): error TS7010: 'f1', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyFunctions.ts(6,13): error TS7006: Parameter 'x' implicitly has an 'any' type. -tests/cases/compiler/noImplicitAnyFunctions.ts(17,1): error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. -tests/cases/compiler/noImplicitAnyFunctions.ts(19,1): error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyFunctions.ts(17,10): error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyFunctions.ts(19,10): error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyFunctions.ts(19,24): error TS7006: Parameter 'y' implicitly has an 'any' type. ==== tests/cases/compiler/noImplicitAnyFunctions.ts (5 errors) ==== declare function f1(); - ~~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS7010: 'f1', which lacks return-type annotation, implicitly has an 'any' return type. declare function f2(): any; @@ -27,15 +27,13 @@ tests/cases/compiler/noImplicitAnyFunctions.ts(19,24): error TS7006: Parameter ' } function f6(x: string, y: number); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. function f6(x: string, y: string): any; function f6(x: string, y) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~ +!!! error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'y' implicitly has an 'any' type. return null; - ~~~~~~~~~~~~~~~~ - } - ~ -!!! error TS7010: 'f6', which lacks return-type annotation, implicitly has an 'any' return type. \ No newline at end of file + } \ No newline at end of file diff --git a/tests/baselines/reference/noImplicitAnyModule.errors.txt b/tests/baselines/reference/noImplicitAnyModule.errors.txt index ec1af2346cc..cb2dfbe5793 100644 --- a/tests/baselines/reference/noImplicitAnyModule.errors.txt +++ b/tests/baselines/reference/noImplicitAnyModule.errors.txt @@ -1,7 +1,7 @@ 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(18,5): error TS7010: 'f', 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. ==== tests/cases/compiler/noImplicitAnyModule.ts (4 errors) ==== @@ -29,7 +29,7 @@ tests/cases/compiler/noImplicitAnyModule.ts(18,5): error TS7010: 'f', which lack // Should return error for implicit any on return type. function f(x: number); - ~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS7010: 'f', which lacks return-type annotation, implicitly has an 'any' return type. } \ No newline at end of file diff --git a/tests/baselines/reference/noImplicitAnyWithOverloads.errors.txt b/tests/baselines/reference/noImplicitAnyWithOverloads.errors.txt index 21845261f35..806cfd39a34 100644 --- a/tests/baselines/reference/noImplicitAnyWithOverloads.errors.txt +++ b/tests/baselines/reference/noImplicitAnyWithOverloads.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/noImplicitAnyWithOverloads.ts(2,5): error TS7008: Member 'foo' implicitly has an 'any' type. -tests/cases/compiler/noImplicitAnyWithOverloads.ts(6,1): error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. -tests/cases/compiler/noImplicitAnyWithOverloads.ts(7,1): error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyWithOverloads.ts(6,10): error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyWithOverloads.ts(7,10): error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyWithOverloads.ts(8,16): error TS7006: Parameter 'a' implicitly has an 'any' type. @@ -13,10 +13,10 @@ tests/cases/compiler/noImplicitAnyWithOverloads.ts(8,16): error TS7006: Paramete interface B { } function callb(lam: (l: A) => void); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~ !!! error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. function callb(lam: (n: B) => void); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~ !!! error TS7010: 'callb', which lacks return-type annotation, implicitly has an 'any' return type. function callb(a) { } ~ diff --git a/tests/baselines/reference/overloadAssignmentCompat.errors.txt b/tests/baselines/reference/overloadAssignmentCompat.errors.txt index aa25558203b..446f9ce614f 100644 --- a/tests/baselines/reference/overloadAssignmentCompat.errors.txt +++ b/tests/baselines/reference/overloadAssignmentCompat.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/overloadAssignmentCompat.ts(35,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/overloadAssignmentCompat.ts(35,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/overloadAssignmentCompat.ts (1 errors) ==== @@ -37,7 +37,7 @@ tests/cases/compiler/overloadAssignmentCompat.ts(35,1): error TS2394: Overload s // error - signatures are not assignment compatible function foo():number; - ~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. function foo():string { return "a" }; diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt b/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt index 9ac9e2253f0..7a8037b3dd7 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/overloadOnConstConstraintChecks4.ts(9,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/overloadOnConstConstraintChecks4.ts(9,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/overloadOnConstConstraintChecks4.ts (1 errors) ==== @@ -11,7 +11,7 @@ tests/cases/compiler/overloadOnConstConstraintChecks4.ts(9,1): error TS2394: Ove 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; diff --git a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt index 4714c06ee73..0f5126b5920 100644 --- a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt +++ b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt @@ -1,13 +1,13 @@ -tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(1,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(2,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(1,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. ==== tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts (2 errors) ==== function foo(a: 'hi', x: string); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(a: 'hi', x: string); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(a: any, x: any) { } diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt index bfdb66aa437..1676a2fb426 100644 --- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt +++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(7,1): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(7,10): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type 'string' is not assignable to parameter of type '"SPAN"'. @@ -10,15 +10,13 @@ tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: class Derived3 extends Base { biz() { } } function foo(name: "SPAN"): Derived1; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(name: "DIV"): Derived2 { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - return null; - ~~~~~~~~~~~~~~~~ - } - ~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. + return null; + } foo("HI"); ~~~~ diff --git a/tests/baselines/reference/overloadingOnConstants2.errors.txt b/tests/baselines/reference/overloadingOnConstants2.errors.txt index 1d7d2c8ecab..c6d63523576 100644 --- a/tests/baselines/reference/overloadingOnConstants2.errors.txt +++ b/tests/baselines/reference/overloadingOnConstants2.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/overloadingOnConstants2.ts(8,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstants2.ts(9,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstants2.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstants2.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type 'string' is not assignable to parameter of type '"bye"'. -tests/cases/compiler/overloadingOnConstants2.ts(19,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. ==== tests/cases/compiler/overloadingOnConstants2.ts (4 errors) ==== @@ -13,10 +13,10 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,1): error TS2382: Specialized private y = 1; } function foo(x: "hi", items: string[]): D; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: "bye", items: string[]): E; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: string, items: string[]): C { return null; @@ -30,7 +30,7 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,1): error TS2382: Specialized //function bar(x: "hi", items: string[]): D; function bar(x: "bye", items: string[]): E; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function bar(x: string, items: string[]): C; function bar(x: string, items: string[]): C { diff --git a/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt b/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt index e3a8bb08628..19afdb26806 100644 --- a/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt +++ b/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt @@ -1,17 +1,16 @@ -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(1,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(2,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(3,1): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/compiler/overloadingOnConstantsInImplementation.ts(1,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstantsInImplementation.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstantsInImplementation.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. ==== tests/cases/compiler/overloadingOnConstantsInImplementation.ts (3 errors) ==== function foo(a: 'hi', x: string); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(a: 'hi', x: string); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(a: 'hi', x: any) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. \ No newline at end of file + ~~~ +!!! 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/parserArgumentList1.errors.txt b/tests/baselines/reference/parserArgumentList1.errors.txt index 5146650dbff..f20b47fa964 100644 --- a/tests/baselines/reference/parserArgumentList1.errors.txt +++ b/tests/baselines/reference/parserArgumentList1.errors.txt @@ -1,21 +1,17 @@ -tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. +tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided. tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,35): error TS2304: Cannot find name 'HTMLElement'. tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(2,42): error TS2304: Cannot find name '_classNameRegexp'. ==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (3 errors) ==== export function removeClass (node:HTMLElement, className:string) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~ +!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. ~~~~~~~~~~~ !!! error TS2304: Cannot find name 'HTMLElement'. node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name '_classNameRegexp'. return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : ''; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ }); - ~~~~ - } - ~ -!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file + } \ No newline at end of file diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt index 5fa104a0e83..1530281b36b 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt +++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt @@ -1,15 +1,13 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. +tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided. tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(2,4): error TS1184: Modifiers cannot appear here. ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (2 errors) ==== export function foo() { - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ +!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. export var x = this; - ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ !!! error TS1184: Modifiers cannot appear here. } - ~ -!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt index 5bc5a49670e..cff0ba1d50d 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt +++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt @@ -1,17 +1,14 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided. +tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided. tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(2,4): error TS1184: Modifiers cannot appear here. ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (2 errors) ==== export function foo() { - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ +!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. export function bar() { - ~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ !!! error TS1184: Modifiers cannot appear here. } - ~~~~ } - ~ -!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file diff --git a/tests/baselines/reference/parserParameterList15.errors.txt b/tests/baselines/reference/parserParameterList15.errors.txt index 0b062ee6ee1..7a1a8af9093 100644 --- a/tests/baselines/reference/parserParameterList15.errors.txt +++ b/tests/baselines/reference/parserParameterList15.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts(1,14): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. ==== tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList15.ts (2 errors) ==== function 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/parserUnaryExpression2.errors.txt b/tests/baselines/reference/parserUnaryExpression2.errors.txt index 39ebc7eef82..4f9c67a16f3 100644 --- a/tests/baselines/reference/parserUnaryExpression2.errors.txt +++ b/tests/baselines/reference/parserUnaryExpression2.errors.txt @@ -3,5 +3,5 @@ tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts ==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts (1 errors) ==== ++function(e) { } - ~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. \ No newline at end of file diff --git a/tests/baselines/reference/recursiveFunctionTypes.errors.txt b/tests/baselines/reference/recursiveFunctionTypes.errors.txt index 30f6c7aa41f..c69549403c4 100644 --- a/tests/baselines/reference/recursiveFunctionTypes.errors.txt +++ b/tests/baselines/reference/recursiveFunctionTypes.errors.txt @@ -7,7 +7,7 @@ tests/cases/compiler/recursiveFunctionTypes.ts(12,16): error TS2355: A function tests/cases/compiler/recursiveFunctionTypes.ts(17,5): error TS2322: Type '() => I' is not assignable to type 'number'. tests/cases/compiler/recursiveFunctionTypes.ts(22,5): error TS2345: Argument of type 'number' is not assignable to parameter of type '(t: typeof g) => void'. tests/cases/compiler/recursiveFunctionTypes.ts(25,1): error TS2322: Type 'number' is not assignable to type '() => any'. -tests/cases/compiler/recursiveFunctionTypes.ts(30,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/recursiveFunctionTypes.ts(30,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/compiler/recursiveFunctionTypes.ts(33,1): error TS2346: Supplied parameters do not match any signature of call target. tests/cases/compiler/recursiveFunctionTypes.ts(34,4): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ (): typeof f6; (a: typeof f6): () => number; }'. tests/cases/compiler/recursiveFunctionTypes.ts(42,1): error TS2346: Supplied parameters do not match any signature of call target. @@ -62,7 +62,7 @@ tests/cases/compiler/recursiveFunctionTypes.ts(43,4): error TS2345: Argument of function f6(): typeof f6; function f6(a: typeof f6): () => number; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2394: Overload signature is not compatible with function implementation. function f6(a?: any) { return f6; } diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt b/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt index e7272aeaf8e..0e67cc37f32 100644 --- a/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt +++ b/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt @@ -1,19 +1,19 @@ -tests/cases/compiler/specializedOverloadWithRestParameters.ts(3,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/specializedOverloadWithRestParameters.ts(8,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/specializedOverloadWithRestParameters.ts(3,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/specializedOverloadWithRestParameters.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. ==== tests/cases/compiler/specializedOverloadWithRestParameters.ts (2 errors) ==== class Base { foo() { } } class Derived1 extends Base { bar() { } } function f(tagName: 'span', ...args): Derived1; // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f(tagName: number, ...args): Base; function f(tagName: any): Base { return null; } function g(tagName: 'span', arg): Derived1; // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function g(tagName: number, arg): Base; function g(tagName: any): Base { diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt index f5883a17d7e..6b705a0c34d 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(4,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(8,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(14,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(20,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -17,7 +17,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignat // All the below should be errors function foo(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: number) { } diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt index d9e01d9ccc8..b82fa1c93ee 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(22,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(26,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(30,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(34,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(38,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(76,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(89,1): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(22,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(26,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(30,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(34,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +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(76,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(89,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(93,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(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. @@ -36,31 +36,31 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite function f4(x: any) { } function f5(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f5(x: number); function f5(x: any) { } function f6(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f6(x: boolean); function f6(x: any) { } function f7(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f7(x: Date); function f7(x: any) { } function f8(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f8(x: RegExp); function f8(x: any) { } function f9(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f9(x: () => {}); function f9(x: any) { } @@ -100,7 +100,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite // BUG 831846 function f11(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f11(x: I); function f11(x: any) { } @@ -115,7 +115,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite enum E { A } function f14(x: 'a'); - ~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function f14(x: E); function f14(x: any) { } diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt index a2404ac6482..b89553fcf5b 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt @@ -1,5 +1,5 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(3,1): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(4,9): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(4,18): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(5,10): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(8,5): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(12,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -7,7 +7,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(17,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(18,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(22,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(23,8): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(23,17): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(24,8): error TS2381: A signature with an implementation cannot use a string literal type. @@ -15,10 +15,10 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType // String literal types are only valid in overload signatures function foo(x: 'hi') { } - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. var f = function foo(x: 'hi') { } - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. var f2 = (x: 'hi', y: 'hi') => { } ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -53,7 +53,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType ~~~~~~~~~~~~~~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. a: function foo(x: 'hi', y: 'hi') { }, - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. b: (x: 'hi') => { } ~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt index 3cc172c96d5..8d296e68a17 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(4,1): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(4,10): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(8,5): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(12,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(13,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -19,7 +19,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType function foo(x: any); function foo(x: 'hi') { } - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. class C { diff --git a/tests/baselines/reference/targetTypeVoidFunc.errors.txt b/tests/baselines/reference/targetTypeVoidFunc.errors.txt index 14c3cb37c3a..f9434c1d630 100644 --- a/tests/baselines/reference/targetTypeVoidFunc.errors.txt +++ b/tests/baselines/reference/targetTypeVoidFunc.errors.txt @@ -4,7 +4,7 @@ tests/cases/compiler/targetTypeVoidFunc.ts(2,12): error TS2322: Type '() => void ==== tests/cases/compiler/targetTypeVoidFunc.ts (1 errors) ==== function f1(): { new (): number; } { return function () { return; } - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~ !!! error TS2322: Type '() => void' is not assignable to type 'new () => number'. }; diff --git a/tests/baselines/reference/templateStringInFunctionParameterType.errors.txt b/tests/baselines/reference/templateStringInFunctionParameterType.errors.txt index 1f93a38e19f..e523b4c2dcb 100644 --- a/tests/baselines/reference/templateStringInFunctionParameterType.errors.txt +++ b/tests/baselines/reference/templateStringInFunctionParameterType.errors.txt @@ -1,15 +1,15 @@ -tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts(1,12): error TS1138: Parameter declaration expected. tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts(1,19): error TS1005: ';' expected. ==== tests/cases/conformance/es6/templates/templateStringInFunctionParameterType.ts (4 errors) ==== function f(`hello`); - ~~~~~~~~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. ~ !!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS2394: Overload signature is not compatible with function implementation. ~~~~~~~ !!! error TS1138: Parameter declaration expected. ~ diff --git a/tests/baselines/reference/templateStringInFunctionParameterTypeES6.errors.txt b/tests/baselines/reference/templateStringInFunctionParameterTypeES6.errors.txt index af911f07e73..be9c3556caf 100644 --- a/tests/baselines/reference/templateStringInFunctionParameterTypeES6.errors.txt +++ b/tests/baselines/reference/templateStringInFunctionParameterTypeES6.errors.txt @@ -1,15 +1,15 @@ -tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts(1,12): error TS1138: Parameter declaration expected. tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts(1,19): error TS1005: ';' expected. ==== tests/cases/conformance/es6/templates/templateStringInFunctionParameterTypeES6.ts (4 errors) ==== function f(`hello`); - ~~~~~~~~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. ~ !!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS2394: Overload signature is not compatible with function implementation. ~~~~~~~ !!! error TS1138: Parameter declaration expected. ~ diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt b/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt index 76d158f7dee..aa61a114145 100644 --- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt +++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/voidAsNonAmbiguousReturnType_0.ts(1,1): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/voidAsNonAmbiguousReturnType_0.ts(1,17): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/compiler/voidAsNonAmbiguousReturnType_1.ts (0 errors) ==== @@ -11,7 +11,7 @@ tests/cases/compiler/voidAsNonAmbiguousReturnType_0.ts(1,1): error TS2394: Overl ==== tests/cases/compiler/voidAsNonAmbiguousReturnType_0.ts (1 errors) ==== export function mkdirSync(path: string, mode?: number): void; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~ !!! error TS2394: Overload signature is not compatible with function implementation. export function mkdirSync(path: string, mode?: string): void {} \ No newline at end of file diff --git a/tests/cases/compiler/functionWithNoBestCommonType1.ts b/tests/cases/compiler/functionWithNoBestCommonType1.ts new file mode 100644 index 00000000000..11628812925 --- /dev/null +++ b/tests/cases/compiler/functionWithNoBestCommonType1.ts @@ -0,0 +1,7 @@ +function foo() { + return true; + return bar(); +} + +function bar(): void { +} \ No newline at end of file diff --git a/tests/cases/compiler/functionWithNoBestCommonType2.ts b/tests/cases/compiler/functionWithNoBestCommonType2.ts new file mode 100644 index 00000000000..974ccdfe035 --- /dev/null +++ b/tests/cases/compiler/functionWithNoBestCommonType2.ts @@ -0,0 +1,7 @@ +var v = function () { + return true; + return bar(); +}; + +function bar(): void { +} \ No newline at end of file From d367c96df6ea716d8e4f3b1a8485d99da3a7abd3 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Wed, 4 Mar 2015 18:37:50 -0800 Subject: [PATCH 025/251] CR feedback. --- src/compiler/utilities.ts | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index f2687a151af..30eda5efd23 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -236,10 +236,6 @@ module ts { }; } - interface FileTextRange extends TextRange { - sourceFile: SourceFile; - } - /* @internal */ export function getSpanOfTokenAtPosition(sourceFile: SourceFile, pos: number): TextSpan { var scanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.text); @@ -250,7 +246,7 @@ module ts { } export function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan { - var errorNode: Node; + var errorNode = node; switch (node.kind) { // This list is a work in progress. Add missing node kinds to improve their error // spans. @@ -267,24 +263,12 @@ module ts { break; } - if (node.kind === SyntaxKind.FunctionExpression) { - var functionExpression = node; - if (nodeIsMissing(functionExpression.name)) { - // If it's an anonymous function expression, put the error on the first token. - return getSpanOfTokenAtPosition(sourceFile, node.pos); - } - else { - errorNode = functionExpression.name; - } + if (errorNode === undefined) { + // If we don't have a better node, then just set the error on the first token of + // construct. + return getSpanOfTokenAtPosition(sourceFile, node.pos); } - // We now have the ideal error span, but it may be a node that is optional and absent - // (e.g. the name of a function expression), in which case errorSpan will be undefined. - // Alternatively, it might be required and missing (e.g. the name of a module), in which - // case its pos will equal its end (length 0). In either of these cases, we should fall - // back to the original node that the error was issued on. - errorNode = nodeIsMissing(errorNode) ? node : errorNode; - var pos = nodeIsMissing(errorNode) ? errorNode.pos : skipTrivia(sourceFile.text, errorNode.pos); From e417e1dacc015ecc320c80146c738b5d9d1a72bc Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 11:43:32 -0800 Subject: [PATCH 026/251] Emit 'for...of' loop when LHS is a var --- src/compiler/emitter.ts | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index b1dcbfbcd95..f3d1338d959 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3444,6 +3444,10 @@ module ts { } function emitForInOrForOfStatement(node: ForInStatement | ForOfStatement) { + if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.ForOfStatement) { + return emitDownLevelForOfStatement(node); + } + var endPos = emitToken(SyntaxKind.ForKeyword, node.pos); write(" "); endPos = emitToken(SyntaxKind.OpenParenToken, endPos); @@ -3470,6 +3474,97 @@ module ts { emitToken(SyntaxKind.CloseParenToken, node.expression.end); emitEmbeddedStatement(node.statement); } + + function emitDownLevelForOfStatement(node: ForOfStatement) { + // The following ES6 code: + // + // for (var v of expr) { } + // + // should be emitted as + // + // for (var v, _i = 0, _a = expr; _i < _a.length; _i++) { + // v = _a[_i]; + // } + // + // where _a and _i are temps emitted to capture the RHS and the counter, + // respectively. + // When the left hand side is an expression instead of a var declaration, + // the "var v" is not emitted. + // When the left hand side is a let/const, the v is renamed if there is + // another v in scope. + // Note that all assignments to the LHS are emitted in the body, including + // all destructuring. + // Note also that because an extra statement is needed to assign to the LHS, + // for-of bodies are always emitted as blocks. + + var endPos = emitToken(SyntaxKind.ForKeyword, node.pos); + write(" "); + endPos = emitToken(SyntaxKind.OpenParenToken, endPos); + if (node.initializer.kind === SyntaxKind.VariableDeclarationList) { + var variableDeclarationList = node.initializer; + if (variableDeclarationList.declarations.length >= 1) { + write("var "); + var decl = variableDeclarationList.declarations[0]; + // TODO handle binding patterns + emit(decl.name); + write(", "); + } + } + + // Do not call create recordTempDeclaration because we are declaring the temps + // right here. Recording means they will be declared later. + var counter = createTempVariable(node, /*forLoopVariable*/ true); + var rhsReference = createTempVariable(node, /*forLoopVariable*/ false); + + // _i = 0, + emit(counter); + write(" = 0, "); + + // _a = expr; + emit(rhsReference); + write(" = "); + emit(node.expression); + write("; "); + + // _i < _a.length; + emit(counter); + write(" < "); + emit(rhsReference); + write(".length; "); + + // _i++) + emit(counter); + write("++"); + emitToken(SyntaxKind.CloseParenToken, node.expression.end); + + // Body + write(" {"); + writeLine(); + increaseIndent(); + + // Initialize LHS + // v = _a[_i]; + if (decl) { + emit(decl.name); + write(" = "); + emit(rhsReference) + write("["); + emit(counter); + write("];"); + writeLine(); + } + + if (node.statement.kind === SyntaxKind.Block) { + emitLines((node.statement).statements); + } + else { + emit(node.statement); + } + + writeLine(); + decreaseIndent(); + write("}"); + } function emitBreakOrContinueStatement(node: BreakOrContinueStatement) { emitToken(node.kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword, node.pos); From 76e9b6ab0e0423a85e6b1f79d1122e6994f38f0b Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 14:01:11 -0800 Subject: [PATCH 027/251] Make createTempVariable call into generateUniqueNameForLocation --- src/compiler/emitter.ts | 10 +- tests/baselines/reference/callWithSpread.js | 6 +- .../collisionRestParameterArrowFunctions.js | 8 +- .../collisionRestParameterClassConstructor.js | 16 ++-- .../collisionRestParameterClassMethod.js | 12 +-- .../collisionRestParameterFunction.js | 12 +-- ...llisionRestParameterFunctionExpressions.js | 12 +-- .../collisionRestParameterUnderscoreIUsage.js | 4 +- .../reference/computedPropertyNames48_ES5.js | 14 +-- .../reference/declarationWithNoInitializer.js | 2 +- .../reference/declarationsAndAssignments.js | 92 +++++++++---------- .../destructuringParameterProperties1.js | 2 +- .../destructuringParameterProperties2.js | 4 +- .../destructuringParameterProperties3.js | 6 +- .../destructuringParameterProperties5.js | 2 +- .../reference/restElementMustBeLast.js | 4 +- .../restElementWithNullInitializer.js | 8 +- ...gedTemplateStringsTypeArgumentInference.js | 56 +++++------ ...emplateStringsWithIncompatibleTypedTags.js | 18 ++-- ...dTemplateStringsWithOverloadResolution1.js | 12 +-- ...dTemplateStringsWithOverloadResolution2.js | 4 +- ...dTemplateStringsWithOverloadResolution3.js | 44 ++++----- ...taggedTemplateStringsWithTagsTypedAsAny.js | 20 ++-- .../taggedTemplateStringsWithTypedTags.js | 16 ++-- .../reference/templateStringInModuleName.js | 4 +- 25 files changed, 190 insertions(+), 198 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f3d1338d959..9ecc936e3c2 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2090,15 +2090,7 @@ module ts { // Create a temporary variable with a unique unused name. The forLoopVariable parameter signals that the // name should be one that is appropriate for a for loop variable. function createTempVariable(location: Node, forLoopVariable?: boolean): Identifier { - var name = forLoopVariable ? "_i" : undefined; - while (true) { - if (name && !isExistingName(location, name)) { - break; - } - // _a .. _h, _j ... _z, _0, _1, ... - name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + CharacterCodes.a) : tempCount - 25); - tempCount++; - } + var name = generateUniqueNameForLocation(location, /*baseName*/ forLoopVariable ? "_i" : "_a"); var result = createSynthesizedNode(SyntaxKind.Identifier); result.text = name; return result; diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js index d676c0f2a33..02b6b9b8ff6 100644 --- a/tests/baselines/reference/callWithSpread.js +++ b/tests/baselines/reference/callWithSpread.js @@ -81,8 +81,8 @@ obj.foo.apply(obj, [1, 2].concat(a)); obj.foo.apply(obj, [1, 2].concat(a, ["abc"])); xa[1].foo(1, 2, "abc"); (_a = xa[1]).foo.apply(_a, [1, 2].concat(a)); -(_b = xa[1]).foo.apply(_b, [1, 2].concat(a, ["abc"])); -(_c = xa[1]).foo.apply(_c, [1, 2, "abc"]); +(_a_1 = xa[1]).foo.apply(_a_1, [1, 2].concat(a, ["abc"])); +(_a_2 = xa[1]).foo.apply(_a_2, [1, 2, "abc"]); var C = (function () { function C(x, y) { var z = []; @@ -114,4 +114,4 @@ var D = (function (_super) { })(C); // Only supported in when target is ES6 var c = new C(1, 2, ...a); -var _a, _b, _c; +var _a, _a_1, _a_2; diff --git a/tests/baselines/reference/collisionRestParameterArrowFunctions.js b/tests/baselines/reference/collisionRestParameterArrowFunctions.js index 39d449555db..b70bb6c2113 100644 --- a/tests/baselines/reference/collisionRestParameterArrowFunctions.js +++ b/tests/baselines/reference/collisionRestParameterArrowFunctions.js @@ -16,8 +16,8 @@ var f2NoError = () => { //// [collisionRestParameterArrowFunctions.js] var f1 = function (_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } var _i = 10; // no error }; @@ -26,8 +26,8 @@ var f1NoError = function (_i) { }; var f2 = function () { var restParameters = []; - for (var _a = 0; _a < arguments.length; _a++) { - restParameters[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 0] = arguments[_i_1]; } var _i = 10; // No Error }; diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js index fc6e400668c..de3fd3c671b 100644 --- a/tests/baselines/reference/collisionRestParameterClassConstructor.js +++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js @@ -71,8 +71,8 @@ declare class c6NoError { var c1 = (function () { function c1(_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } var _i = 10; // no error } @@ -87,8 +87,8 @@ var c1NoError = (function () { var c2 = (function () { function c2() { var restParameters = []; - for (var _a = 0; _a < arguments.length; _a++) { - restParameters[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 0] = arguments[_i_1]; } var _i = 10; // no error } @@ -103,8 +103,8 @@ var c2NoError = (function () { var c3 = (function () { function c3(_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } this._i = _i; var _i = 10; // no error @@ -121,8 +121,8 @@ var c3NoError = (function () { var c5 = (function () { function c5(_i) { var rest = []; - for (var _a = 1; _a < arguments.length; _a++) { - rest[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + rest[_i_1 - 1] = arguments[_i_1]; } var _i; // no error } diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js index e3471c85f1c..3478dda615f 100644 --- a/tests/baselines/reference/collisionRestParameterClassMethod.js +++ b/tests/baselines/reference/collisionRestParameterClassMethod.js @@ -44,8 +44,8 @@ var c1 = (function () { } c1.prototype.foo = function (_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } var _i = 10; // no error }; @@ -54,8 +54,8 @@ var c1 = (function () { }; c1.prototype.f4 = function (_i) { var rest = []; - for (var _a = 1; _a < arguments.length; _a++) { - rest[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + rest[_i_1 - 1] = arguments[_i_1]; } var _i; // no error }; @@ -69,8 +69,8 @@ var c3 = (function () { } c3.prototype.foo = function () { var restParameters = []; - for (var _a = 0; _a < arguments.length; _a++) { - restParameters[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 0] = arguments[_i_1]; } var _i = 10; // no error }; diff --git a/tests/baselines/reference/collisionRestParameterFunction.js b/tests/baselines/reference/collisionRestParameterFunction.js index 8660e8f5db0..98c2b2296ee 100644 --- a/tests/baselines/reference/collisionRestParameterFunction.js +++ b/tests/baselines/reference/collisionRestParameterFunction.js @@ -37,8 +37,8 @@ declare function f6(_i: string); // no codegen no error // Functions function f1(_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } var _i = 10; // no error } @@ -47,8 +47,8 @@ function f1NoError(_i) { } function f3() { var restParameters = []; - for (var _a = 0; _a < arguments.length; _a++) { - restParameters[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 0] = arguments[_i_1]; } var _i = 10; // no error } @@ -57,8 +57,8 @@ function f3NoError() { } function f4(_i) { var rest = []; - for (var _a = 1; _a < arguments.length; _a++) { - rest[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + rest[_i_1 - 1] = arguments[_i_1]; } } function f4NoError(_i) { diff --git a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js index 22709b087eb..478446bd5e0 100644 --- a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js +++ b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js @@ -28,8 +28,8 @@ function foo() { function foo() { function f1(_i) { var restParameters = []; - for (var _a = 1; _a < arguments.length; _a++) { - restParameters[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 1] = arguments[_i_1]; } var _i = 10; // no error } @@ -38,8 +38,8 @@ function foo() { } function f3() { var restParameters = []; - for (var _a = 0; _a < arguments.length; _a++) { - restParameters[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + restParameters[_i_1 - 0] = arguments[_i_1]; } var _i = 10; // no error } @@ -48,8 +48,8 @@ function foo() { } function f4(_i) { var rest = []; - for (var _a = 1; _a < arguments.length; _a++) { - rest[_a - 1] = arguments[_a]; + for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { + rest[_i_1 - 1] = arguments[_i_1]; } } function f4NoError(_i) { diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js index adc9c09de27..9316dba316f 100644 --- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js +++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js @@ -13,8 +13,8 @@ var _i = "This is what I'd expect to see"; var Foo = (function () { function Foo() { var args = []; - for (var _a = 0; _a < arguments.length; _a++) { - args[_a - 0] = arguments[_a]; + for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { + args[_i_1 - 0] = arguments[_i_1]; } console.log(_i); // This should result in error } diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.js b/tests/baselines/reference/computedPropertyNames48_ES5.js index c5ca0d5b241..d14faab73eb 100644 --- a/tests/baselines/reference/computedPropertyNames48_ES5.js +++ b/tests/baselines/reference/computedPropertyNames48_ES5.js @@ -26,10 +26,10 @@ var a; extractIndexer((_a = {}, _a[a] = "", _a)); // Should return string -extractIndexer((_b = {}, - _b[0 /* x */] = "", - _b)); // Should return string -extractIndexer((_c = {}, - _c["" || 0] = "", - _c)); // Should return any (widened form of undefined) -var _a, _b, _c; +extractIndexer((_a_1 = {}, + _a_1[0 /* x */] = "", + _a_1)); // Should return string +extractIndexer((_a_2 = {}, + _a_2["" || 0] = "", + _a_2)); // Should return any (widened form of undefined) +var _a, _a_1, _a_2; diff --git a/tests/baselines/reference/declarationWithNoInitializer.js b/tests/baselines/reference/declarationWithNoInitializer.js index 54d89368fb1..ebe8f8b3b38 100644 --- a/tests/baselines/reference/declarationWithNoInitializer.js +++ b/tests/baselines/reference/declarationWithNoInitializer.js @@ -5,4 +5,4 @@ var {c, d}; // Error, no initializer //// [declarationWithNoInitializer.js] var _a = void 0, a = _a[0], b = _a[1]; // Error, no initializer -var _b = void 0, c = _b.c, d = _b.d; // Error, no initializer +var _a_1 = void 0, c = _a_1.c, d = _a_1.d; // Error, no initializer diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js index 032f4cb0e63..3e67309663c 100644 --- a/tests/baselines/reference/declarationsAndAssignments.js +++ b/tests/baselines/reference/declarationsAndAssignments.js @@ -184,9 +184,9 @@ function f21() { function f0() { var _a = [1, "hello"]; var x = ([1, "hello"])[0]; - var _b = [1, "hello"], x = _b[0], y = _b[1]; - var _c = [1, "hello"], x = _c[0], y = _c[1], z = _c[2]; // Error - var _d = [0, 1, 2], z = _d[2]; + var _a_1 = [1, "hello"], x = _a_1[0], y = _a_1[1]; + var _a_2 = [1, "hello"], x = _a_2[0], y = _a_2[1], z = _a_2[2]; // Error + var _a_3 = [0, 1, 2], z = _a_3[2]; var x; var y; } @@ -203,60 +203,60 @@ function f2() { var _a = { x: 5, y: "hello" }; var x = ({ x: 5, y: "hello" }).x; var y = ({ x: 5, y: "hello" }).y; - var _b = { x: 5, y: "hello" }, x = _b.x, y = _b.y; + var _a_1 = { x: 5, y: "hello" }, x = _a_1.x, y = _a_1.y; var x; var y; var a = ({ x: 5, y: "hello" }).x; var b = ({ x: 5, y: "hello" }).y; - var _c = { x: 5, y: "hello" }, a = _c.x, b = _c.y; + var _a_2 = { x: 5, y: "hello" }, a = _a_2.x, b = _a_2.y; var a; var b; } function f3() { - var _a = [1, ["hello", [true]]], x = _a[0], _b = _a[1], y = _b[0], z = _b[1][0]; + var _a = [1, ["hello", [true]]], x = _a[0], _a_1 = _a[1], y = _a_1[0], z = _a_1[1][0]; var x; var y; var z; } function f4() { - var _a = { a: 1, b: { a: "hello", b: { a: true } } }, x = _a.a, _b = _a.b, y = _b.a, z = _b.b.a; + var _a = { a: 1, b: { a: "hello", b: { a: true } } }, x = _a.a, _a_1 = _a.b, y = _a_1.a, z = _a_1.b.a; var x; var y; var z; } function f6() { - var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? "" : _c; + var _a = [1, "hello"], _a_1 = _a[0], x = _a_1 === void 0 ? 0 : _a_1, _a_2 = _a[1], y = _a_2 === void 0 ? "" : _a_2; var x; var y; } function f7() { - var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? 1 : _c; // Error, initializer for y must be string + var _a = [1, "hello"], _a_1 = _a[0], x = _a_1 === void 0 ? 0 : _a_1, _a_2 = _a[1], y = _a_2 === void 0 ? 1 : _a_2; // Error, initializer for y must be string var x; var y; } function f8() { var _a = [], a = _a[0], b = _a[1], c = _a[2]; // Ok, [] is an array - var _b = [1], d = _b[0], e = _b[1], f = _b[2]; // Error, [1] is a tuple + var _a_1 = [1], d = _a_1[0], e = _a_1[1], f = _a_1[2]; // Error, [1] is a tuple } function f9() { var _a = {}, a = _a[0], b = _a[1]; // Error, not array type - var _b = { 0: 10, 1: 20 }, c = _b[0], d = _b[1]; // Error, not array type - var _c = [10, 20], e = _c[0], f = _c[1]; + var _a_1 = { 0: 10, 1: 20 }, c = _a_1[0], d = _a_1[1]; // Error, not array type + var _a_2 = [10, 20], e = _a_2[0], f = _a_2[1]; } function f10() { var _a = {}, a = _a.a, b = _a.b; // Error - var _b = [], a = _b.a, b = _b.b; // Error + var _a_1 = [], a = _a_1.a, b = _a_1.b; // Error } function f11() { var _a = { x: 10, y: "hello" }, a = _a.x, b = _a.y; - var _b = { 0: 10, 1: "hello" }, a = _b[0], b = _b[1]; - var _c = { "<": 10, ">": "hello" }, a = _c["<"], b = _c[">"]; - var _d = [10, "hello"], a = _d[0], b = _d[1]; + var _a_1 = { 0: 10, 1: "hello" }, a = _a_1[0], b = _a_1[1]; + var _a_2 = { "<": 10, ">": "hello" }, a = _a_2["<"], b = _a_2[">"]; + var _a_3 = [10, "hello"], a = _a_3[0], b = _a_3[1]; var a; var b; } function f12() { - var _a = [1, ["hello", { x: 5, y: true }]], a = _a[0], _b = _a[1], _c = _b === void 0 ? ["abc", { x: 10, y: false }] : _b, b = _c[0], _d = _c[1], x = _d.x, c = _d.y; + var _a = [1, ["hello", { x: 5, y: true }]], a = _a[0], _a_1 = _a[1], _a_2 = _a_1 === void 0 ? ["abc", { x: 10, y: false }] : _a_1, b = _a_2[0], _a_3 = _a_2[1], x = _a_3.x, c = _a_3.y; var a; var b; var x; @@ -264,10 +264,10 @@ function f12() { } function f13() { var _a = [1, "hello"], x = _a[0], y = _a[1]; - var _b = [[x, y], { x: x, y: y }], a = _b[0], b = _b[1]; + var _a_1 = [[x, y], { x: x, y: y }], a = _a_1[0], b = _a_1[1]; } function f14(_a) { - var _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], _d = _c[0], b = _d === void 0 ? "hello" : _d, _e = _c[1], x = _e.x, _f = _e.y, c = _f === void 0 ? false : _f; + var _a_1 = _a[0], a = _a_1 === void 0 ? 1 : _a_1, _a_2 = _a[1], _a_3 = _a_2[0], b = _a_3 === void 0 ? "hello" : _a_3, _a_4 = _a_2[1], x = _a_4.x, _a_5 = _a_4.y, c = _a_5 === void 0 ? false : _a_5; var a; var b; var c; @@ -290,7 +290,7 @@ function f16() { var _a = f15(), a = _a.a, b = _a.b, c = _a.c; } function f17(_a) { - var _b = _a.a, a = _b === void 0 ? "" : _b, _c = _a.b, b = _c === void 0 ? 0 : _c, _d = _a.c, c = _d === void 0 ? false : _d; + var _a_1 = _a.a, a = _a_1 === void 0 ? "" : _a_1, _a_2 = _a.b, b = _a_2 === void 0 ? 0 : _a_2, _a_3 = _a.c, c = _a_3 === void 0 ? false : _a_3; } f17({}); f17({ a: "hello" }); @@ -301,20 +301,20 @@ function f18() { var b; var aa; (_a = { a: a, b: b }, a = _a.a, b = _a.b, _a); - (_b = { b: b, a: a }, a = _b.a, b = _b.b, _b); - _c = [a, b], aa[0] = _c[0], b = _c[1]; - _d = [b, a], a = _d[0], b = _d[1]; // Error - _e = [2, "def"], _f = _e[0], a = _f === void 0 ? 1 : _f, _g = _e[1], b = _g === void 0 ? "abc" : _g; - var _a, _b, _c, _d, _e, _f, _g; + (_a_1 = { b: b, a: a }, a = _a_1.a, b = _a_1.b, _a_1); + _a_2 = [a, b], aa[0] = _a_2[0], b = _a_2[1]; + _a_3 = [b, a], a = _a_3[0], b = _a_3[1]; // Error + _a_4 = [2, "def"], _a_5 = _a_4[0], a = _a_5 === void 0 ? 1 : _a_5, _a_6 = _a_4[1], b = _a_6 === void 0 ? "abc" : _a_6; + var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6; } function f19() { var a, b; _a = [1, 2], a = _a[0], b = _a[1]; - _b = [b, a], a = _b[0], b = _b[1]; - (_c = { b: b, a: a }, a = _c.a, b = _c.b, _c); - _d = ([[2, 3]])[0], _e = _d === void 0 ? [1, 2] : _d, a = _e[0], b = _e[1]; - var x = (_f = [1, 2], a = _f[0], b = _f[1], _f); - var _a, _b, _c, _d, _e, _f; + _a_1 = [b, a], a = _a_1[0], b = _a_1[1]; + (_a_2 = { b: b, a: a }, a = _a_2.a, b = _a_2.b, _a_2); + _a_3 = ([[2, 3]])[0], _a_4 = _a_3 === void 0 ? [1, 2] : _a_3, a = _a_4[0], b = _a_4[1]; + var x = (_a_5 = [1, 2], a = _a_5[0], b = _a_5[1], _a_5); + var _a, _a_1, _a_2, _a_3, _a_4, _a_5; } function f20() { var a; @@ -322,14 +322,14 @@ function f20() { var y; var z; var _a = [1, 2, 3], a = _a.slice(0); - var _b = [1, 2, 3], x = _b[0], a = _b.slice(1); - var _c = [1, 2, 3], x = _c[0], y = _c[1], a = _c.slice(2); - var _d = [1, 2, 3], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); - _e = [1, 2, 3], a = _e.slice(0); - _f = [1, 2, 3], x = _f[0], a = _f.slice(1); - _g = [1, 2, 3], x = _g[0], y = _g[1], a = _g.slice(2); - _h = [1, 2, 3], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); - var _e, _f, _g, _h; + var _a_1 = [1, 2, 3], x = _a_1[0], a = _a_1.slice(1); + var _a_2 = [1, 2, 3], x = _a_2[0], y = _a_2[1], a = _a_2.slice(2); + var _a_3 = [1, 2, 3], x = _a_3[0], y = _a_3[1], z = _a_3[2], a = _a_3.slice(3); + _a_4 = [1, 2, 3], a = _a_4.slice(0); + _a_5 = [1, 2, 3], x = _a_5[0], a = _a_5.slice(1); + _a_6 = [1, 2, 3], x = _a_6[0], y = _a_6[1], a = _a_6.slice(2); + _a_7 = [1, 2, 3], x = _a_7[0], y = _a_7[1], z = _a_7[2], a = _a_7.slice(3); + var _a_4, _a_5, _a_6, _a_7; } function f21() { var a; @@ -337,12 +337,12 @@ function f21() { var y; var z; var _a = [1, "hello", true], a = _a.slice(0); - var _b = [1, "hello", true], x = _b[0], a = _b.slice(1); - var _c = [1, "hello", true], x = _c[0], y = _c[1], a = _c.slice(2); - var _d = [1, "hello", true], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); - _e = [1, "hello", true], a = _e.slice(0); - _f = [1, "hello", true], x = _f[0], a = _f.slice(1); - _g = [1, "hello", true], x = _g[0], y = _g[1], a = _g.slice(2); - _h = [1, "hello", true], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); - var _e, _f, _g, _h; + var _a_1 = [1, "hello", true], x = _a_1[0], a = _a_1.slice(1); + var _a_2 = [1, "hello", true], x = _a_2[0], y = _a_2[1], a = _a_2.slice(2); + var _a_3 = [1, "hello", true], x = _a_3[0], y = _a_3[1], z = _a_3[2], a = _a_3.slice(3); + _a_4 = [1, "hello", true], a = _a_4.slice(0); + _a_5 = [1, "hello", true], x = _a_5[0], a = _a_5.slice(1); + _a_6 = [1, "hello", true], x = _a_6[0], y = _a_6[1], a = _a_6.slice(2); + _a_7 = [1, "hello", true], x = _a_7[0], y = _a_7[1], z = _a_7[2], a = _a_7.slice(3); + var _a_4, _a_5, _a_6, _a_7; } diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js index cc16cc78de5..5842d68b605 100644 --- a/tests/baselines/reference/destructuringParameterProperties1.js +++ b/tests/baselines/reference/destructuringParameterProperties1.js @@ -58,4 +58,4 @@ var c2 = new C2(["10", 10, !!10]); var _a = [c2.x, c2.y, c2.z], c2_x = _a[0], c2_y = _a[1], c2_z = _a[2]; var c3 = new C3({ x: 0, y: "", z: false }); c3 = new C3({ x: 0, "y": "y", z: true }); -var _b = [c3.x, c3.y, c3.z], c3_x = _b[0], c3_y = _b[1], c3_z = _b[2]; +var _a_1 = [c3.x, c3.y, c3.z], c3_x = _a_1[0], c3_y = _a_1[1], c3_z = _a_1[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js index 27e190af62f..75b00d2ddfd 100644 --- a/tests/baselines/reference/destructuringParameterProperties2.js +++ b/tests/baselines/reference/destructuringParameterProperties2.js @@ -53,6 +53,6 @@ var C1 = (function () { 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]); -var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; +var _a_1 = [y.getA(), y.getB(), y.getC()], y_a = _a_1[0], y_b = _a_1[1], y_c = _a_1[2]; var z = new C1(10, [undefined, "", null]); -var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; +var _a_2 = [z.getA(), z.getB(), z.getC()], z_a = _a_2[0], z_b = _a_2[1], z_c = _a_2[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js index fe9e69d7e5b..be835bdfe22 100644 --- a/tests/baselines/reference/destructuringParameterProperties3.js +++ b/tests/baselines/reference/destructuringParameterProperties3.js @@ -56,8 +56,8 @@ var C1 = (function () { 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]); -var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; +var _a_1 = [y.getA(), y.getB(), y.getC()], y_a = _a_1[0], y_b = _a_1[1], y_c = _a_1[2]; var z = new C1(10, [undefined, "", ""]); -var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; +var _a_2 = [z.getA(), z.getB(), z.getC()], z_a = _a_2[0], z_b = _a_2[1], z_c = _a_2[2]; var w = new C1(10, [undefined, undefined, undefined]); -var _d = [z.getA(), z.getB(), z.getC()], z_a = _d[0], z_b = _d[1], z_c = _d[2]; +var _a_3 = [z.getA(), z.getB(), z.getC()], z_a = _a_3[0], z_b = _a_3[1], z_c = _a_3[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js index d9b1710ae89..5046d41472d 100644 --- a/tests/baselines/reference/destructuringParameterProperties5.js +++ b/tests/baselines/reference/destructuringParameterProperties5.js @@ -15,7 +15,7 @@ var [a_x1, a_x2, a_x3, a_y, a_z] = [a.x1, a.x2, a.x3, a.y, a.z]; //// [destructuringParameterProperties5.js] var C1 = (function () { function C1(_a) { - var _b = _a[0], x1 = _b.x1, x2 = _b.x2, x3 = _b.x3, y = _a[1], z = _a[2]; + var _a_1 = _a[0], x1 = _a_1.x1, x2 = _a_1.x2, x3 = _a_1.x3, y = _a[1], z = _a[2]; this.[{ x1, x2, x3 }, y, z] = [{ x1, x2, x3 }, y, z]; var foo = x1 || x2 || x3 || y || z; var bar = this.x1 || this.x2 || this.x3 || this.y || this.z; diff --git a/tests/baselines/reference/restElementMustBeLast.js b/tests/baselines/reference/restElementMustBeLast.js index 337cb6de6f6..9cb96b7e1e6 100644 --- a/tests/baselines/reference/restElementMustBeLast.js +++ b/tests/baselines/reference/restElementMustBeLast.js @@ -5,5 +5,5 @@ var [...a, x] = [1, 2, 3]; // Error, rest must be last element //// [restElementMustBeLast.js] var _a = [1, 2, 3], x = _a[1]; // Error, rest must be last element -_b = [1, 2, 3], x = _b[1]; // Error, rest must be last element -var _b; +_a_1 = [1, 2, 3], x = _a_1[1]; // Error, rest must be last element +var _a_1; diff --git a/tests/baselines/reference/restElementWithNullInitializer.js b/tests/baselines/reference/restElementWithNullInitializer.js index 9f326602fb8..9b314a5ed19 100644 --- a/tests/baselines/reference/restElementWithNullInitializer.js +++ b/tests/baselines/reference/restElementWithNullInitializer.js @@ -14,14 +14,14 @@ function foo4([...r] = []) { //// [restElementWithNullInitializer.js] function foo1(_a) { - var _b = _a === void 0 ? null : _a, r = _b.slice(0); + var _a_1 = _a === void 0 ? null : _a, r = _a_1.slice(0); } function foo2(_a) { - var _b = _a === void 0 ? undefined : _a, r = _b.slice(0); + var _a_1 = _a === void 0 ? undefined : _a, r = _a_1.slice(0); } function foo3(_a) { - var _b = _a === void 0 ? {} : _a, r = _b.slice(0); + var _a_1 = _a === void 0 ? {} : _a, r = _a_1.slice(0); } function foo4(_a) { - var _b = _a === void 0 ? [] : _a, r = _b.slice(0); + var _a_1 = _a === void 0 ? [] : _a, r = _a_1.slice(0); } diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js index 9d3531c2667..fad2c81f0eb 100644 --- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js +++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js @@ -99,62 +99,62 @@ function noParams(n) { } (_a = [""], _a.raw = [""], noParams(_a)); // Generic tag with parameter which does not use type parameter function noGenericParams(n) { } -(_b = [""], _b.raw = [""], noGenericParams(_b)); +(_a_1 = [""], _a_1.raw = [""], noGenericParams(_a_1)); // Generic tag with multiple type parameters and only one used in parameter type annotation function someGenerics1a(n, m) { } -(_c = ["", ""], _c.raw = ["", ""], someGenerics1a(_c, 3)); +(_a_2 = ["", ""], _a_2.raw = ["", ""], someGenerics1a(_a_2, 3)); function someGenerics1b(n, m) { } -(_d = ["", ""], _d.raw = ["", ""], someGenerics1b(_d, 3)); +(_a_3 = ["", ""], _a_3.raw = ["", ""], someGenerics1b(_a_3, 3)); // Generic tag with argument of function type whose parameter is of type parameter type function someGenerics2a(strs, n) { } -(_e = ["", ""], _e.raw = ["", ""], someGenerics2a(_e, function (n) { return n; })); +(_a_4 = ["", ""], _a_4.raw = ["", ""], someGenerics2a(_a_4, function (n) { return n; })); function someGenerics2b(strs, n) { } -(_f = ["", ""], _f.raw = ["", ""], someGenerics2b(_f, function (n, x) { return n; })); +(_a_5 = ["", ""], _a_5.raw = ["", ""], someGenerics2b(_a_5, function (n, x) { return n; })); // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter function someGenerics3(strs, producer) { } -(_g = ["", ""], _g.raw = ["", ""], someGenerics3(_g, function () { return ''; })); -(_h = ["", ""], _h.raw = ["", ""], someGenerics3(_h, function () { return undefined; })); -(_j = ["", ""], _j.raw = ["", ""], someGenerics3(_j, function () { return 3; })); +(_a_6 = ["", ""], _a_6.raw = ["", ""], someGenerics3(_a_6, function () { return ''; })); +(_a_7 = ["", ""], _a_7.raw = ["", ""], someGenerics3(_a_7, function () { return undefined; })); +(_a_8 = ["", ""], _a_8.raw = ["", ""], someGenerics3(_a_8, function () { return 3; })); // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type function someGenerics4(strs, n, f) { } -(_k = ["", "", ""], _k.raw = ["", "", ""], someGenerics4(_k, 4, function () { return null; })); -(_l = ["", "", ""], _l.raw = ["", "", ""], someGenerics4(_l, '', function () { return 3; })); -(_m = ["", "", ""], _m.raw = ["", "", ""], someGenerics4(_m, null, null)); +(_a_9 = ["", "", ""], _a_9.raw = ["", "", ""], someGenerics4(_a_9, 4, function () { return null; })); +(_a_10 = ["", "", ""], _a_10.raw = ["", "", ""], someGenerics4(_a_10, '', function () { return 3; })); +(_a_11 = ["", "", ""], _a_11.raw = ["", "", ""], someGenerics4(_a_11, null, null)); // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type function someGenerics5(strs, n, f) { } -(_n = ["", " ", ""], _n.raw = ["", " ", ""], someGenerics5(_n, 4, function () { return null; })); -(_o = ["", "", ""], _o.raw = ["", "", ""], someGenerics5(_o, '', function () { return 3; })); -(_p = ["", "", ""], _p.raw = ["", "", ""], someGenerics5(_p, null, null)); +(_a_12 = ["", " ", ""], _a_12.raw = ["", " ", ""], someGenerics5(_a_12, 4, function () { return null; })); +(_a_13 = ["", "", ""], _a_13.raw = ["", "", ""], someGenerics5(_a_13, '', function () { return 3; })); +(_a_14 = ["", "", ""], _a_14.raw = ["", "", ""], someGenerics5(_a_14, null, null)); // Generic tag with multiple arguments of function types that each have parameters of the same generic type function someGenerics6(strs, a, b, c) { } -(_q = ["", "", "", ""], _q.raw = ["", "", "", ""], someGenerics6(_q, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_r = ["", "", "", ""], _r.raw = ["", "", "", ""], someGenerics6(_r, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_s = ["", "", "", ""], _s.raw = ["", "", "", ""], someGenerics6(_s, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_15 = ["", "", "", ""], _a_15.raw = ["", "", "", ""], someGenerics6(_a_15, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_16 = ["", "", "", ""], _a_16.raw = ["", "", "", ""], someGenerics6(_a_16, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_17 = ["", "", "", ""], _a_17.raw = ["", "", "", ""], someGenerics6(_a_17, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); // Generic tag with multiple arguments of function types that each have parameters of different generic type function someGenerics7(strs, a, b, c) { } -(_t = ["", "", "", ""], _t.raw = ["", "", "", ""], someGenerics7(_t, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_u = ["", "", "", ""], _u.raw = ["", "", "", ""], someGenerics7(_u, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_v = ["", "", "", ""], _v.raw = ["", "", "", ""], someGenerics7(_v, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_18 = ["", "", "", ""], _a_18.raw = ["", "", "", ""], someGenerics7(_a_18, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_19 = ["", "", "", ""], _a_19.raw = ["", "", "", ""], someGenerics7(_a_19, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_a_20 = ["", "", "", ""], _a_20.raw = ["", "", "", ""], someGenerics7(_a_20, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); // Generic tag with argument of generic function type function someGenerics8(strs, n) { return n; } -var x = (_w = ["", ""], _w.raw = ["", ""], someGenerics8(_w, someGenerics7)); -(_x = ["", "", "", ""], _x.raw = ["", "", "", ""], x(_x, null, null, null)); +var x = (_a_21 = ["", ""], _a_21.raw = ["", ""], someGenerics8(_a_21, someGenerics7)); +(_a_22 = ["", "", "", ""], _a_22.raw = ["", "", "", ""], x(_a_22, null, null, null)); // Generic tag with multiple parameters of generic type passed arguments with no best common type function someGenerics9(strs, a, b, c) { return null; } -var a9a = (_y = ["", "", "", ""], _y.raw = ["", "", "", ""], someGenerics9(_y, '', 0, [])); +var a9a = (_a_23 = ["", "", "", ""], _a_23.raw = ["", "", "", ""], someGenerics9(_a_23, '', 0, [])); var a9a; -var a9e = (_z = ["", "", "", ""], _z.raw = ["", "", "", ""], someGenerics9(_z, undefined, { x: 6, z: new Date() }, { x: 6, y: '' })); +var a9e = (_a_24 = ["", "", "", ""], _a_24.raw = ["", "", "", ""], someGenerics9(_a_24, undefined, { x: 6, z: new Date() }, { x: 6, y: '' })); var a9e; // Generic tag with multiple parameters of generic type passed arguments with a single best common type -var a9d = (_0 = ["", "", "", ""], _0.raw = ["", "", "", ""], someGenerics9(_0, { x: 3 }, { x: 6 }, { x: 6 })); +var a9d = (_a_25 = ["", "", "", ""], _a_25.raw = ["", "", "", ""], someGenerics9(_a_25, { x: 3 }, { x: 6 }, { x: 6 })); var a9d; // Generic tag with multiple parameters of generic type where one argument is of type 'any' var anyVar; -var a = (_1 = ["", "", "", ""], _1.raw = ["", "", "", ""], someGenerics9(_1, 7, anyVar, 4)); +var a = (_a_26 = ["", "", "", ""], _a_26.raw = ["", "", "", ""], someGenerics9(_a_26, 7, anyVar, 4)); var a; // Generic tag with multiple parameters of generic type where one argument is [] and the other is not 'any' -var arr = (_2 = ["", "", "", ""], _2.raw = ["", "", "", ""], someGenerics9(_2, [], null, undefined)); +var arr = (_a_27 = ["", "", "", ""], _a_27.raw = ["", "", "", ""], someGenerics9(_a_27, [], null, undefined)); var arr; -var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2; +var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11, _a_12, _a_13, _a_14, _a_15, _a_16, _a_17, _a_18, _a_19, _a_20, _a_21, _a_22, _a_23, _a_24, _a_25, _a_26, _a_27; diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js index 9d113793228..972e0cfcf65 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js +++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js @@ -36,14 +36,14 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithIncompatibleTypedTags.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); -(_c = ["abc"], _c.raw = ["abc"], f(_c)).member; -(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f(_d, 1, 2)).member; -(_e = ["abc"], _e.raw = ["abc"], f(_e))["member"]; -(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2))["member"]; -(_g = ["abc", "def", "ghi"], _g.raw = ["abc", "def", "ghi"], (_h = ["abc"], _h.raw = ["abc"], f(_h))[0].member(_g, 1, 2)); -(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc", "def", "ghi"], _k.raw = ["abc", "def", "ghi"], f(_k, 1, 2))["member"].member(_j, 1, 2)); -(_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, true, true))["member"].member(_l, 1, 2)); +(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); +(_a_2 = ["abc"], _a_2.raw = ["abc"], f(_a_2)).member; +(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f(_a_3, 1, 2)).member; +(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4))["member"]; +(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2))["member"]; +(_a_6 = ["abc", "def", "ghi"], _a_6.raw = ["abc", "def", "ghi"], (_a_7 = ["abc"], _a_7.raw = ["abc"], f(_a_7))[0].member(_a_6, 1, 2)); +(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc", "def", "ghi"], _a_9.raw = ["abc", "def", "ghi"], f(_a_9, 1, 2))["member"].member(_a_8, 1, 2)); +(_a_10 = ["abc", "def", "ghi"], _a_10.raw = ["abc", "def", "ghi"], (_a_11 = ["abc", "def", "ghi"], _a_11.raw = ["abc", "def", "ghi"], f(_a_11, true, true))["member"].member(_a_10, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m; +var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js index 431447df22e..cb5df24cb77 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js @@ -37,9 +37,9 @@ var d = foo([], 1, true); // boolean (with error) var e = foo([], 1, "2"); // {} var f = foo([], 1, 2, 3); // any (with error) var u = (_a = [""], _a.raw = [""], foo(_a)); // number -var v = (_b = ["", ""], _b.raw = ["", ""], foo(_b, 1)); // string -var w = (_c = ["", "", ""], _c.raw = ["", "", ""], foo(_c, 1, 2)); // boolean -var x = (_d = ["", "", ""], _d.raw = ["", "", ""], foo(_d, 1, true)); // boolean (with error) -var y = (_e = ["", "", ""], _e.raw = ["", "", ""], foo(_e, 1, "2")); // {} -var z = (_f = ["", "", "", ""], _f.raw = ["", "", "", ""], foo(_f, 1, 2, 3)); // any (with error) -var _a, _b, _c, _d, _e, _f; +var v = (_a_1 = ["", ""], _a_1.raw = ["", ""], foo(_a_1, 1)); // string +var w = (_a_2 = ["", "", ""], _a_2.raw = ["", "", ""], foo(_a_2, 1, 2)); // boolean +var x = (_a_3 = ["", "", ""], _a_3.raw = ["", "", ""], foo(_a_3, 1, true)); // boolean (with error) +var y = (_a_4 = ["", "", ""], _a_4.raw = ["", "", ""], foo(_a_4, 1, "2")); // {} +var z = (_a_5 = ["", "", "", ""], _a_5.raw = ["", "", "", ""], foo(_a_5, 1, 2, 3)); // any (with error) +var _a, _a_1, _a_2, _a_3, _a_4, _a_5; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js index f12008f9581..f17e1bbd2ee 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js @@ -35,6 +35,6 @@ function foo2() { } return undefined; } -var c = (_b = ["", ""], _b.raw = ["", ""], foo2(_b, 1)); // number +var c = (_a_1 = ["", ""], _a_1.raw = ["", ""], foo2(_a_1, 1)); // number var d = foo2([], 1); // number -var _a, _b; +var _a, _a_1; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js index 4b9df44d3f7..2176c433042 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js @@ -77,39 +77,39 @@ fn5 `${ (n) => n.substr(0) }`; function fn1() { return null; } var s = (_a = ["", ""], _a.raw = ["", ""], fn1(_a, undefined)); // No candidate overloads found -(_b = ["", ""], _b.raw = ["", ""], fn1(_b, {})); // Error +(_a_1 = ["", ""], _a_1.raw = ["", ""], fn1(_a_1, {})); // Error function fn2() { return undefined; } -var d1 = (_c = ["", "", ""], _c.raw = ["", "", ""], fn2(_c, 0, undefined)); // contextually typed -var d2 = (_d = ["", "", ""], _d.raw = ["", "", ""], fn2(_d, 0, undefined)); // any +var d1 = (_a_2 = ["", "", ""], _a_2.raw = ["", "", ""], fn2(_a_2, 0, undefined)); // contextually typed +var d2 = (_a_3 = ["", "", ""], _a_3.raw = ["", "", ""], fn2(_a_3, 0, undefined)); // any d1.foo(); // error d2(); // no error (typed as any) // Generic and non-generic overload where generic overload is the only candidate -(_e = ["", "", ""], _e.raw = ["", "", ""], fn2(_e, 0, '')); // OK +(_a_4 = ["", "", ""], _a_4.raw = ["", "", ""], fn2(_a_4, 0, '')); // OK // Generic and non-generic overload where non-generic overload is the only candidate -(_f = ["", "", ""], _f.raw = ["", "", ""], fn2(_f, '', 0)); // OK +(_a_5 = ["", "", ""], _a_5.raw = ["", "", ""], fn2(_a_5, '', 0)); // OK function fn3() { return null; } -var s = (_g = ["", ""], _g.raw = ["", ""], fn3(_g, 3)); -var s = (_h = ["", "", "", ""], _h.raw = ["", "", "", ""], fn3(_h, '', 3, '')); -var n = (_j = ["", "", "", ""], _j.raw = ["", "", "", ""], fn3(_j, 5, 5, 5)); +var s = (_a_6 = ["", ""], _a_6.raw = ["", ""], fn3(_a_6, 3)); +var s = (_a_7 = ["", "", "", ""], _a_7.raw = ["", "", "", ""], fn3(_a_7, '', 3, '')); +var n = (_a_8 = ["", "", "", ""], _a_8.raw = ["", "", "", ""], fn3(_a_8, 5, 5, 5)); var n; // Generic overloads with differing arity tagging with arguments matching each overload type parameter count -var s = (_k = ["", ""], _k.raw = ["", ""], fn3(_k, 4)); -var s = (_l = ["", "", "", ""], _l.raw = ["", "", "", ""], fn3(_l, '', '', '')); -var n = (_m = ["", "", "", ""], _m.raw = ["", "", "", ""], fn3(_m, '', '', 3)); +var s = (_a_9 = ["", ""], _a_9.raw = ["", ""], fn3(_a_9, 4)); +var s = (_a_10 = ["", "", "", ""], _a_10.raw = ["", "", "", ""], fn3(_a_10, '', '', '')); +var n = (_a_11 = ["", "", "", ""], _a_11.raw = ["", "", "", ""], fn3(_a_11, '', '', 3)); // Generic overloads with differing arity tagging with argument count that doesn't match any overload -(_n = [""], _n.raw = [""], fn3(_n)); // Error +(_a_12 = [""], _a_12.raw = [""], fn3(_a_12)); // Error function fn4() { } // Generic overloads with constraints tagged with types that satisfy the constraints -(_o = ["", "", ""], _o.raw = ["", "", ""], fn4(_o, '', 3)); -(_p = ["", "", ""], _p.raw = ["", "", ""], fn4(_p, 3, '')); -(_q = ["", "", ""], _q.raw = ["", "", ""], fn4(_q, 3, undefined)); -(_r = ["", "", ""], _r.raw = ["", "", ""], fn4(_r, '', null)); +(_a_13 = ["", "", ""], _a_13.raw = ["", "", ""], fn4(_a_13, '', 3)); +(_a_14 = ["", "", ""], _a_14.raw = ["", "", ""], fn4(_a_14, 3, '')); +(_a_15 = ["", "", ""], _a_15.raw = ["", "", ""], fn4(_a_15, 3, undefined)); +(_a_16 = ["", "", ""], _a_16.raw = ["", "", ""], fn4(_a_16, '', null)); // Generic overloads with constraints called with type arguments that do not satisfy the constraints -(_s = ["", "", ""], _s.raw = ["", "", ""], fn4(_s, null, null)); // Error +(_a_17 = ["", "", ""], _a_17.raw = ["", "", ""], fn4(_a_17, null, null)); // Error // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints -(_t = ["", "", ""], _t.raw = ["", "", ""], fn4(_t, true, null)); -(_u = ["", "", ""], _u.raw = ["", "", ""], fn4(_u, null, true)); +(_a_18 = ["", "", ""], _a_18.raw = ["", "", ""], fn4(_a_18, true, null)); +(_a_19 = ["", "", ""], _a_19.raw = ["", "", ""], fn4(_a_19, null, true)); function fn5() { return undefined; } -(_v = ["", ""], _v.raw = ["", ""], fn5(_v, function (n) { return n.toFixed(); })); // will error; 'n' should have type 'string'. -(_w = ["", ""], _w.raw = ["", ""], fn5(_w, function (n) { return n.substr(0); })); -var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w; +(_a_20 = ["", ""], _a_20.raw = ["", ""], fn5(_a_20, function (n) { return n.toFixed(); })); // will error; 'n' should have type 'string'. +(_a_21 = ["", ""], _a_21.raw = ["", ""], fn5(_a_21, function (n) { return n.substr(0); })); +var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11, _a_12, _a_13, _a_14, _a_15, _a_16, _a_17, _a_18, _a_19, _a_20, _a_21; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js index fd83d9d0ba0..2bcbc173ab2 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js @@ -28,15 +28,15 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithTagsTypedAsAny.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); -(_c = ["abc"], _c.raw = ["abc"], f.g.h(_c)); -(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f.g.h(_d, 1, 2)); -(_e = ["abc"], _e.raw = ["abc"], f(_e)).member; -(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2)).member; -(_g = ["abc"], _g.raw = ["abc"], f(_g))["member"]; -(_h = ["abc", "def", "ghi"], _h.raw = ["abc", "def", "ghi"], f(_h, 1, 2))["member"]; -(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc"], _k.raw = ["abc"], f(_k))["member"].someOtherTag(_j, 1, 2)); -(_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, 1, 2))["member"].someOtherTag(_l, 1, 2)); +(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); +(_a_2 = ["abc"], _a_2.raw = ["abc"], f.g.h(_a_2)); +(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f.g.h(_a_3, 1, 2)); +(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4)).member; +(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2)).member; +(_a_6 = ["abc"], _a_6.raw = ["abc"], f(_a_6))["member"]; +(_a_7 = ["abc", "def", "ghi"], _a_7.raw = ["abc", "def", "ghi"], f(_a_7, 1, 2))["member"]; +(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc"], _a_9.raw = ["abc"], f(_a_9))["member"].someOtherTag(_a_8, 1, 2)); +(_a_10 = ["abc", "def", "ghi"], _a_10.raw = ["abc", "def", "ghi"], (_a_11 = ["abc", "def", "ghi"], _a_11.raw = ["abc", "def", "ghi"], f(_a_11, 1, 2))["member"].someOtherTag(_a_10, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m; +var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js index fcc2cda86dc..16b14d32d93 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js @@ -34,13 +34,13 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithTypedTags.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); -(_c = ["abc"], _c.raw = ["abc"], f(_c)).member; -(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f(_d, 1, 2)).member; -(_e = ["abc"], _e.raw = ["abc"], f(_e))["member"]; -(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2))["member"]; -(_g = ["abc", "def", "ghi"], _g.raw = ["abc", "def", "ghi"], (_h = ["abc"], _h.raw = ["abc"], f(_h))[0].member(_g, 1, 2)); -(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc", "def", "ghi"], _k.raw = ["abc", "def", "ghi"], f(_k, 1, 2))["member"].member(_j, 1, 2)); +(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); +(_a_2 = ["abc"], _a_2.raw = ["abc"], f(_a_2)).member; +(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f(_a_3, 1, 2)).member; +(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4))["member"]; +(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2))["member"]; +(_a_6 = ["abc", "def", "ghi"], _a_6.raw = ["abc", "def", "ghi"], (_a_7 = ["abc"], _a_7.raw = ["abc"], f(_a_7))[0].member(_a_6, 1, 2)); +(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc", "def", "ghi"], _a_9.raw = ["abc", "def", "ghi"], f(_a_9, 1, 2))["member"].member(_a_8, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k; +var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9; diff --git a/tests/baselines/reference/templateStringInModuleName.js b/tests/baselines/reference/templateStringInModuleName.js index 36f619176e4..9ebb92a3801 100644 --- a/tests/baselines/reference/templateStringInModuleName.js +++ b/tests/baselines/reference/templateStringInModuleName.js @@ -11,7 +11,7 @@ declare; { } declare; -(_b = ["M", ""], _b.raw = ["M", ""], module(_b, 2)); +(_a_1 = ["M", ""], _a_1.raw = ["M", ""], module(_a_1, 2)); { } -var _a, _b; +var _a, _a_1; From 61224e92a048063acb5ed74fde30c043695fd197 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 14:02:15 -0800 Subject: [PATCH 028/251] Add tests for 'for...of' emit when LHS is a var --- .../conformance/statements/for-ofStatements/ES5For-of1.ts | 1 + .../conformance/statements/for-ofStatements/ES5For-of2.ts | 3 +++ .../conformance/statements/for-ofStatements/ES5For-of3.ts | 2 ++ .../conformance/statements/for-ofStatements/ES5For-of4.ts | 3 +++ .../conformance/statements/for-ofStatements/ES5For-of5.ts | 3 +++ .../conformance/statements/for-ofStatements/ES5For-of6.ts | 5 +++++ .../conformance/statements/for-ofStatements/ES5For-of7.ts | 7 +++++++ 7 files changed, 24 insertions(+) create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts new file mode 100644 index 00000000000..24bb2f9759f --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts @@ -0,0 +1 @@ +for (var v of []) { } \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts new file mode 100644 index 00000000000..5015082a4a9 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts @@ -0,0 +1,3 @@ +for (var v of []) { + var x = v; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts new file mode 100644 index 00000000000..4543b6f74ec --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts @@ -0,0 +1,2 @@ +for (var v of []) + var x = v; \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts new file mode 100644 index 00000000000..42fb4c01bdc --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts @@ -0,0 +1,3 @@ +for (var v of []) + var x = v; +var y = v; \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts new file mode 100644 index 00000000000..ee968515d65 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts @@ -0,0 +1,3 @@ +for (var _a of []) { + var x = _a; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts new file mode 100644 index 00000000000..a04ee2d6177 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts @@ -0,0 +1,5 @@ +for (var w of []) { + for (var v of []) { + var x = [w, v]; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts new file mode 100644 index 00000000000..6acb7646779 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts @@ -0,0 +1,7 @@ +for (var w of []) { + var x = w; +} + +for (var v of []) { + var x = [w, v]; +} \ No newline at end of file From 5a878646acbf9d7ecdb0eab187e6136568d0d148 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 14:03:01 -0800 Subject: [PATCH 029/251] Accept baselines --- tests/baselines/reference/ES5For-of1.js | 7 +++++++ tests/baselines/reference/ES5For-of2.js | 10 ++++++++++ tests/baselines/reference/ES5For-of3.js | 9 +++++++++ tests/baselines/reference/ES5For-of4.js | 11 +++++++++++ tests/baselines/reference/ES5For-of5.js | 10 ++++++++++ tests/baselines/reference/ES5For-of6.js | 15 +++++++++++++++ tests/baselines/reference/ES5For-of7.js | 18 ++++++++++++++++++ .../reference/parserES5ForOfStatement10.js | 3 ++- .../reference/parserES5ForOfStatement18.js | 4 +++- .../reference/parserES5ForOfStatement2.js | 2 +- .../reference/parserES5ForOfStatement21.js | 3 ++- .../reference/parserES5ForOfStatement3.js | 3 ++- .../reference/parserES5ForOfStatement4.js | 3 ++- .../reference/parserES5ForOfStatement5.js | 3 ++- .../reference/parserES5ForOfStatement6.js | 3 ++- .../reference/parserES5ForOfStatement7.js | 3 ++- .../reference/parserES5ForOfStatement8.js | 3 ++- .../reference/parserES5ForOfStatement9.js | 3 ++- 18 files changed, 102 insertions(+), 11 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of1.js create mode 100644 tests/baselines/reference/ES5For-of2.js create mode 100644 tests/baselines/reference/ES5For-of3.js create mode 100644 tests/baselines/reference/ES5For-of4.js create mode 100644 tests/baselines/reference/ES5For-of5.js create mode 100644 tests/baselines/reference/ES5For-of6.js create mode 100644 tests/baselines/reference/ES5For-of7.js diff --git a/tests/baselines/reference/ES5For-of1.js b/tests/baselines/reference/ES5For-of1.js new file mode 100644 index 00000000000..8c4bc1038c3 --- /dev/null +++ b/tests/baselines/reference/ES5For-of1.js @@ -0,0 +1,7 @@ +//// [ES5For-of1.ts] +for (var v of []) { } + +//// [ES5For-of1.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; +} diff --git a/tests/baselines/reference/ES5For-of2.js b/tests/baselines/reference/ES5For-of2.js new file mode 100644 index 00000000000..e057ccbbf3e --- /dev/null +++ b/tests/baselines/reference/ES5For-of2.js @@ -0,0 +1,10 @@ +//// [ES5For-of2.ts] +for (var v of []) { + var x = v; +} + +//// [ES5For-of2.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var x = v; +} diff --git a/tests/baselines/reference/ES5For-of3.js b/tests/baselines/reference/ES5For-of3.js new file mode 100644 index 00000000000..3bb7cf63885 --- /dev/null +++ b/tests/baselines/reference/ES5For-of3.js @@ -0,0 +1,9 @@ +//// [ES5For-of3.ts] +for (var v of []) + var x = v; + +//// [ES5For-of3.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var x = v; +} diff --git a/tests/baselines/reference/ES5For-of4.js b/tests/baselines/reference/ES5For-of4.js new file mode 100644 index 00000000000..ee36de0a3af --- /dev/null +++ b/tests/baselines/reference/ES5For-of4.js @@ -0,0 +1,11 @@ +//// [ES5For-of4.ts] +for (var v of []) + var x = v; +var y = v; + +//// [ES5For-of4.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var x = v; +} +var y = v; diff --git a/tests/baselines/reference/ES5For-of5.js b/tests/baselines/reference/ES5For-of5.js new file mode 100644 index 00000000000..0dfb430ca44 --- /dev/null +++ b/tests/baselines/reference/ES5For-of5.js @@ -0,0 +1,10 @@ +//// [ES5For-of5.ts] +for (var _a of []) { + var x = _a; +} + +//// [ES5For-of5.js] +for (var _a, _i = 0, _a_1 = []; _i < _a_1.length; _i++) { + _a = _a_1[_i]; + var x = _a; +} diff --git a/tests/baselines/reference/ES5For-of6.js b/tests/baselines/reference/ES5For-of6.js new file mode 100644 index 00000000000..e7c81743509 --- /dev/null +++ b/tests/baselines/reference/ES5For-of6.js @@ -0,0 +1,15 @@ +//// [ES5For-of6.ts] +for (var w of []) { + for (var v of []) { + var x = [w, v]; + } +} + +//// [ES5For-of6.js] +for (var w, _i = 0, _a = []; _i < _a.length; _i++) { + w = _a[_i]; + for (var v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + v = _a_1[_i_1]; + var x = [w, v]; + } +} diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js new file mode 100644 index 00000000000..8b2355d9ad6 --- /dev/null +++ b/tests/baselines/reference/ES5For-of7.js @@ -0,0 +1,18 @@ +//// [ES5For-of7.ts] +for (var w of []) { + var x = w; +} + +for (var v of []) { + var x = [w, v]; +} + +//// [ES5For-of7.js] +for (var w, _i = 0, _a = []; _i < _a.length; _i++) { + w = _a[_i]; + var x = w; +} +for (var v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + v = _a_1[_i_1]; + var x = [w, v]; +} diff --git a/tests/baselines/reference/parserES5ForOfStatement10.js b/tests/baselines/reference/parserES5ForOfStatement10.js index 2b9dc843887..13a5defecb6 100644 --- a/tests/baselines/reference/parserES5ForOfStatement10.js +++ b/tests/baselines/reference/parserES5ForOfStatement10.js @@ -3,5 +3,6 @@ for (const v of X) { } //// [parserES5ForOfStatement10.js] -for (var v of X) { +for (var v, _i = 0, _a = X; _i < _a.length; _i++) { + v = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js index 1df3e0bed7b..76a4610d74b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement18.js +++ b/tests/baselines/reference/parserES5ForOfStatement18.js @@ -2,4 +2,6 @@ for (var of of of) { } //// [parserES5ForOfStatement18.js] -for (var of of of) { } +for (var of, _i = 0, _a = of; _i < _a.length; _i++) { + of = _a[_i]; +} diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js index dfcfb476172..5b622e7b7b9 100644 --- a/tests/baselines/reference/parserES5ForOfStatement2.js +++ b/tests/baselines/reference/parserES5ForOfStatement2.js @@ -3,5 +3,5 @@ for (var of X) { } //// [parserES5ForOfStatement2.js] -for ( of X) { +for (_i = 0, _a = X; _i < _a.length; _i++) { } diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js index e02ed853cb5..08e2e173701 100644 --- a/tests/baselines/reference/parserES5ForOfStatement21.js +++ b/tests/baselines/reference/parserES5ForOfStatement21.js @@ -2,4 +2,5 @@ for (var of of) { } //// [parserES5ForOfStatement21.js] -for ( of of) { } +for (_i = 0, _a = of; _i < _a.length; _i++) { +} diff --git a/tests/baselines/reference/parserES5ForOfStatement3.js b/tests/baselines/reference/parserES5ForOfStatement3.js index 64892eb5094..fd021d578d5 100644 --- a/tests/baselines/reference/parserES5ForOfStatement3.js +++ b/tests/baselines/reference/parserES5ForOfStatement3.js @@ -3,5 +3,6 @@ for (var a, b of X) { } //// [parserES5ForOfStatement3.js] -for (var a of X) { +for (var a, _i = 0, _a = X; _i < _a.length; _i++) { + a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js index e17699a8662..bd64f807597 100644 --- a/tests/baselines/reference/parserES5ForOfStatement4.js +++ b/tests/baselines/reference/parserES5ForOfStatement4.js @@ -3,5 +3,6 @@ for (var a = 1 of X) { } //// [parserES5ForOfStatement4.js] -for (var a = 1 of X) { +for (var a, _i = 0, _a = X; _i < _a.length; _i++) { + a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement5.js b/tests/baselines/reference/parserES5ForOfStatement5.js index 2eeb504365e..2c4a997a393 100644 --- a/tests/baselines/reference/parserES5ForOfStatement5.js +++ b/tests/baselines/reference/parserES5ForOfStatement5.js @@ -3,5 +3,6 @@ for (var a: number of X) { } //// [parserES5ForOfStatement5.js] -for (var a of X) { +for (var a, _i = 0, _a = X; _i < _a.length; _i++) { + a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js index 575368fcd20..0865d27fcb8 100644 --- a/tests/baselines/reference/parserES5ForOfStatement6.js +++ b/tests/baselines/reference/parserES5ForOfStatement6.js @@ -3,5 +3,6 @@ for (var a = 1, b = 2 of X) { } //// [parserES5ForOfStatement6.js] -for (var a = 1 of X) { +for (var a, _i = 0, _a = X; _i < _a.length; _i++) { + a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js index ac240494c18..42408cba235 100644 --- a/tests/baselines/reference/parserES5ForOfStatement7.js +++ b/tests/baselines/reference/parserES5ForOfStatement7.js @@ -3,5 +3,6 @@ for (var a: number = 1, b: string = "" of X) { } //// [parserES5ForOfStatement7.js] -for (var a = 1 of X) { +for (var a, _i = 0, _a = X; _i < _a.length; _i++) { + a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement8.js b/tests/baselines/reference/parserES5ForOfStatement8.js index c926784adfe..fa42d260fa5 100644 --- a/tests/baselines/reference/parserES5ForOfStatement8.js +++ b/tests/baselines/reference/parserES5ForOfStatement8.js @@ -3,5 +3,6 @@ for (var v of X) { } //// [parserES5ForOfStatement8.js] -for (var v of X) { +for (var v, _i = 0, _a = X; _i < _a.length; _i++) { + v = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement9.js b/tests/baselines/reference/parserES5ForOfStatement9.js index 856dd5982af..612a5ec63a9 100644 --- a/tests/baselines/reference/parserES5ForOfStatement9.js +++ b/tests/baselines/reference/parserES5ForOfStatement9.js @@ -3,5 +3,6 @@ for (let v of X) { } //// [parserES5ForOfStatement9.js] -for (var v of X) { +for (var v, _i = 0, _a = X; _i < _a.length; _i++) { + v = _a[_i]; } From 9b76a0298bd12185afe08382622bf57c3f6ebbe0 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 14:16:43 -0800 Subject: [PATCH 030/251] Remove tempCount --- src/compiler/emitter.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 9ecc936e3c2..f80696b9836 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1580,7 +1580,6 @@ module ts { var generatedBlockScopeNames: string[]; var extendsEmitted = false; - var tempCount = 0; var tempVariables: Identifier[]; var tempParameters: Identifier[]; var externalImports: ExternalImportInfo[]; @@ -4219,10 +4218,8 @@ module ts { } function emitSignatureAndBody(node: FunctionLikeDeclaration) { - var saveTempCount = tempCount; var saveTempVariables = tempVariables; var saveTempParameters = tempParameters; - tempCount = 0; tempVariables = undefined; tempParameters = undefined; @@ -4261,7 +4258,6 @@ module ts { exitNameScope(popFrame); - tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; } @@ -4576,10 +4572,8 @@ module ts { } function emitConstructorOfClass() { - var saveTempCount = tempCount; var saveTempVariables = tempVariables; var saveTempParameters = tempParameters; - tempCount = 0; tempVariables = undefined; tempParameters = undefined; @@ -4648,7 +4642,6 @@ module ts { exitNameScope(popFrame); - tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; } @@ -4776,16 +4769,13 @@ module ts { emitEnd(node.name); write(") "); if (node.body.kind === SyntaxKind.ModuleBlock) { - var saveTempCount = tempCount; var saveTempVariables = tempVariables; - tempCount = 0; tempVariables = undefined; var popFrame = enterNameScope(); emit(node.body); exitNameScope(popFrame); - tempCount = saveTempCount; tempVariables = saveTempVariables; } else { From f915efa6d7108a91ce4763b9685a50aca126ca3c Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 14:45:16 -0800 Subject: [PATCH 031/251] Emit for...of when LHS is expression --- src/compiler/emitter.ts | 26 ++++++++++++++----- tests/baselines/reference/ES5For-of10.js | 20 ++++++++++++++ tests/baselines/reference/ES5For-of11.js | 9 +++++++ tests/baselines/reference/ES5For-of12.js | 7 +++++ tests/baselines/reference/ES5For-of8.js | 16 ++++++++++++ tests/baselines/reference/ES5For-of9.js | 21 +++++++++++++++ .../reference/parserES5ForOfStatement2.js | 3 ++- .../reference/parserES5ForOfStatement21.js | 3 ++- .../for-ofStatements/ES5For-of10.ts | 7 +++++ .../for-ofStatements/ES5For-of11.ts | 2 ++ .../for-ofStatements/ES5For-of12.ts | 1 + .../statements/for-ofStatements/ES5For-of8.ts | 6 +++++ .../statements/for-ofStatements/ES5For-of9.ts | 8 ++++++ 13 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of10.js create mode 100644 tests/baselines/reference/ES5For-of11.js create mode 100644 tests/baselines/reference/ES5For-of12.js create mode 100644 tests/baselines/reference/ES5For-of8.js create mode 100644 tests/baselines/reference/ES5For-of9.js create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f80696b9836..995df97e971 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3491,10 +3491,10 @@ module ts { var endPos = emitToken(SyntaxKind.ForKeyword, node.pos); write(" "); endPos = emitToken(SyntaxKind.OpenParenToken, endPos); + write("var "); if (node.initializer.kind === SyntaxKind.VariableDeclarationList) { var variableDeclarationList = node.initializer; if (variableDeclarationList.declarations.length >= 1) { - write("var "); var decl = variableDeclarationList.declarations[0]; // TODO handle binding patterns emit(decl.name); @@ -3537,13 +3537,25 @@ module ts { // v = _a[_i]; if (decl) { emit(decl.name); - write(" = "); - emit(rhsReference) - write("["); - emit(counter); - write("];"); - writeLine(); } + else if (variableDeclarationList) { + // It's an empty declaration list. This can only happen in an error case, if the user wrote + // for (var of []) {} + var emptyDeclarationListTemp = createTempVariable(node, /*forLoopVariable*/ false); + write("var "); + emit(emptyDeclarationListTemp); + } + else { + // Initializer is an expression. Emit the expression in the body, so that it's + // evaluated on every iteration. + emit(node.initializer); + } + write(" = "); + emit(rhsReference) + write("["); + emit(counter); + write("];"); + writeLine(); if (node.statement.kind === SyntaxKind.Block) { emitLines((node.statement).statements); diff --git a/tests/baselines/reference/ES5For-of10.js b/tests/baselines/reference/ES5For-of10.js new file mode 100644 index 00000000000..ea081ed8ab0 --- /dev/null +++ b/tests/baselines/reference/ES5For-of10.js @@ -0,0 +1,20 @@ +//// [ES5For-of10.ts] +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + for (foo().x of []) + var p = foo().x; +} + +//// [ES5For-of10.js] +function foo() { + return { x: 0 }; +} +for (var _i = 0, _a = []; _i < _a.length; _i++) { + foo().x = _a[_i]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + foo().x = _a_1[_i_1]; + var p = foo().x; + } +} diff --git a/tests/baselines/reference/ES5For-of11.js b/tests/baselines/reference/ES5For-of11.js new file mode 100644 index 00000000000..dc1268524f1 --- /dev/null +++ b/tests/baselines/reference/ES5For-of11.js @@ -0,0 +1,9 @@ +//// [ES5For-of11.ts] +var v; +for (v of []) { } + +//// [ES5For-of11.js] +var v; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; +} diff --git a/tests/baselines/reference/ES5For-of12.js b/tests/baselines/reference/ES5For-of12.js new file mode 100644 index 00000000000..3dbdd30251c --- /dev/null +++ b/tests/baselines/reference/ES5For-of12.js @@ -0,0 +1,7 @@ +//// [ES5For-of12.ts] +for ([""] of []) { } + +//// [ES5For-of12.js] +for (var _i = 0, _a = []; _i < _a.length; _i++) { + [""] = _a[_i]; +} diff --git a/tests/baselines/reference/ES5For-of8.js b/tests/baselines/reference/ES5For-of8.js new file mode 100644 index 00000000000..a3d20b92056 --- /dev/null +++ b/tests/baselines/reference/ES5For-of8.js @@ -0,0 +1,16 @@ +//// [ES5For-of8.ts] +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + var p = foo().x; +} + +//// [ES5For-of8.js] +function foo() { + return { x: 0 }; +} +for (var _i = 0, _a = []; _i < _a.length; _i++) { + foo().x = _a[_i]; + var p = foo().x; +} diff --git a/tests/baselines/reference/ES5For-of9.js b/tests/baselines/reference/ES5For-of9.js new file mode 100644 index 00000000000..f0c5142d4eb --- /dev/null +++ b/tests/baselines/reference/ES5For-of9.js @@ -0,0 +1,21 @@ +//// [ES5For-of9.ts] +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + for (foo().x of []) { + var p = foo().x; + } +} + +//// [ES5For-of9.js] +function foo() { + return { x: 0 }; +} +for (var _i = 0, _a = []; _i < _a.length; _i++) { + foo().x = _a[_i]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + foo().x = _a_1[_i_1]; + var p = foo().x; + } +} diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js index 5b622e7b7b9..0acc5abb671 100644 --- a/tests/baselines/reference/parserES5ForOfStatement2.js +++ b/tests/baselines/reference/parserES5ForOfStatement2.js @@ -3,5 +3,6 @@ for (var of X) { } //// [parserES5ForOfStatement2.js] -for (_i = 0, _a = X; _i < _a.length; _i++) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js index 08e2e173701..2a8734b90af 100644 --- a/tests/baselines/reference/parserES5ForOfStatement21.js +++ b/tests/baselines/reference/parserES5ForOfStatement21.js @@ -2,5 +2,6 @@ for (var of of) { } //// [parserES5ForOfStatement21.js] -for (_i = 0, _a = of; _i < _a.length; _i++) { +for (var _i = 0, _a = of; _i < _a.length; _i++) { + var _a_1 = _a[_i]; } diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts new file mode 100644 index 00000000000..78cb7668dae --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts @@ -0,0 +1,7 @@ +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + for (foo().x of []) + var p = foo().x; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts new file mode 100644 index 00000000000..9a83efa5135 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts @@ -0,0 +1,2 @@ +var v; +for (v of []) { } \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts new file mode 100644 index 00000000000..5fbfa31df5f --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts @@ -0,0 +1 @@ +for ([""] of []) { } \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts new file mode 100644 index 00000000000..5ad1fb7d58f --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts @@ -0,0 +1,6 @@ +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + var p = foo().x; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts new file mode 100644 index 00000000000..5e234df7319 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts @@ -0,0 +1,8 @@ +function foo() { + return { x: 0 }; +} +for (foo().x of []) { + for (foo().x of []) { + var p = foo().x; + } +} \ No newline at end of file From a0f108c4fb4a2aa6367ed2e7ad042dfa2cd01139 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 3 Mar 2015 16:14:03 -0800 Subject: [PATCH 032/251] Emit 'for...of' statements with let/const initializers --- src/compiler/emitter.ts | 4 ++-- tests/baselines/reference/ES5For-of13.js | 10 +++++++++ tests/baselines/reference/ES5For-of14.js | 10 +++++++++ tests/baselines/reference/ES5For-of15.js | 17 ++++++++++++++ tests/baselines/reference/ES5For-of16.js | 19 ++++++++++++++++ tests/baselines/reference/ES5For-of17.js | 19 ++++++++++++++++ tests/baselines/reference/ES5For-of18.js | 18 +++++++++++++++ tests/baselines/reference/ES5For-of19.js | 22 +++++++++++++++++++ tests/baselines/reference/ES5For-of20.js | 17 ++++++++++++++ tests/baselines/reference/ES5For-of21.js | 12 ++++++++++ .../reference/downlevelLetConst16.js | 6 +++-- .../reference/downlevelLetConst17.js | 3 ++- .../reference/parserES5ForOfStatement4.js | 2 +- .../reference/parserES5ForOfStatement6.js | 2 +- .../reference/parserES5ForOfStatement7.js | 2 +- tests/cases/compiler/downlevelLetConst17.ts | 1 - .../for-ofStatements/ES5For-of13.ts | 3 +++ .../for-ofStatements/ES5For-of14.ts | 3 +++ .../for-ofStatements/ES5For-of15.ts | 6 +++++ .../for-ofStatements/ES5For-of16.ts | 7 ++++++ .../for-ofStatements/ES5For-of17.ts | 7 ++++++ .../for-ofStatements/ES5For-of18.ts | 6 +++++ .../for-ofStatements/ES5For-of19.ts | 8 +++++++ .../for-ofStatements/ES5For-of20.ts | 6 +++++ .../for-ofStatements/ES5For-of21.ts | 3 +++ 25 files changed, 204 insertions(+), 9 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of13.js create mode 100644 tests/baselines/reference/ES5For-of14.js create mode 100644 tests/baselines/reference/ES5For-of15.js create mode 100644 tests/baselines/reference/ES5For-of16.js create mode 100644 tests/baselines/reference/ES5For-of17.js create mode 100644 tests/baselines/reference/ES5For-of18.js create mode 100644 tests/baselines/reference/ES5For-of19.js create mode 100644 tests/baselines/reference/ES5For-of20.js create mode 100644 tests/baselines/reference/ES5For-of21.js create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 995df97e971..d5c92bdbdb6 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3497,7 +3497,7 @@ module ts { if (variableDeclarationList.declarations.length >= 1) { var decl = variableDeclarationList.declarations[0]; // TODO handle binding patterns - emit(decl.name); + emit(decl); write(", "); } } @@ -3944,7 +3944,7 @@ module ts { } } else { - var isLet = renameNonTopLevelLetAndConst(node.name); + renameNonTopLevelLetAndConst(node.name); emitModuleMemberName(node); var initializer = node.initializer; diff --git a/tests/baselines/reference/ES5For-of13.js b/tests/baselines/reference/ES5For-of13.js new file mode 100644 index 00000000000..8c8318e27fd --- /dev/null +++ b/tests/baselines/reference/ES5For-of13.js @@ -0,0 +1,10 @@ +//// [ES5For-of13.ts] +for (let v of []) { + var x = v; +} + +//// [ES5For-of13.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var x = v; +} diff --git a/tests/baselines/reference/ES5For-of14.js b/tests/baselines/reference/ES5For-of14.js new file mode 100644 index 00000000000..d7a35913ef1 --- /dev/null +++ b/tests/baselines/reference/ES5For-of14.js @@ -0,0 +1,10 @@ +//// [ES5For-of14.ts] +for (const v of []) { + var x = v; +} + +//// [ES5For-of14.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var x = v; +} diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js new file mode 100644 index 00000000000..30b896165e5 --- /dev/null +++ b/tests/baselines/reference/ES5For-of15.js @@ -0,0 +1,17 @@ +//// [ES5For-of15.ts] +for (let v of []) { + v; + for (const v of []) { + var x = v; + } +} + +//// [ES5For-of15.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + v; + for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + _v = _a_1[_i_1]; + var x = _v; + } +} diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js new file mode 100644 index 00000000000..5e15af3f9c3 --- /dev/null +++ b/tests/baselines/reference/ES5For-of16.js @@ -0,0 +1,19 @@ +//// [ES5For-of16.ts] +for (let v of []) { + v; + for (let v of []) { + var x = v; + v++; + } +} + +//// [ES5For-of16.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + v; + for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + _v = _a_1[_i_1]; + var x = _v; + _v++; + } +} diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js new file mode 100644 index 00000000000..5a6cddcb605 --- /dev/null +++ b/tests/baselines/reference/ES5For-of17.js @@ -0,0 +1,19 @@ +//// [ES5For-of17.ts] +for (let v of []) { + v; + for (let v of [v]) { + var x = v; + v++; + } +} + +//// [ES5For-of17.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + v; + for (var _v, _i_1 = 0, _a_1 = [_v]; _i_1 < _a_1.length; _i_1++) { + _v = _a_1[_i_1]; + var x = _v; + _v++; + } +} diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js new file mode 100644 index 00000000000..6bb7a37b579 --- /dev/null +++ b/tests/baselines/reference/ES5For-of18.js @@ -0,0 +1,18 @@ +//// [ES5For-of18.ts] +for (let v of []) { + v; +} +for (let v of []) { + v; +} + + +//// [ES5For-of18.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + v; +} +for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + _v = _a_1[_i_1]; + _v; +} diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js new file mode 100644 index 00000000000..97718ab0337 --- /dev/null +++ b/tests/baselines/reference/ES5For-of19.js @@ -0,0 +1,22 @@ +//// [ES5For-of19.ts] +for (let v of []) { + v; + function foo() { + for (const v of []) { + v; + } + } +} + + +//// [ES5For-of19.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + v; + function foo() { + for (var _v, _i = 0, _a = []; _i < _a.length; _i++) { + _v = _a[_i]; + _v; + } + } +} diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js new file mode 100644 index 00000000000..65fb4bfd39e --- /dev/null +++ b/tests/baselines/reference/ES5For-of20.js @@ -0,0 +1,17 @@ +//// [ES5For-of20.ts] +for (let v of []) { + let v; + for (let v of [v]) { + const v; + } +} + +//// [ES5For-of20.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + var _v; + for (var _v_1, _i_1 = 0, _a_1 = [_v_1]; _i_1 < _a_1.length; _i_1++) { + _v_1 = _a_1[_i_1]; + var _v_2; + } +} diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js new file mode 100644 index 00000000000..f616c328ca0 --- /dev/null +++ b/tests/baselines/reference/ES5For-of21.js @@ -0,0 +1,12 @@ +//// [ES5For-of21.ts] +for (let v of []) { + for (let _i of []) { } +} + +//// [ES5For-of21.js] +for (var v, _i = 0, _a = []; _i < _a.length; _i++) { + v = _a[_i]; + for (var _i_1, _i_2 = 0, _a_1 = []; _i_2 < _a_1.length; _i_2++) { + _i_1 = _a_1[_i_2]; + } +} diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index 36da8ac36fe..8998ad23540 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -404,7 +404,8 @@ function foo6() { } // TODO: once for-of is supported downlevel function foo7() { - for (var _x of []) { + for (var _x, _i = 0, _a = []; _i < _a.length; _i++) { + _x = _a[_i]; use(_x); } use(x); @@ -422,7 +423,8 @@ function foo9() { use(x); } function foo10() { - for (var _x of []) { + for (var _x, _i = 0, _a = []; _i < _a.length; _i++) { + _x = _a[_i]; use(_x); } use(x); diff --git a/tests/baselines/reference/downlevelLetConst17.js b/tests/baselines/reference/downlevelLetConst17.js index 1fe9c1a01ed..d0ad931bd8f 100644 --- a/tests/baselines/reference/downlevelLetConst17.js +++ b/tests/baselines/reference/downlevelLetConst17.js @@ -119,6 +119,7 @@ for (var _x_11 in []) { use(_x_11); } // TODO: update once for-of statements are supported downlevel -for (var _x_12 of []) { +for (var _x_12, _i = 0, _a = []; _i < _a.length; _i++) { + _x_12 = _a[_i]; use(_x_12); } diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js index bd64f807597..81184fc7225 100644 --- a/tests/baselines/reference/parserES5ForOfStatement4.js +++ b/tests/baselines/reference/parserES5ForOfStatement4.js @@ -3,6 +3,6 @@ for (var a = 1 of X) { } //// [parserES5ForOfStatement4.js] -for (var a, _i = 0, _a = X; _i < _a.length; _i++) { +for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js index 0865d27fcb8..be7054234ff 100644 --- a/tests/baselines/reference/parserES5ForOfStatement6.js +++ b/tests/baselines/reference/parserES5ForOfStatement6.js @@ -3,6 +3,6 @@ for (var a = 1, b = 2 of X) { } //// [parserES5ForOfStatement6.js] -for (var a, _i = 0, _a = X; _i < _a.length; _i++) { +for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js index 42408cba235..fea53d7ec2f 100644 --- a/tests/baselines/reference/parserES5ForOfStatement7.js +++ b/tests/baselines/reference/parserES5ForOfStatement7.js @@ -3,6 +3,6 @@ for (var a: number = 1, b: string = "" of X) { } //// [parserES5ForOfStatement7.js] -for (var a, _i = 0, _a = X; _i < _a.length; _i++) { +for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { a = _a[_i]; } diff --git a/tests/cases/compiler/downlevelLetConst17.ts b/tests/cases/compiler/downlevelLetConst17.ts index 5cbb7b605fe..b581281f679 100644 --- a/tests/cases/compiler/downlevelLetConst17.ts +++ b/tests/cases/compiler/downlevelLetConst17.ts @@ -63,7 +63,6 @@ for (const x in []) { use(x); } -// TODO: update once for-of statements are supported downlevel for (const x of []) { use(x); } \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts new file mode 100644 index 00000000000..743cdf919f6 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts @@ -0,0 +1,3 @@ +for (let v of []) { + var x = v; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts new file mode 100644 index 00000000000..26dcea71a0e --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts @@ -0,0 +1,3 @@ +for (const v of []) { + var x = v; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts new file mode 100644 index 00000000000..2124870d7e3 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts @@ -0,0 +1,6 @@ +for (let v of []) { + v; + for (const v of []) { + var x = v; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts new file mode 100644 index 00000000000..d1354999340 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts @@ -0,0 +1,7 @@ +for (let v of []) { + v; + for (let v of []) { + var x = v; + v++; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts new file mode 100644 index 00000000000..6a782dba2a4 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts @@ -0,0 +1,7 @@ +for (let v of []) { + v; + for (let v of [v]) { + var x = v; + v++; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts new file mode 100644 index 00000000000..e7de82d2785 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts @@ -0,0 +1,6 @@ +for (let v of []) { + v; +} +for (let v of []) { + v; +} diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts new file mode 100644 index 00000000000..447048c374b --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts @@ -0,0 +1,8 @@ +for (let v of []) { + v; + function foo() { + for (const v of []) { + v; + } + } +} diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts new file mode 100644 index 00000000000..6a1a77d82ae --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts @@ -0,0 +1,6 @@ +for (let v of []) { + let v; + for (let v of [v]) { + const v; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts new file mode 100644 index 00000000000..cb0c3cf2329 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts @@ -0,0 +1,3 @@ +for (let v of []) { + for (let _i of []) { } +} \ No newline at end of file From a99449a1ef59b3b01d34fff2235ef60736d0fa12 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 12:10:20 -0800 Subject: [PATCH 033/251] Support destructuring in 'for...of' loops --- src/compiler/emitter.ts | 103 +++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 37 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d5c92bdbdb6..d2ec35bb494 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2873,6 +2873,12 @@ module ts { return result; } + + function createExpressionStatement(expression: Expression): ExpressionStatement { + var result = createSynthesizedNode(SyntaxKind.ExpressionStatement); + result.expression = expression; + return result; + } function createMemberAccessForPropertyName(expression: LeftHandSideExpression, memberName: DeclarationName): PropertyAccessExpression | ElementAccessExpression { if (memberName.kind === SyntaxKind.Identifier) { @@ -3473,8 +3479,8 @@ module ts { // // should be emitted as // - // for (var v, _i = 0, _a = expr; _i < _a.length; _i++) { - // v = _a[_i]; + // for (var _i = 0, _a = expr; _i < _a.length; _i++) { + // var v = _a[_i]; // } // // where _a and _i are temps emitted to capture the RHS and the counter, @@ -3491,16 +3497,11 @@ module ts { var endPos = emitToken(SyntaxKind.ForKeyword, node.pos); write(" "); endPos = emitToken(SyntaxKind.OpenParenToken, endPos); + // This is the var keyword for the counter and rhsReference. The var keyword for + // the LHS will be emitted inside the body. write("var "); - if (node.initializer.kind === SyntaxKind.VariableDeclarationList) { - var variableDeclarationList = node.initializer; - if (variableDeclarationList.declarations.length >= 1) { - var decl = variableDeclarationList.declarations[0]; - // TODO handle binding patterns - emit(decl); - write(", "); - } - } + + // Do not emit the LHS var declaration yet, because it might contain destructuring. // Do not call create recordTempDeclaration because we are declaring the temps // right here. Recording means they will be declared later. @@ -3534,33 +3535,56 @@ module ts { increaseIndent(); // Initialize LHS - // v = _a[_i]; - if (decl) { - emit(decl.name); - } - else if (variableDeclarationList) { - // It's an empty declaration list. This can only happen in an error case, if the user wrote - // for (var of []) {} - var emptyDeclarationListTemp = createTempVariable(node, /*forLoopVariable*/ false); + // var v = _a[_i]; + var rhsIterationValue = createElementAccessExpression(rhsReference, counter); + if (node.initializer.kind === SyntaxKind.VariableDeclarationList) { write("var "); - emit(emptyDeclarationListTemp); + var variableDeclarationList = node.initializer; + if (variableDeclarationList.declarations.length >= 1) { + var declaration = variableDeclarationList.declarations[0]; + if (isBindingPattern(declaration.name)) { + // This works whether the declaration is a var, let, or const. + // It will use rhsIterationValue _a[_i] as the initializer. + emitDestructuring(declaration, rhsIterationValue); + } + else { + // The following call does not include the initializer, so we have + // to emit it separately. + emit(declaration); + write(" = "); + emit(rhsIterationValue); + } + } + else { + // It's an empty declaration list. This can only happen in an error case, if the user wrote + // for (var of []) {} + var emptyDeclarationListTemp = createTempVariable(node, /*forLoopVariable*/ false); + emit(emptyDeclarationListTemp); + write(" = "); + emit(rhsIterationValue); + } } else { // Initializer is an expression. Emit the expression in the body, so that it's // evaluated on every iteration. - emit(node.initializer); + var assignmentExpression = createBinaryExpression(node.initializer, SyntaxKind.EqualsToken, rhsIterationValue, /*startsOnNewLine*/ false); + var assignmentExpressionStatement = createExpressionStatement(assignmentExpression); + if (node.initializer.kind === SyntaxKind.ArrayLiteralExpression || node.initializer.kind === SyntaxKind.ObjectLiteralExpression) { + // This is a destructuring pattern, so call emitDestructuring instead of emit. Calling emit will not work, because it will cause + // the BinaryExpression to be passed in instead of the expression statement, which will cause emitDestructuring to crash. + emitDestructuring(assignmentExpressionStatement); + } + else { + emit(assignmentExpression); + } } - write(" = "); - emit(rhsReference) - write("["); - emit(counter); - write("];"); - writeLine(); + write(";"); if (node.statement.kind === SyntaxKind.Block) { emitLines((node.statement).statements); } else { + writeLine(); emit(node.statement); } @@ -3723,13 +3747,14 @@ module ts { } } - function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration, value?: Expression) { + // Note that a destructuring assignment can be either an ExpressionStatement or a BinaryExpression. + function emitDestructuring(root: ExpressionStatement | BinaryExpression | VariableDeclaration | ParameterDeclaration, value?: Expression) { var emitCount = 0; // An exported declaration is actually emitted as an assignment (to a property on the module object), so // temporary variables in an exported declaration need to have real declarations elsewhere var isDeclaration = (root.kind === SyntaxKind.VariableDeclaration && !(getCombinedNodeFlags(root) & NodeFlags.Export)) || root.kind === SyntaxKind.Parameter; - if (root.kind === SyntaxKind.BinaryExpression) { - emitAssignmentExpression(root); + if (root.kind === SyntaxKind.ExpressionStatement || root.kind === SyntaxKind.BinaryExpression) { + emitAssignmentExpression(root); } else { emitBindingElement(root, value); @@ -3868,13 +3893,14 @@ module ts { } } - function emitAssignmentExpression(root: BinaryExpression) { - var target = root.left; - var value = root.right; - if (root.parent.kind === SyntaxKind.ExpressionStatement) { - emitDestructuringAssignment(target, value); - } - else { + function emitAssignmentExpression(root: ExpressionStatement | BinaryExpression) { + // Synthesized nodes will not have parents, so the ExpressionStatements will have to be passed + // in directly. Otherwise, it will crash when we access the parent of a synthesized binary expression. + var emitParenthesized = root.kind !== SyntaxKind.ExpressionStatement && root.parent.kind !== SyntaxKind.ExpressionStatement; + var expression = (root.kind === SyntaxKind.ExpressionStatement ? (root).expression : root); + var target = expression.left; + var value = expression.right; + if (emitParenthesized) { if (root.parent.kind !== SyntaxKind.ParenthesizedExpression) { write("("); } @@ -3886,6 +3912,9 @@ module ts { write(")"); } } + else { + emitDestructuringAssignment(target, value); + } } function emitBindingElement(target: BindingElement, value: Expression) { From 9288424fb3787a52f3288967c288762c08261052 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 13:32:11 -0800 Subject: [PATCH 034/251] Accept baselines --- tests/baselines/reference/ES5For-of1.js | 4 ++-- tests/baselines/reference/ES5For-of12.js | 2 +- tests/baselines/reference/ES5For-of13.js | 4 ++-- tests/baselines/reference/ES5For-of14.js | 4 ++-- tests/baselines/reference/ES5For-of15.js | 8 +++---- tests/baselines/reference/ES5For-of16.js | 8 +++---- tests/baselines/reference/ES5For-of17.js | 8 +++---- tests/baselines/reference/ES5For-of18.js | 8 +++---- tests/baselines/reference/ES5For-of19.js | 8 +++---- tests/baselines/reference/ES5For-of2.js | 4 ++-- tests/baselines/reference/ES5For-of20.js | 8 +++---- tests/baselines/reference/ES5For-of21.js | 8 +++---- tests/baselines/reference/ES5For-of3.js | 4 ++-- tests/baselines/reference/ES5For-of4.js | 4 ++-- tests/baselines/reference/ES5For-of5.js | 4 ++-- tests/baselines/reference/ES5For-of6.js | 8 +++---- tests/baselines/reference/ES5For-of7.js | 8 +++---- .../reference/downlevelLetConst16.js | 22 ++++++++++--------- .../reference/downlevelLetConst17.errors.txt | 3 +-- .../reference/downlevelLetConst17.js | 6 ++--- .../reference/parserES5ForOfStatement10.js | 4 ++-- .../reference/parserES5ForOfStatement11.js | 3 ++- .../reference/parserES5ForOfStatement12.js | 3 ++- .../reference/parserES5ForOfStatement13.js | 3 ++- .../reference/parserES5ForOfStatement14.js | 3 ++- .../reference/parserES5ForOfStatement15.js | 3 ++- .../reference/parserES5ForOfStatement16.js | 3 ++- .../reference/parserES5ForOfStatement18.js | 4 ++-- .../reference/parserES5ForOfStatement3.js | 4 ++-- .../reference/parserES5ForOfStatement4.js | 4 ++-- .../reference/parserES5ForOfStatement5.js | 4 ++-- .../reference/parserES5ForOfStatement6.js | 4 ++-- .../reference/parserES5ForOfStatement7.js | 4 ++-- .../reference/parserES5ForOfStatement8.js | 4 ++-- .../reference/parserES5ForOfStatement9.js | 4 ++-- tests/cases/compiler/downlevelLetConst16.ts | 1 - 36 files changed, 96 insertions(+), 92 deletions(-) diff --git a/tests/baselines/reference/ES5For-of1.js b/tests/baselines/reference/ES5For-of1.js index 8c4bc1038c3..8001d5b537f 100644 --- a/tests/baselines/reference/ES5For-of1.js +++ b/tests/baselines/reference/ES5For-of1.js @@ -2,6 +2,6 @@ for (var v of []) { } //// [ES5For-of1.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; } diff --git a/tests/baselines/reference/ES5For-of12.js b/tests/baselines/reference/ES5For-of12.js index 3dbdd30251c..c3665e8b584 100644 --- a/tests/baselines/reference/ES5For-of12.js +++ b/tests/baselines/reference/ES5For-of12.js @@ -3,5 +3,5 @@ for ([""] of []) { } //// [ES5For-of12.js] for (var _i = 0, _a = []; _i < _a.length; _i++) { - [""] = _a[_i]; + "" = _a[_i][0]; } diff --git a/tests/baselines/reference/ES5For-of13.js b/tests/baselines/reference/ES5For-of13.js index 8c8318e27fd..93aa8dec765 100644 --- a/tests/baselines/reference/ES5For-of13.js +++ b/tests/baselines/reference/ES5For-of13.js @@ -4,7 +4,7 @@ for (let v of []) { } //// [ES5For-of13.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var x = v; } diff --git a/tests/baselines/reference/ES5For-of14.js b/tests/baselines/reference/ES5For-of14.js index d7a35913ef1..1011bc3558c 100644 --- a/tests/baselines/reference/ES5For-of14.js +++ b/tests/baselines/reference/ES5For-of14.js @@ -4,7 +4,7 @@ for (const v of []) { } //// [ES5For-of14.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var x = v; } diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js index 30b896165e5..90ed376b805 100644 --- a/tests/baselines/reference/ES5For-of15.js +++ b/tests/baselines/reference/ES5For-of15.js @@ -7,11 +7,11 @@ for (let v of []) { } //// [ES5For-of15.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; v; - for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - _v = _a_1[_i_1]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var _v = _a_1[_i_1]; var x = _v; } } diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js index 5e15af3f9c3..da1f0e8b337 100644 --- a/tests/baselines/reference/ES5For-of16.js +++ b/tests/baselines/reference/ES5For-of16.js @@ -8,11 +8,11 @@ for (let v of []) { } //// [ES5For-of16.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; v; - for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - _v = _a_1[_i_1]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var _v = _a_1[_i_1]; var x = _v; _v++; } diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js index 5a6cddcb605..e7f059477b5 100644 --- a/tests/baselines/reference/ES5For-of17.js +++ b/tests/baselines/reference/ES5For-of17.js @@ -8,11 +8,11 @@ for (let v of []) { } //// [ES5For-of17.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; v; - for (var _v, _i_1 = 0, _a_1 = [_v]; _i_1 < _a_1.length; _i_1++) { - _v = _a_1[_i_1]; + for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) { + var _v = _a_1[_i_1]; var x = _v; _v++; } diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js index 6bb7a37b579..d55dc1fc5f0 100644 --- a/tests/baselines/reference/ES5For-of18.js +++ b/tests/baselines/reference/ES5For-of18.js @@ -8,11 +8,11 @@ for (let v of []) { //// [ES5For-of18.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; v; } -for (var _v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - _v = _a_1[_i_1]; +for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var _v = _a_1[_i_1]; _v; } diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js index 97718ab0337..48d89d29b4c 100644 --- a/tests/baselines/reference/ES5For-of19.js +++ b/tests/baselines/reference/ES5For-of19.js @@ -10,12 +10,12 @@ for (let v of []) { //// [ES5For-of19.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; v; function foo() { - for (var _v, _i = 0, _a = []; _i < _a.length; _i++) { - _v = _a[_i]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var _v = _a_1[_i_1]; _v; } } diff --git a/tests/baselines/reference/ES5For-of2.js b/tests/baselines/reference/ES5For-of2.js index e057ccbbf3e..3d83df36c76 100644 --- a/tests/baselines/reference/ES5For-of2.js +++ b/tests/baselines/reference/ES5For-of2.js @@ -4,7 +4,7 @@ for (var v of []) { } //// [ES5For-of2.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var x = v; } diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js index 65fb4bfd39e..04b7cca5cc4 100644 --- a/tests/baselines/reference/ES5For-of20.js +++ b/tests/baselines/reference/ES5For-of20.js @@ -7,11 +7,11 @@ for (let v of []) { } //// [ES5For-of20.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var _v; - for (var _v_1, _i_1 = 0, _a_1 = [_v_1]; _i_1 < _a_1.length; _i_1++) { - _v_1 = _a_1[_i_1]; + for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) { + var _v_1 = _a_1[_i_1]; var _v_2; } } diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js index f616c328ca0..c6eac5d0e5e 100644 --- a/tests/baselines/reference/ES5For-of21.js +++ b/tests/baselines/reference/ES5For-of21.js @@ -4,9 +4,9 @@ for (let v of []) { } //// [ES5For-of21.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; - for (var _i_1, _i_2 = 0, _a_1 = []; _i_2 < _a_1.length; _i_2++) { - _i_1 = _a_1[_i_2]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var _i_2 = _a_1[_i_1]; } } diff --git a/tests/baselines/reference/ES5For-of3.js b/tests/baselines/reference/ES5For-of3.js index 3bb7cf63885..c36110443b4 100644 --- a/tests/baselines/reference/ES5For-of3.js +++ b/tests/baselines/reference/ES5For-of3.js @@ -3,7 +3,7 @@ for (var v of []) var x = v; //// [ES5For-of3.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var x = v; } diff --git a/tests/baselines/reference/ES5For-of4.js b/tests/baselines/reference/ES5For-of4.js index ee36de0a3af..44d486dddf0 100644 --- a/tests/baselines/reference/ES5For-of4.js +++ b/tests/baselines/reference/ES5For-of4.js @@ -4,8 +4,8 @@ for (var v of []) var y = v; //// [ES5For-of4.js] -for (var v, _i = 0, _a = []; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var v = _a[_i]; var x = v; } var y = v; diff --git a/tests/baselines/reference/ES5For-of5.js b/tests/baselines/reference/ES5For-of5.js index 0dfb430ca44..31229635c35 100644 --- a/tests/baselines/reference/ES5For-of5.js +++ b/tests/baselines/reference/ES5For-of5.js @@ -4,7 +4,7 @@ for (var _a of []) { } //// [ES5For-of5.js] -for (var _a, _i = 0, _a_1 = []; _i < _a_1.length; _i++) { - _a = _a_1[_i]; +for (var _i = 0, _a_1 = []; _i < _a_1.length; _i++) { + var _a = _a_1[_i]; var x = _a; } diff --git a/tests/baselines/reference/ES5For-of6.js b/tests/baselines/reference/ES5For-of6.js index e7c81743509..e0b134407c0 100644 --- a/tests/baselines/reference/ES5For-of6.js +++ b/tests/baselines/reference/ES5For-of6.js @@ -6,10 +6,10 @@ for (var w of []) { } //// [ES5For-of6.js] -for (var w, _i = 0, _a = []; _i < _a.length; _i++) { - w = _a[_i]; - for (var v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - v = _a_1[_i_1]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var w = _a[_i]; + for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var v = _a_1[_i_1]; var x = [w, v]; } } diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js index 8b2355d9ad6..d149001509c 100644 --- a/tests/baselines/reference/ES5For-of7.js +++ b/tests/baselines/reference/ES5For-of7.js @@ -8,11 +8,11 @@ for (var v of []) { } //// [ES5For-of7.js] -for (var w, _i = 0, _a = []; _i < _a.length; _i++) { - w = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var w = _a[_i]; var x = w; } -for (var v, _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - v = _a_1[_i_1]; +for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { + var v = _a_1[_i_1]; var x = [w, v]; } diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index 8998ad23540..7bd860fc197 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -185,7 +185,6 @@ function foo6() { use(x); } -// TODO: once for-of is supported downlevel function foo7() { for (let x of []) { use(x); @@ -402,41 +401,44 @@ function foo6() { } use(x); } -// TODO: once for-of is supported downlevel function foo7() { - for (var _x, _i = 0, _a = []; _i < _a.length; _i++) { - _x = _a[_i]; + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i]; use(_x); } use(x); } function foo8() { - for (var _x = (void 0)[0] of []) { + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i][0]; use(_x); } use(x); } function foo9() { - for (var _x = (void 0).a of []) { + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i].a; use(_x); } use(x); } function foo10() { - for (var _x, _i = 0, _a = []; _i < _a.length; _i++) { - _x = _a[_i]; + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i]; use(_x); } use(x); } function foo11() { - for (var _x = (void 0)[0] of []) { + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i][0]; use(_x); } use(x); } function foo12() { - for (var _x = (void 0).a of []) { + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x = _a[_i].a; use(_x); } use(x); diff --git a/tests/baselines/reference/downlevelLetConst17.errors.txt b/tests/baselines/reference/downlevelLetConst17.errors.txt index ef8f2b89085..6183bab9430 100644 --- a/tests/baselines/reference/downlevelLetConst17.errors.txt +++ b/tests/baselines/reference/downlevelLetConst17.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/downlevelLetConst17.ts(66,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst17.ts(65,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. ==== tests/cases/compiler/downlevelLetConst17.ts (1 errors) ==== @@ -66,7 +66,6 @@ tests/cases/compiler/downlevelLetConst17.ts(66,1): error TS2482: 'for...of' stat use(x); } - // TODO: update once for-of statements are supported downlevel for (const x of []) { ~~~ !!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. diff --git a/tests/baselines/reference/downlevelLetConst17.js b/tests/baselines/reference/downlevelLetConst17.js index d0ad931bd8f..d38ec3fde08 100644 --- a/tests/baselines/reference/downlevelLetConst17.js +++ b/tests/baselines/reference/downlevelLetConst17.js @@ -63,7 +63,6 @@ for (const x in []) { use(x); } -// TODO: update once for-of statements are supported downlevel for (const x of []) { use(x); } @@ -118,8 +117,7 @@ for (var _x_10 in []) { for (var _x_11 in []) { use(_x_11); } -// TODO: update once for-of statements are supported downlevel -for (var _x_12, _i = 0, _a = []; _i < _a.length; _i++) { - _x_12 = _a[_i]; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _x_12 = _a[_i]; use(_x_12); } diff --git a/tests/baselines/reference/parserES5ForOfStatement10.js b/tests/baselines/reference/parserES5ForOfStatement10.js index 13a5defecb6..e3e339b0972 100644 --- a/tests/baselines/reference/parserES5ForOfStatement10.js +++ b/tests/baselines/reference/parserES5ForOfStatement10.js @@ -3,6 +3,6 @@ for (const v of X) { } //// [parserES5ForOfStatement10.js] -for (var v, _i = 0, _a = X; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var v = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement11.js b/tests/baselines/reference/parserES5ForOfStatement11.js index 45a24b109c0..318909b3728 100644 --- a/tests/baselines/reference/parserES5ForOfStatement11.js +++ b/tests/baselines/reference/parserES5ForOfStatement11.js @@ -3,5 +3,6 @@ for (const [a, b] of X) { } //// [parserES5ForOfStatement11.js] -for (var _a = void 0, a = _a[0], b = _a[1] of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement12.js b/tests/baselines/reference/parserES5ForOfStatement12.js index 30beac5118c..5e1e3b50032 100644 --- a/tests/baselines/reference/parserES5ForOfStatement12.js +++ b/tests/baselines/reference/parserES5ForOfStatement12.js @@ -3,5 +3,6 @@ for (const {a, b} of X) { } //// [parserES5ForOfStatement12.js] -for (var _a = void 0, a = _a.a, b = _a.b of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement13.js b/tests/baselines/reference/parserES5ForOfStatement13.js index 3fac359c675..aa3bd712a3b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement13.js +++ b/tests/baselines/reference/parserES5ForOfStatement13.js @@ -3,5 +3,6 @@ for (let {a, b} of X) { } //// [parserES5ForOfStatement13.js] -for (var _a = void 0, a = _a.a, b = _a.b of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement14.js b/tests/baselines/reference/parserES5ForOfStatement14.js index 6d1fbbddd67..4e31742d94c 100644 --- a/tests/baselines/reference/parserES5ForOfStatement14.js +++ b/tests/baselines/reference/parserES5ForOfStatement14.js @@ -3,5 +3,6 @@ for (let [a, b] of X) { } //// [parserES5ForOfStatement14.js] -for (var _a = void 0, a = _a[0], b = _a[1] of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement15.js b/tests/baselines/reference/parserES5ForOfStatement15.js index efca0b289f6..4df81205333 100644 --- a/tests/baselines/reference/parserES5ForOfStatement15.js +++ b/tests/baselines/reference/parserES5ForOfStatement15.js @@ -3,5 +3,6 @@ for (var [a, b] of X) { } //// [parserES5ForOfStatement15.js] -for (var _a = void 0, a = _a[0], b = _a[1] of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement16.js b/tests/baselines/reference/parserES5ForOfStatement16.js index 102e91685c3..a944fdb5a5f 100644 --- a/tests/baselines/reference/parserES5ForOfStatement16.js +++ b/tests/baselines/reference/parserES5ForOfStatement16.js @@ -3,5 +3,6 @@ for (var {a, b} of X) { } //// [parserES5ForOfStatement16.js] -for (var _a = void 0, a = _a.a, b = _a.b of X) { +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js index 76a4610d74b..02aa0b59422 100644 --- a/tests/baselines/reference/parserES5ForOfStatement18.js +++ b/tests/baselines/reference/parserES5ForOfStatement18.js @@ -2,6 +2,6 @@ for (var of of of) { } //// [parserES5ForOfStatement18.js] -for (var of, _i = 0, _a = of; _i < _a.length; _i++) { - of = _a[_i]; +for (var _i = 0, _a = of; _i < _a.length; _i++) { + var of = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement3.js b/tests/baselines/reference/parserES5ForOfStatement3.js index fd021d578d5..8e4e5b9e426 100644 --- a/tests/baselines/reference/parserES5ForOfStatement3.js +++ b/tests/baselines/reference/parserES5ForOfStatement3.js @@ -3,6 +3,6 @@ for (var a, b of X) { } //// [parserES5ForOfStatement3.js] -for (var a, _i = 0, _a = X; _i < _a.length; _i++) { - a = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js index 81184fc7225..751753da14b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement4.js +++ b/tests/baselines/reference/parserES5ForOfStatement4.js @@ -3,6 +3,6 @@ for (var a = 1 of X) { } //// [parserES5ForOfStatement4.js] -for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { - a = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var a = 1 = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement5.js b/tests/baselines/reference/parserES5ForOfStatement5.js index 2c4a997a393..fe0471f4d4f 100644 --- a/tests/baselines/reference/parserES5ForOfStatement5.js +++ b/tests/baselines/reference/parserES5ForOfStatement5.js @@ -3,6 +3,6 @@ for (var a: number of X) { } //// [parserES5ForOfStatement5.js] -for (var a, _i = 0, _a = X; _i < _a.length; _i++) { - a = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var a = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js index be7054234ff..2e01da0a0c4 100644 --- a/tests/baselines/reference/parserES5ForOfStatement6.js +++ b/tests/baselines/reference/parserES5ForOfStatement6.js @@ -3,6 +3,6 @@ for (var a = 1, b = 2 of X) { } //// [parserES5ForOfStatement6.js] -for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { - a = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var a = 1 = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js index fea53d7ec2f..845bec0e2cc 100644 --- a/tests/baselines/reference/parserES5ForOfStatement7.js +++ b/tests/baselines/reference/parserES5ForOfStatement7.js @@ -3,6 +3,6 @@ for (var a: number = 1, b: string = "" of X) { } //// [parserES5ForOfStatement7.js] -for (var a = 1, _i = 0, _a = X; _i < _a.length; _i++) { - a = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var a = 1 = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement8.js b/tests/baselines/reference/parserES5ForOfStatement8.js index fa42d260fa5..bd20d375502 100644 --- a/tests/baselines/reference/parserES5ForOfStatement8.js +++ b/tests/baselines/reference/parserES5ForOfStatement8.js @@ -3,6 +3,6 @@ for (var v of X) { } //// [parserES5ForOfStatement8.js] -for (var v, _i = 0, _a = X; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var v = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement9.js b/tests/baselines/reference/parserES5ForOfStatement9.js index 612a5ec63a9..3da36ecdd5b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement9.js +++ b/tests/baselines/reference/parserES5ForOfStatement9.js @@ -3,6 +3,6 @@ for (let v of X) { } //// [parserES5ForOfStatement9.js] -for (var v, _i = 0, _a = X; _i < _a.length; _i++) { - v = _a[_i]; +for (var _i = 0, _a = X; _i < _a.length; _i++) { + var v = _a[_i]; } diff --git a/tests/cases/compiler/downlevelLetConst16.ts b/tests/cases/compiler/downlevelLetConst16.ts index 2d592d253c9..30a27ba61f4 100644 --- a/tests/cases/compiler/downlevelLetConst16.ts +++ b/tests/cases/compiler/downlevelLetConst16.ts @@ -185,7 +185,6 @@ function foo6() { use(x); } -// TODO: once for-of is supported downlevel function foo7() { for (let x of []) { use(x); From 4d3265088b183dcbcbcd08eac5cabf3280716fb7 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 14:38:22 -0800 Subject: [PATCH 035/251] Revert change to createTempVariable --- src/compiler/emitter.ts | 20 +++- tests/baselines/reference/ES5For-of18.js | 4 +- tests/baselines/reference/ES5For-of19.js | 4 +- tests/baselines/reference/ES5For-of21.js | 4 +- tests/baselines/reference/ES5For-of5.js | 4 +- tests/baselines/reference/ES5For-of7.js | 4 +- tests/baselines/reference/callWithSpread.js | 6 +- .../collisionRestParameterArrowFunctions.js | 8 +- .../collisionRestParameterClassConstructor.js | 16 ++-- .../collisionRestParameterClassMethod.js | 12 +-- .../collisionRestParameterFunction.js | 12 +-- ...llisionRestParameterFunctionExpressions.js | 12 +-- .../collisionRestParameterUnderscoreIUsage.js | 4 +- .../reference/computedPropertyNames48_ES5.js | 14 +-- .../reference/declarationWithNoInitializer.js | 2 +- .../reference/declarationsAndAssignments.js | 92 +++++++++---------- .../destructuringParameterProperties1.js | 2 +- .../destructuringParameterProperties2.js | 4 +- .../destructuringParameterProperties3.js | 6 +- .../destructuringParameterProperties5.js | 2 +- .../reference/parserES5ForOfStatement11.js | 2 +- .../reference/parserES5ForOfStatement12.js | 2 +- .../reference/parserES5ForOfStatement13.js | 2 +- .../reference/parserES5ForOfStatement14.js | 2 +- .../reference/parserES5ForOfStatement15.js | 2 +- .../reference/parserES5ForOfStatement16.js | 2 +- .../reference/parserES5ForOfStatement2.js | 2 +- .../reference/parserES5ForOfStatement21.js | 2 +- .../reference/restElementMustBeLast.js | 4 +- .../restElementWithNullInitializer.js | 8 +- ...gedTemplateStringsTypeArgumentInference.js | 56 +++++------ ...emplateStringsWithIncompatibleTypedTags.js | 18 ++-- ...dTemplateStringsWithOverloadResolution1.js | 12 +-- ...dTemplateStringsWithOverloadResolution2.js | 4 +- ...dTemplateStringsWithOverloadResolution3.js | 44 ++++----- ...taggedTemplateStringsWithTagsTypedAsAny.js | 20 ++-- .../taggedTemplateStringsWithTypedTags.js | 16 ++-- .../reference/templateStringInModuleName.js | 4 +- 38 files changed, 226 insertions(+), 208 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d2ec35bb494..4eb2b3a8842 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1580,6 +1580,7 @@ module ts { var generatedBlockScopeNames: string[]; var extendsEmitted = false; + var tempCount = 0; var tempVariables: Identifier[]; var tempParameters: Identifier[]; var externalImports: ExternalImportInfo[]; @@ -2089,7 +2090,15 @@ module ts { // Create a temporary variable with a unique unused name. The forLoopVariable parameter signals that the // name should be one that is appropriate for a for loop variable. function createTempVariable(location: Node, forLoopVariable?: boolean): Identifier { - var name = generateUniqueNameForLocation(location, /*baseName*/ forLoopVariable ? "_i" : "_a"); + var name = forLoopVariable ? "_i" : undefined; + while (true) { + if (name && !isExistingName(location, name)) { + break; + } + // _a .. _h, _j ... _z, _0, _1, ... + name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + CharacterCodes.a) : tempCount - 25); + tempCount++; + } var result = createSynthesizedNode(SyntaxKind.Identifier); result.text = name; return result; @@ -4259,8 +4268,10 @@ module ts { } function emitSignatureAndBody(node: FunctionLikeDeclaration) { + var saveTempCount = tempCount; var saveTempVariables = tempVariables; var saveTempParameters = tempParameters; + tempCount = 0; tempVariables = undefined; tempParameters = undefined; @@ -4299,6 +4310,7 @@ module ts { exitNameScope(popFrame); + tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; } @@ -4613,8 +4625,10 @@ module ts { } function emitConstructorOfClass() { + var saveTempCount = tempCount; var saveTempVariables = tempVariables; var saveTempParameters = tempParameters; + tempCount = 0; tempVariables = undefined; tempParameters = undefined; @@ -4683,6 +4697,7 @@ module ts { exitNameScope(popFrame); + tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; } @@ -4810,13 +4825,16 @@ module ts { emitEnd(node.name); write(") "); if (node.body.kind === SyntaxKind.ModuleBlock) { + var saveTempCount = tempCount; var saveTempVariables = tempVariables; + tempCount = 0; tempVariables = undefined; var popFrame = enterNameScope(); emit(node.body); exitNameScope(popFrame); + tempCount = saveTempCount; tempVariables = saveTempVariables; } else { diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js index d55dc1fc5f0..656d4f57233 100644 --- a/tests/baselines/reference/ES5For-of18.js +++ b/tests/baselines/reference/ES5For-of18.js @@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; } -for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var _v = _a_1[_i_1]; +for (var _i = 0, _b = []; _i < _b.length; _i++) { + var _v = _b[_i]; _v; } diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js index 48d89d29b4c..9ff3f9aca2a 100644 --- a/tests/baselines/reference/ES5For-of19.js +++ b/tests/baselines/reference/ES5For-of19.js @@ -14,8 +14,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; function foo() { - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var _v = _a_1[_i_1]; + for (var _i = 0, _a = []; _i < _a.length; _i++) { + var _v = _a[_i]; _v; } } diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js index c6eac5d0e5e..e23ea282998 100644 --- a/tests/baselines/reference/ES5For-of21.js +++ b/tests/baselines/reference/ES5For-of21.js @@ -6,7 +6,7 @@ for (let v of []) { //// [ES5For-of21.js] for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var _i_2 = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + var _i = _c[_b]; } } diff --git a/tests/baselines/reference/ES5For-of5.js b/tests/baselines/reference/ES5For-of5.js index 31229635c35..8e1a37db061 100644 --- a/tests/baselines/reference/ES5For-of5.js +++ b/tests/baselines/reference/ES5For-of5.js @@ -4,7 +4,7 @@ for (var _a of []) { } //// [ES5For-of5.js] -for (var _i = 0, _a_1 = []; _i < _a_1.length; _i++) { - var _a = _a_1[_i]; +for (var _i = 0, _b = []; _i < _b.length; _i++) { + var _a = _b[_i]; var x = _a; } diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js index d149001509c..474cb2749ad 100644 --- a/tests/baselines/reference/ES5For-of7.js +++ b/tests/baselines/reference/ES5For-of7.js @@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var w = _a[_i]; var x = w; } -for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var v = _a_1[_i_1]; +for (var _i = 0, _b = []; _i < _b.length; _i++) { + var v = _b[_i]; var x = [w, v]; } diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js index 02b6b9b8ff6..d676c0f2a33 100644 --- a/tests/baselines/reference/callWithSpread.js +++ b/tests/baselines/reference/callWithSpread.js @@ -81,8 +81,8 @@ obj.foo.apply(obj, [1, 2].concat(a)); obj.foo.apply(obj, [1, 2].concat(a, ["abc"])); xa[1].foo(1, 2, "abc"); (_a = xa[1]).foo.apply(_a, [1, 2].concat(a)); -(_a_1 = xa[1]).foo.apply(_a_1, [1, 2].concat(a, ["abc"])); -(_a_2 = xa[1]).foo.apply(_a_2, [1, 2, "abc"]); +(_b = xa[1]).foo.apply(_b, [1, 2].concat(a, ["abc"])); +(_c = xa[1]).foo.apply(_c, [1, 2, "abc"]); var C = (function () { function C(x, y) { var z = []; @@ -114,4 +114,4 @@ var D = (function (_super) { })(C); // Only supported in when target is ES6 var c = new C(1, 2, ...a); -var _a, _a_1, _a_2; +var _a, _b, _c; diff --git a/tests/baselines/reference/collisionRestParameterArrowFunctions.js b/tests/baselines/reference/collisionRestParameterArrowFunctions.js index b70bb6c2113..39d449555db 100644 --- a/tests/baselines/reference/collisionRestParameterArrowFunctions.js +++ b/tests/baselines/reference/collisionRestParameterArrowFunctions.js @@ -16,8 +16,8 @@ var f2NoError = () => { //// [collisionRestParameterArrowFunctions.js] var f1 = function (_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } var _i = 10; // no error }; @@ -26,8 +26,8 @@ var f1NoError = function (_i) { }; var f2 = function () { var restParameters = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + restParameters[_a - 0] = arguments[_a]; } var _i = 10; // No Error }; diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js index de3fd3c671b..fc6e400668c 100644 --- a/tests/baselines/reference/collisionRestParameterClassConstructor.js +++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js @@ -71,8 +71,8 @@ declare class c6NoError { var c1 = (function () { function c1(_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } var _i = 10; // no error } @@ -87,8 +87,8 @@ var c1NoError = (function () { var c2 = (function () { function c2() { var restParameters = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + restParameters[_a - 0] = arguments[_a]; } var _i = 10; // no error } @@ -103,8 +103,8 @@ var c2NoError = (function () { var c3 = (function () { function c3(_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } this._i = _i; var _i = 10; // no error @@ -121,8 +121,8 @@ var c3NoError = (function () { var c5 = (function () { function c5(_i) { var rest = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - rest[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + rest[_a - 1] = arguments[_a]; } var _i; // no error } diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js index 3478dda615f..e3471c85f1c 100644 --- a/tests/baselines/reference/collisionRestParameterClassMethod.js +++ b/tests/baselines/reference/collisionRestParameterClassMethod.js @@ -44,8 +44,8 @@ var c1 = (function () { } c1.prototype.foo = function (_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } var _i = 10; // no error }; @@ -54,8 +54,8 @@ var c1 = (function () { }; c1.prototype.f4 = function (_i) { var rest = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - rest[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + rest[_a - 1] = arguments[_a]; } var _i; // no error }; @@ -69,8 +69,8 @@ var c3 = (function () { } c3.prototype.foo = function () { var restParameters = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + restParameters[_a - 0] = arguments[_a]; } var _i = 10; // no error }; diff --git a/tests/baselines/reference/collisionRestParameterFunction.js b/tests/baselines/reference/collisionRestParameterFunction.js index 98c2b2296ee..8660e8f5db0 100644 --- a/tests/baselines/reference/collisionRestParameterFunction.js +++ b/tests/baselines/reference/collisionRestParameterFunction.js @@ -37,8 +37,8 @@ declare function f6(_i: string); // no codegen no error // Functions function f1(_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } var _i = 10; // no error } @@ -47,8 +47,8 @@ function f1NoError(_i) { } function f3() { var restParameters = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + restParameters[_a - 0] = arguments[_a]; } var _i = 10; // no error } @@ -57,8 +57,8 @@ function f3NoError() { } function f4(_i) { var rest = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - rest[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + rest[_a - 1] = arguments[_a]; } } function f4NoError(_i) { diff --git a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js index 478446bd5e0..22709b087eb 100644 --- a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js +++ b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js @@ -28,8 +28,8 @@ function foo() { function foo() { function f1(_i) { var restParameters = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + restParameters[_a - 1] = arguments[_a]; } var _i = 10; // no error } @@ -38,8 +38,8 @@ function foo() { } function f3() { var restParameters = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - restParameters[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + restParameters[_a - 0] = arguments[_a]; } var _i = 10; // no error } @@ -48,8 +48,8 @@ function foo() { } function f4(_i) { var rest = []; - for (var _i_1 = 1; _i_1 < arguments.length; _i_1++) { - rest[_i_1 - 1] = arguments[_i_1]; + for (var _a = 1; _a < arguments.length; _a++) { + rest[_a - 1] = arguments[_a]; } } function f4NoError(_i) { diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js index 9316dba316f..adc9c09de27 100644 --- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js +++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js @@ -13,8 +13,8 @@ var _i = "This is what I'd expect to see"; var Foo = (function () { function Foo() { var args = []; - for (var _i_1 = 0; _i_1 < arguments.length; _i_1++) { - args[_i_1 - 0] = arguments[_i_1]; + for (var _a = 0; _a < arguments.length; _a++) { + args[_a - 0] = arguments[_a]; } console.log(_i); // This should result in error } diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.js b/tests/baselines/reference/computedPropertyNames48_ES5.js index d14faab73eb..c5ca0d5b241 100644 --- a/tests/baselines/reference/computedPropertyNames48_ES5.js +++ b/tests/baselines/reference/computedPropertyNames48_ES5.js @@ -26,10 +26,10 @@ var a; extractIndexer((_a = {}, _a[a] = "", _a)); // Should return string -extractIndexer((_a_1 = {}, - _a_1[0 /* x */] = "", - _a_1)); // Should return string -extractIndexer((_a_2 = {}, - _a_2["" || 0] = "", - _a_2)); // Should return any (widened form of undefined) -var _a, _a_1, _a_2; +extractIndexer((_b = {}, + _b[0 /* x */] = "", + _b)); // Should return string +extractIndexer((_c = {}, + _c["" || 0] = "", + _c)); // Should return any (widened form of undefined) +var _a, _b, _c; diff --git a/tests/baselines/reference/declarationWithNoInitializer.js b/tests/baselines/reference/declarationWithNoInitializer.js index ebe8f8b3b38..54d89368fb1 100644 --- a/tests/baselines/reference/declarationWithNoInitializer.js +++ b/tests/baselines/reference/declarationWithNoInitializer.js @@ -5,4 +5,4 @@ var {c, d}; // Error, no initializer //// [declarationWithNoInitializer.js] var _a = void 0, a = _a[0], b = _a[1]; // Error, no initializer -var _a_1 = void 0, c = _a_1.c, d = _a_1.d; // Error, no initializer +var _b = void 0, c = _b.c, d = _b.d; // Error, no initializer diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js index 3e67309663c..032f4cb0e63 100644 --- a/tests/baselines/reference/declarationsAndAssignments.js +++ b/tests/baselines/reference/declarationsAndAssignments.js @@ -184,9 +184,9 @@ function f21() { function f0() { var _a = [1, "hello"]; var x = ([1, "hello"])[0]; - var _a_1 = [1, "hello"], x = _a_1[0], y = _a_1[1]; - var _a_2 = [1, "hello"], x = _a_2[0], y = _a_2[1], z = _a_2[2]; // Error - var _a_3 = [0, 1, 2], z = _a_3[2]; + var _b = [1, "hello"], x = _b[0], y = _b[1]; + var _c = [1, "hello"], x = _c[0], y = _c[1], z = _c[2]; // Error + var _d = [0, 1, 2], z = _d[2]; var x; var y; } @@ -203,60 +203,60 @@ function f2() { var _a = { x: 5, y: "hello" }; var x = ({ x: 5, y: "hello" }).x; var y = ({ x: 5, y: "hello" }).y; - var _a_1 = { x: 5, y: "hello" }, x = _a_1.x, y = _a_1.y; + var _b = { x: 5, y: "hello" }, x = _b.x, y = _b.y; var x; var y; var a = ({ x: 5, y: "hello" }).x; var b = ({ x: 5, y: "hello" }).y; - var _a_2 = { x: 5, y: "hello" }, a = _a_2.x, b = _a_2.y; + var _c = { x: 5, y: "hello" }, a = _c.x, b = _c.y; var a; var b; } function f3() { - var _a = [1, ["hello", [true]]], x = _a[0], _a_1 = _a[1], y = _a_1[0], z = _a_1[1][0]; + var _a = [1, ["hello", [true]]], x = _a[0], _b = _a[1], y = _b[0], z = _b[1][0]; var x; var y; var z; } function f4() { - var _a = { a: 1, b: { a: "hello", b: { a: true } } }, x = _a.a, _a_1 = _a.b, y = _a_1.a, z = _a_1.b.a; + var _a = { a: 1, b: { a: "hello", b: { a: true } } }, x = _a.a, _b = _a.b, y = _b.a, z = _b.b.a; var x; var y; var z; } function f6() { - var _a = [1, "hello"], _a_1 = _a[0], x = _a_1 === void 0 ? 0 : _a_1, _a_2 = _a[1], y = _a_2 === void 0 ? "" : _a_2; + var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? "" : _c; var x; var y; } function f7() { - var _a = [1, "hello"], _a_1 = _a[0], x = _a_1 === void 0 ? 0 : _a_1, _a_2 = _a[1], y = _a_2 === void 0 ? 1 : _a_2; // Error, initializer for y must be string + var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? 1 : _c; // Error, initializer for y must be string var x; var y; } function f8() { var _a = [], a = _a[0], b = _a[1], c = _a[2]; // Ok, [] is an array - var _a_1 = [1], d = _a_1[0], e = _a_1[1], f = _a_1[2]; // Error, [1] is a tuple + var _b = [1], d = _b[0], e = _b[1], f = _b[2]; // Error, [1] is a tuple } function f9() { var _a = {}, a = _a[0], b = _a[1]; // Error, not array type - var _a_1 = { 0: 10, 1: 20 }, c = _a_1[0], d = _a_1[1]; // Error, not array type - var _a_2 = [10, 20], e = _a_2[0], f = _a_2[1]; + var _b = { 0: 10, 1: 20 }, c = _b[0], d = _b[1]; // Error, not array type + var _c = [10, 20], e = _c[0], f = _c[1]; } function f10() { var _a = {}, a = _a.a, b = _a.b; // Error - var _a_1 = [], a = _a_1.a, b = _a_1.b; // Error + var _b = [], a = _b.a, b = _b.b; // Error } function f11() { var _a = { x: 10, y: "hello" }, a = _a.x, b = _a.y; - var _a_1 = { 0: 10, 1: "hello" }, a = _a_1[0], b = _a_1[1]; - var _a_2 = { "<": 10, ">": "hello" }, a = _a_2["<"], b = _a_2[">"]; - var _a_3 = [10, "hello"], a = _a_3[0], b = _a_3[1]; + var _b = { 0: 10, 1: "hello" }, a = _b[0], b = _b[1]; + var _c = { "<": 10, ">": "hello" }, a = _c["<"], b = _c[">"]; + var _d = [10, "hello"], a = _d[0], b = _d[1]; var a; var b; } function f12() { - var _a = [1, ["hello", { x: 5, y: true }]], a = _a[0], _a_1 = _a[1], _a_2 = _a_1 === void 0 ? ["abc", { x: 10, y: false }] : _a_1, b = _a_2[0], _a_3 = _a_2[1], x = _a_3.x, c = _a_3.y; + var _a = [1, ["hello", { x: 5, y: true }]], a = _a[0], _b = _a[1], _c = _b === void 0 ? ["abc", { x: 10, y: false }] : _b, b = _c[0], _d = _c[1], x = _d.x, c = _d.y; var a; var b; var x; @@ -264,10 +264,10 @@ function f12() { } function f13() { var _a = [1, "hello"], x = _a[0], y = _a[1]; - var _a_1 = [[x, y], { x: x, y: y }], a = _a_1[0], b = _a_1[1]; + var _b = [[x, y], { x: x, y: y }], a = _b[0], b = _b[1]; } function f14(_a) { - var _a_1 = _a[0], a = _a_1 === void 0 ? 1 : _a_1, _a_2 = _a[1], _a_3 = _a_2[0], b = _a_3 === void 0 ? "hello" : _a_3, _a_4 = _a_2[1], x = _a_4.x, _a_5 = _a_4.y, c = _a_5 === void 0 ? false : _a_5; + var _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], _d = _c[0], b = _d === void 0 ? "hello" : _d, _e = _c[1], x = _e.x, _f = _e.y, c = _f === void 0 ? false : _f; var a; var b; var c; @@ -290,7 +290,7 @@ function f16() { var _a = f15(), a = _a.a, b = _a.b, c = _a.c; } function f17(_a) { - var _a_1 = _a.a, a = _a_1 === void 0 ? "" : _a_1, _a_2 = _a.b, b = _a_2 === void 0 ? 0 : _a_2, _a_3 = _a.c, c = _a_3 === void 0 ? false : _a_3; + var _b = _a.a, a = _b === void 0 ? "" : _b, _c = _a.b, b = _c === void 0 ? 0 : _c, _d = _a.c, c = _d === void 0 ? false : _d; } f17({}); f17({ a: "hello" }); @@ -301,20 +301,20 @@ function f18() { var b; var aa; (_a = { a: a, b: b }, a = _a.a, b = _a.b, _a); - (_a_1 = { b: b, a: a }, a = _a_1.a, b = _a_1.b, _a_1); - _a_2 = [a, b], aa[0] = _a_2[0], b = _a_2[1]; - _a_3 = [b, a], a = _a_3[0], b = _a_3[1]; // Error - _a_4 = [2, "def"], _a_5 = _a_4[0], a = _a_5 === void 0 ? 1 : _a_5, _a_6 = _a_4[1], b = _a_6 === void 0 ? "abc" : _a_6; - var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6; + (_b = { b: b, a: a }, a = _b.a, b = _b.b, _b); + _c = [a, b], aa[0] = _c[0], b = _c[1]; + _d = [b, a], a = _d[0], b = _d[1]; // Error + _e = [2, "def"], _f = _e[0], a = _f === void 0 ? 1 : _f, _g = _e[1], b = _g === void 0 ? "abc" : _g; + var _a, _b, _c, _d, _e, _f, _g; } function f19() { var a, b; _a = [1, 2], a = _a[0], b = _a[1]; - _a_1 = [b, a], a = _a_1[0], b = _a_1[1]; - (_a_2 = { b: b, a: a }, a = _a_2.a, b = _a_2.b, _a_2); - _a_3 = ([[2, 3]])[0], _a_4 = _a_3 === void 0 ? [1, 2] : _a_3, a = _a_4[0], b = _a_4[1]; - var x = (_a_5 = [1, 2], a = _a_5[0], b = _a_5[1], _a_5); - var _a, _a_1, _a_2, _a_3, _a_4, _a_5; + _b = [b, a], a = _b[0], b = _b[1]; + (_c = { b: b, a: a }, a = _c.a, b = _c.b, _c); + _d = ([[2, 3]])[0], _e = _d === void 0 ? [1, 2] : _d, a = _e[0], b = _e[1]; + var x = (_f = [1, 2], a = _f[0], b = _f[1], _f); + var _a, _b, _c, _d, _e, _f; } function f20() { var a; @@ -322,14 +322,14 @@ function f20() { var y; var z; var _a = [1, 2, 3], a = _a.slice(0); - var _a_1 = [1, 2, 3], x = _a_1[0], a = _a_1.slice(1); - var _a_2 = [1, 2, 3], x = _a_2[0], y = _a_2[1], a = _a_2.slice(2); - var _a_3 = [1, 2, 3], x = _a_3[0], y = _a_3[1], z = _a_3[2], a = _a_3.slice(3); - _a_4 = [1, 2, 3], a = _a_4.slice(0); - _a_5 = [1, 2, 3], x = _a_5[0], a = _a_5.slice(1); - _a_6 = [1, 2, 3], x = _a_6[0], y = _a_6[1], a = _a_6.slice(2); - _a_7 = [1, 2, 3], x = _a_7[0], y = _a_7[1], z = _a_7[2], a = _a_7.slice(3); - var _a_4, _a_5, _a_6, _a_7; + var _b = [1, 2, 3], x = _b[0], a = _b.slice(1); + var _c = [1, 2, 3], x = _c[0], y = _c[1], a = _c.slice(2); + var _d = [1, 2, 3], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); + _e = [1, 2, 3], a = _e.slice(0); + _f = [1, 2, 3], x = _f[0], a = _f.slice(1); + _g = [1, 2, 3], x = _g[0], y = _g[1], a = _g.slice(2); + _h = [1, 2, 3], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); + var _e, _f, _g, _h; } function f21() { var a; @@ -337,12 +337,12 @@ function f21() { var y; var z; var _a = [1, "hello", true], a = _a.slice(0); - var _a_1 = [1, "hello", true], x = _a_1[0], a = _a_1.slice(1); - var _a_2 = [1, "hello", true], x = _a_2[0], y = _a_2[1], a = _a_2.slice(2); - var _a_3 = [1, "hello", true], x = _a_3[0], y = _a_3[1], z = _a_3[2], a = _a_3.slice(3); - _a_4 = [1, "hello", true], a = _a_4.slice(0); - _a_5 = [1, "hello", true], x = _a_5[0], a = _a_5.slice(1); - _a_6 = [1, "hello", true], x = _a_6[0], y = _a_6[1], a = _a_6.slice(2); - _a_7 = [1, "hello", true], x = _a_7[0], y = _a_7[1], z = _a_7[2], a = _a_7.slice(3); - var _a_4, _a_5, _a_6, _a_7; + var _b = [1, "hello", true], x = _b[0], a = _b.slice(1); + var _c = [1, "hello", true], x = _c[0], y = _c[1], a = _c.slice(2); + var _d = [1, "hello", true], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); + _e = [1, "hello", true], a = _e.slice(0); + _f = [1, "hello", true], x = _f[0], a = _f.slice(1); + _g = [1, "hello", true], x = _g[0], y = _g[1], a = _g.slice(2); + _h = [1, "hello", true], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); + var _e, _f, _g, _h; } diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js index 5842d68b605..cc16cc78de5 100644 --- a/tests/baselines/reference/destructuringParameterProperties1.js +++ b/tests/baselines/reference/destructuringParameterProperties1.js @@ -58,4 +58,4 @@ var c2 = new C2(["10", 10, !!10]); var _a = [c2.x, c2.y, c2.z], c2_x = _a[0], c2_y = _a[1], c2_z = _a[2]; var c3 = new C3({ x: 0, y: "", z: false }); c3 = new C3({ x: 0, "y": "y", z: true }); -var _a_1 = [c3.x, c3.y, c3.z], c3_x = _a_1[0], c3_y = _a_1[1], c3_z = _a_1[2]; +var _b = [c3.x, c3.y, c3.z], c3_x = _b[0], c3_y = _b[1], c3_z = _b[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js index 75b00d2ddfd..27e190af62f 100644 --- a/tests/baselines/reference/destructuringParameterProperties2.js +++ b/tests/baselines/reference/destructuringParameterProperties2.js @@ -53,6 +53,6 @@ var C1 = (function () { 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]); -var _a_1 = [y.getA(), y.getB(), y.getC()], y_a = _a_1[0], y_b = _a_1[1], y_c = _a_1[2]; +var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; var z = new C1(10, [undefined, "", null]); -var _a_2 = [z.getA(), z.getB(), z.getC()], z_a = _a_2[0], z_b = _a_2[1], z_c = _a_2[2]; +var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js index be835bdfe22..fe9e69d7e5b 100644 --- a/tests/baselines/reference/destructuringParameterProperties3.js +++ b/tests/baselines/reference/destructuringParameterProperties3.js @@ -56,8 +56,8 @@ var C1 = (function () { 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]); -var _a_1 = [y.getA(), y.getB(), y.getC()], y_a = _a_1[0], y_b = _a_1[1], y_c = _a_1[2]; +var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; var z = new C1(10, [undefined, "", ""]); -var _a_2 = [z.getA(), z.getB(), z.getC()], z_a = _a_2[0], z_b = _a_2[1], z_c = _a_2[2]; +var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; var w = new C1(10, [undefined, undefined, undefined]); -var _a_3 = [z.getA(), z.getB(), z.getC()], z_a = _a_3[0], z_b = _a_3[1], z_c = _a_3[2]; +var _d = [z.getA(), z.getB(), z.getC()], z_a = _d[0], z_b = _d[1], z_c = _d[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js index 5046d41472d..d9b1710ae89 100644 --- a/tests/baselines/reference/destructuringParameterProperties5.js +++ b/tests/baselines/reference/destructuringParameterProperties5.js @@ -15,7 +15,7 @@ var [a_x1, a_x2, a_x3, a_y, a_z] = [a.x1, a.x2, a.x3, a.y, a.z]; //// [destructuringParameterProperties5.js] var C1 = (function () { function C1(_a) { - var _a_1 = _a[0], x1 = _a_1.x1, x2 = _a_1.x2, x3 = _a_1.x3, y = _a[1], z = _a[2]; + var _b = _a[0], x1 = _b.x1, x2 = _b.x2, x3 = _b.x3, y = _a[1], z = _a[2]; this.[{ x1, x2, x3 }, y, z] = [{ x1, x2, x3 }, y, z]; var foo = x1 || x2 || x3 || y || z; var bar = this.x1 || this.x2 || this.x3 || this.y || this.z; diff --git a/tests/baselines/reference/parserES5ForOfStatement11.js b/tests/baselines/reference/parserES5ForOfStatement11.js index 318909b3728..0cde774a4dd 100644 --- a/tests/baselines/reference/parserES5ForOfStatement11.js +++ b/tests/baselines/reference/parserES5ForOfStatement11.js @@ -4,5 +4,5 @@ for (const [a, b] of X) { //// [parserES5ForOfStatement11.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; + var _b = _a[_i], a = _b[0], b = _b[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement12.js b/tests/baselines/reference/parserES5ForOfStatement12.js index 5e1e3b50032..1826005c09a 100644 --- a/tests/baselines/reference/parserES5ForOfStatement12.js +++ b/tests/baselines/reference/parserES5ForOfStatement12.js @@ -4,5 +4,5 @@ for (const {a, b} of X) { //// [parserES5ForOfStatement12.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; + var _b = _a[_i], a = _b.a, b = _b.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement13.js b/tests/baselines/reference/parserES5ForOfStatement13.js index aa3bd712a3b..5d1c725ee21 100644 --- a/tests/baselines/reference/parserES5ForOfStatement13.js +++ b/tests/baselines/reference/parserES5ForOfStatement13.js @@ -4,5 +4,5 @@ for (let {a, b} of X) { //// [parserES5ForOfStatement13.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; + var _b = _a[_i], a = _b.a, b = _b.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement14.js b/tests/baselines/reference/parserES5ForOfStatement14.js index 4e31742d94c..9edbf845174 100644 --- a/tests/baselines/reference/parserES5ForOfStatement14.js +++ b/tests/baselines/reference/parserES5ForOfStatement14.js @@ -4,5 +4,5 @@ for (let [a, b] of X) { //// [parserES5ForOfStatement14.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; + var _b = _a[_i], a = _b[0], b = _b[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement15.js b/tests/baselines/reference/parserES5ForOfStatement15.js index 4df81205333..39c0ddd879b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement15.js +++ b/tests/baselines/reference/parserES5ForOfStatement15.js @@ -4,5 +4,5 @@ for (var [a, b] of X) { //// [parserES5ForOfStatement15.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1[0], b = _a_1[1]; + var _b = _a[_i], a = _b[0], b = _b[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement16.js b/tests/baselines/reference/parserES5ForOfStatement16.js index a944fdb5a5f..956ce126390 100644 --- a/tests/baselines/reference/parserES5ForOfStatement16.js +++ b/tests/baselines/reference/parserES5ForOfStatement16.js @@ -4,5 +4,5 @@ for (var {a, b} of X) { //// [parserES5ForOfStatement16.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i], a = _a_1.a, b = _a_1.b; + var _b = _a[_i], a = _b.a, b = _b.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js index 0acc5abb671..1666cbdf7ae 100644 --- a/tests/baselines/reference/parserES5ForOfStatement2.js +++ b/tests/baselines/reference/parserES5ForOfStatement2.js @@ -4,5 +4,5 @@ for (var of X) { //// [parserES5ForOfStatement2.js] for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _a_1 = _a[_i]; + var _b = _a[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js index 2a8734b90af..26ea78e3089 100644 --- a/tests/baselines/reference/parserES5ForOfStatement21.js +++ b/tests/baselines/reference/parserES5ForOfStatement21.js @@ -3,5 +3,5 @@ for (var of of) { } //// [parserES5ForOfStatement21.js] for (var _i = 0, _a = of; _i < _a.length; _i++) { - var _a_1 = _a[_i]; + var _b = _a[_i]; } diff --git a/tests/baselines/reference/restElementMustBeLast.js b/tests/baselines/reference/restElementMustBeLast.js index 9cb96b7e1e6..337cb6de6f6 100644 --- a/tests/baselines/reference/restElementMustBeLast.js +++ b/tests/baselines/reference/restElementMustBeLast.js @@ -5,5 +5,5 @@ var [...a, x] = [1, 2, 3]; // Error, rest must be last element //// [restElementMustBeLast.js] var _a = [1, 2, 3], x = _a[1]; // Error, rest must be last element -_a_1 = [1, 2, 3], x = _a_1[1]; // Error, rest must be last element -var _a_1; +_b = [1, 2, 3], x = _b[1]; // Error, rest must be last element +var _b; diff --git a/tests/baselines/reference/restElementWithNullInitializer.js b/tests/baselines/reference/restElementWithNullInitializer.js index 9b314a5ed19..9f326602fb8 100644 --- a/tests/baselines/reference/restElementWithNullInitializer.js +++ b/tests/baselines/reference/restElementWithNullInitializer.js @@ -14,14 +14,14 @@ function foo4([...r] = []) { //// [restElementWithNullInitializer.js] function foo1(_a) { - var _a_1 = _a === void 0 ? null : _a, r = _a_1.slice(0); + var _b = _a === void 0 ? null : _a, r = _b.slice(0); } function foo2(_a) { - var _a_1 = _a === void 0 ? undefined : _a, r = _a_1.slice(0); + var _b = _a === void 0 ? undefined : _a, r = _b.slice(0); } function foo3(_a) { - var _a_1 = _a === void 0 ? {} : _a, r = _a_1.slice(0); + var _b = _a === void 0 ? {} : _a, r = _b.slice(0); } function foo4(_a) { - var _a_1 = _a === void 0 ? [] : _a, r = _a_1.slice(0); + var _b = _a === void 0 ? [] : _a, r = _b.slice(0); } diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js index fad2c81f0eb..9d3531c2667 100644 --- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js +++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js @@ -99,62 +99,62 @@ function noParams(n) { } (_a = [""], _a.raw = [""], noParams(_a)); // Generic tag with parameter which does not use type parameter function noGenericParams(n) { } -(_a_1 = [""], _a_1.raw = [""], noGenericParams(_a_1)); +(_b = [""], _b.raw = [""], noGenericParams(_b)); // Generic tag with multiple type parameters and only one used in parameter type annotation function someGenerics1a(n, m) { } -(_a_2 = ["", ""], _a_2.raw = ["", ""], someGenerics1a(_a_2, 3)); +(_c = ["", ""], _c.raw = ["", ""], someGenerics1a(_c, 3)); function someGenerics1b(n, m) { } -(_a_3 = ["", ""], _a_3.raw = ["", ""], someGenerics1b(_a_3, 3)); +(_d = ["", ""], _d.raw = ["", ""], someGenerics1b(_d, 3)); // Generic tag with argument of function type whose parameter is of type parameter type function someGenerics2a(strs, n) { } -(_a_4 = ["", ""], _a_4.raw = ["", ""], someGenerics2a(_a_4, function (n) { return n; })); +(_e = ["", ""], _e.raw = ["", ""], someGenerics2a(_e, function (n) { return n; })); function someGenerics2b(strs, n) { } -(_a_5 = ["", ""], _a_5.raw = ["", ""], someGenerics2b(_a_5, function (n, x) { return n; })); +(_f = ["", ""], _f.raw = ["", ""], someGenerics2b(_f, function (n, x) { return n; })); // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter function someGenerics3(strs, producer) { } -(_a_6 = ["", ""], _a_6.raw = ["", ""], someGenerics3(_a_6, function () { return ''; })); -(_a_7 = ["", ""], _a_7.raw = ["", ""], someGenerics3(_a_7, function () { return undefined; })); -(_a_8 = ["", ""], _a_8.raw = ["", ""], someGenerics3(_a_8, function () { return 3; })); +(_g = ["", ""], _g.raw = ["", ""], someGenerics3(_g, function () { return ''; })); +(_h = ["", ""], _h.raw = ["", ""], someGenerics3(_h, function () { return undefined; })); +(_j = ["", ""], _j.raw = ["", ""], someGenerics3(_j, function () { return 3; })); // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type function someGenerics4(strs, n, f) { } -(_a_9 = ["", "", ""], _a_9.raw = ["", "", ""], someGenerics4(_a_9, 4, function () { return null; })); -(_a_10 = ["", "", ""], _a_10.raw = ["", "", ""], someGenerics4(_a_10, '', function () { return 3; })); -(_a_11 = ["", "", ""], _a_11.raw = ["", "", ""], someGenerics4(_a_11, null, null)); +(_k = ["", "", ""], _k.raw = ["", "", ""], someGenerics4(_k, 4, function () { return null; })); +(_l = ["", "", ""], _l.raw = ["", "", ""], someGenerics4(_l, '', function () { return 3; })); +(_m = ["", "", ""], _m.raw = ["", "", ""], someGenerics4(_m, null, null)); // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type function someGenerics5(strs, n, f) { } -(_a_12 = ["", " ", ""], _a_12.raw = ["", " ", ""], someGenerics5(_a_12, 4, function () { return null; })); -(_a_13 = ["", "", ""], _a_13.raw = ["", "", ""], someGenerics5(_a_13, '', function () { return 3; })); -(_a_14 = ["", "", ""], _a_14.raw = ["", "", ""], someGenerics5(_a_14, null, null)); +(_n = ["", " ", ""], _n.raw = ["", " ", ""], someGenerics5(_n, 4, function () { return null; })); +(_o = ["", "", ""], _o.raw = ["", "", ""], someGenerics5(_o, '', function () { return 3; })); +(_p = ["", "", ""], _p.raw = ["", "", ""], someGenerics5(_p, null, null)); // Generic tag with multiple arguments of function types that each have parameters of the same generic type function someGenerics6(strs, a, b, c) { } -(_a_15 = ["", "", "", ""], _a_15.raw = ["", "", "", ""], someGenerics6(_a_15, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_a_16 = ["", "", "", ""], _a_16.raw = ["", "", "", ""], someGenerics6(_a_16, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_a_17 = ["", "", "", ""], _a_17.raw = ["", "", "", ""], someGenerics6(_a_17, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_q = ["", "", "", ""], _q.raw = ["", "", "", ""], someGenerics6(_q, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_r = ["", "", "", ""], _r.raw = ["", "", "", ""], someGenerics6(_r, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_s = ["", "", "", ""], _s.raw = ["", "", "", ""], someGenerics6(_s, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); // Generic tag with multiple arguments of function types that each have parameters of different generic type function someGenerics7(strs, a, b, c) { } -(_a_18 = ["", "", "", ""], _a_18.raw = ["", "", "", ""], someGenerics7(_a_18, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_a_19 = ["", "", "", ""], _a_19.raw = ["", "", "", ""], someGenerics7(_a_19, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_a_20 = ["", "", "", ""], _a_20.raw = ["", "", "", ""], someGenerics7(_a_20, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_t = ["", "", "", ""], _t.raw = ["", "", "", ""], someGenerics7(_t, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_u = ["", "", "", ""], _u.raw = ["", "", "", ""], someGenerics7(_u, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +(_v = ["", "", "", ""], _v.raw = ["", "", "", ""], someGenerics7(_v, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); // Generic tag with argument of generic function type function someGenerics8(strs, n) { return n; } -var x = (_a_21 = ["", ""], _a_21.raw = ["", ""], someGenerics8(_a_21, someGenerics7)); -(_a_22 = ["", "", "", ""], _a_22.raw = ["", "", "", ""], x(_a_22, null, null, null)); +var x = (_w = ["", ""], _w.raw = ["", ""], someGenerics8(_w, someGenerics7)); +(_x = ["", "", "", ""], _x.raw = ["", "", "", ""], x(_x, null, null, null)); // Generic tag with multiple parameters of generic type passed arguments with no best common type function someGenerics9(strs, a, b, c) { return null; } -var a9a = (_a_23 = ["", "", "", ""], _a_23.raw = ["", "", "", ""], someGenerics9(_a_23, '', 0, [])); +var a9a = (_y = ["", "", "", ""], _y.raw = ["", "", "", ""], someGenerics9(_y, '', 0, [])); var a9a; -var a9e = (_a_24 = ["", "", "", ""], _a_24.raw = ["", "", "", ""], someGenerics9(_a_24, undefined, { x: 6, z: new Date() }, { x: 6, y: '' })); +var a9e = (_z = ["", "", "", ""], _z.raw = ["", "", "", ""], someGenerics9(_z, undefined, { x: 6, z: new Date() }, { x: 6, y: '' })); var a9e; // Generic tag with multiple parameters of generic type passed arguments with a single best common type -var a9d = (_a_25 = ["", "", "", ""], _a_25.raw = ["", "", "", ""], someGenerics9(_a_25, { x: 3 }, { x: 6 }, { x: 6 })); +var a9d = (_0 = ["", "", "", ""], _0.raw = ["", "", "", ""], someGenerics9(_0, { x: 3 }, { x: 6 }, { x: 6 })); var a9d; // Generic tag with multiple parameters of generic type where one argument is of type 'any' var anyVar; -var a = (_a_26 = ["", "", "", ""], _a_26.raw = ["", "", "", ""], someGenerics9(_a_26, 7, anyVar, 4)); +var a = (_1 = ["", "", "", ""], _1.raw = ["", "", "", ""], someGenerics9(_1, 7, anyVar, 4)); var a; // Generic tag with multiple parameters of generic type where one argument is [] and the other is not 'any' -var arr = (_a_27 = ["", "", "", ""], _a_27.raw = ["", "", "", ""], someGenerics9(_a_27, [], null, undefined)); +var arr = (_2 = ["", "", "", ""], _2.raw = ["", "", "", ""], someGenerics9(_2, [], null, undefined)); var arr; -var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11, _a_12, _a_13, _a_14, _a_15, _a_16, _a_17, _a_18, _a_19, _a_20, _a_21, _a_22, _a_23, _a_24, _a_25, _a_26, _a_27; +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2; diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js index 972e0cfcf65..9d113793228 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js +++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js @@ -36,14 +36,14 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithIncompatibleTypedTags.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); -(_a_2 = ["abc"], _a_2.raw = ["abc"], f(_a_2)).member; -(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f(_a_3, 1, 2)).member; -(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4))["member"]; -(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2))["member"]; -(_a_6 = ["abc", "def", "ghi"], _a_6.raw = ["abc", "def", "ghi"], (_a_7 = ["abc"], _a_7.raw = ["abc"], f(_a_7))[0].member(_a_6, 1, 2)); -(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc", "def", "ghi"], _a_9.raw = ["abc", "def", "ghi"], f(_a_9, 1, 2))["member"].member(_a_8, 1, 2)); -(_a_10 = ["abc", "def", "ghi"], _a_10.raw = ["abc", "def", "ghi"], (_a_11 = ["abc", "def", "ghi"], _a_11.raw = ["abc", "def", "ghi"], f(_a_11, true, true))["member"].member(_a_10, 1, 2)); +(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); +(_c = ["abc"], _c.raw = ["abc"], f(_c)).member; +(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f(_d, 1, 2)).member; +(_e = ["abc"], _e.raw = ["abc"], f(_e))["member"]; +(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2))["member"]; +(_g = ["abc", "def", "ghi"], _g.raw = ["abc", "def", "ghi"], (_h = ["abc"], _h.raw = ["abc"], f(_h))[0].member(_g, 1, 2)); +(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc", "def", "ghi"], _k.raw = ["abc", "def", "ghi"], f(_k, 1, 2))["member"].member(_j, 1, 2)); +(_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, true, true))["member"].member(_l, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11; +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js index cb5df24cb77..431447df22e 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js @@ -37,9 +37,9 @@ var d = foo([], 1, true); // boolean (with error) var e = foo([], 1, "2"); // {} var f = foo([], 1, 2, 3); // any (with error) var u = (_a = [""], _a.raw = [""], foo(_a)); // number -var v = (_a_1 = ["", ""], _a_1.raw = ["", ""], foo(_a_1, 1)); // string -var w = (_a_2 = ["", "", ""], _a_2.raw = ["", "", ""], foo(_a_2, 1, 2)); // boolean -var x = (_a_3 = ["", "", ""], _a_3.raw = ["", "", ""], foo(_a_3, 1, true)); // boolean (with error) -var y = (_a_4 = ["", "", ""], _a_4.raw = ["", "", ""], foo(_a_4, 1, "2")); // {} -var z = (_a_5 = ["", "", "", ""], _a_5.raw = ["", "", "", ""], foo(_a_5, 1, 2, 3)); // any (with error) -var _a, _a_1, _a_2, _a_3, _a_4, _a_5; +var v = (_b = ["", ""], _b.raw = ["", ""], foo(_b, 1)); // string +var w = (_c = ["", "", ""], _c.raw = ["", "", ""], foo(_c, 1, 2)); // boolean +var x = (_d = ["", "", ""], _d.raw = ["", "", ""], foo(_d, 1, true)); // boolean (with error) +var y = (_e = ["", "", ""], _e.raw = ["", "", ""], foo(_e, 1, "2")); // {} +var z = (_f = ["", "", "", ""], _f.raw = ["", "", "", ""], foo(_f, 1, 2, 3)); // any (with error) +var _a, _b, _c, _d, _e, _f; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js index f17e1bbd2ee..f12008f9581 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js @@ -35,6 +35,6 @@ function foo2() { } return undefined; } -var c = (_a_1 = ["", ""], _a_1.raw = ["", ""], foo2(_a_1, 1)); // number +var c = (_b = ["", ""], _b.raw = ["", ""], foo2(_b, 1)); // number var d = foo2([], 1); // number -var _a, _a_1; +var _a, _b; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js index 2176c433042..4b9df44d3f7 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js @@ -77,39 +77,39 @@ fn5 `${ (n) => n.substr(0) }`; function fn1() { return null; } var s = (_a = ["", ""], _a.raw = ["", ""], fn1(_a, undefined)); // No candidate overloads found -(_a_1 = ["", ""], _a_1.raw = ["", ""], fn1(_a_1, {})); // Error +(_b = ["", ""], _b.raw = ["", ""], fn1(_b, {})); // Error function fn2() { return undefined; } -var d1 = (_a_2 = ["", "", ""], _a_2.raw = ["", "", ""], fn2(_a_2, 0, undefined)); // contextually typed -var d2 = (_a_3 = ["", "", ""], _a_3.raw = ["", "", ""], fn2(_a_3, 0, undefined)); // any +var d1 = (_c = ["", "", ""], _c.raw = ["", "", ""], fn2(_c, 0, undefined)); // contextually typed +var d2 = (_d = ["", "", ""], _d.raw = ["", "", ""], fn2(_d, 0, undefined)); // any d1.foo(); // error d2(); // no error (typed as any) // Generic and non-generic overload where generic overload is the only candidate -(_a_4 = ["", "", ""], _a_4.raw = ["", "", ""], fn2(_a_4, 0, '')); // OK +(_e = ["", "", ""], _e.raw = ["", "", ""], fn2(_e, 0, '')); // OK // Generic and non-generic overload where non-generic overload is the only candidate -(_a_5 = ["", "", ""], _a_5.raw = ["", "", ""], fn2(_a_5, '', 0)); // OK +(_f = ["", "", ""], _f.raw = ["", "", ""], fn2(_f, '', 0)); // OK function fn3() { return null; } -var s = (_a_6 = ["", ""], _a_6.raw = ["", ""], fn3(_a_6, 3)); -var s = (_a_7 = ["", "", "", ""], _a_7.raw = ["", "", "", ""], fn3(_a_7, '', 3, '')); -var n = (_a_8 = ["", "", "", ""], _a_8.raw = ["", "", "", ""], fn3(_a_8, 5, 5, 5)); +var s = (_g = ["", ""], _g.raw = ["", ""], fn3(_g, 3)); +var s = (_h = ["", "", "", ""], _h.raw = ["", "", "", ""], fn3(_h, '', 3, '')); +var n = (_j = ["", "", "", ""], _j.raw = ["", "", "", ""], fn3(_j, 5, 5, 5)); var n; // Generic overloads with differing arity tagging with arguments matching each overload type parameter count -var s = (_a_9 = ["", ""], _a_9.raw = ["", ""], fn3(_a_9, 4)); -var s = (_a_10 = ["", "", "", ""], _a_10.raw = ["", "", "", ""], fn3(_a_10, '', '', '')); -var n = (_a_11 = ["", "", "", ""], _a_11.raw = ["", "", "", ""], fn3(_a_11, '', '', 3)); +var s = (_k = ["", ""], _k.raw = ["", ""], fn3(_k, 4)); +var s = (_l = ["", "", "", ""], _l.raw = ["", "", "", ""], fn3(_l, '', '', '')); +var n = (_m = ["", "", "", ""], _m.raw = ["", "", "", ""], fn3(_m, '', '', 3)); // Generic overloads with differing arity tagging with argument count that doesn't match any overload -(_a_12 = [""], _a_12.raw = [""], fn3(_a_12)); // Error +(_n = [""], _n.raw = [""], fn3(_n)); // Error function fn4() { } // Generic overloads with constraints tagged with types that satisfy the constraints -(_a_13 = ["", "", ""], _a_13.raw = ["", "", ""], fn4(_a_13, '', 3)); -(_a_14 = ["", "", ""], _a_14.raw = ["", "", ""], fn4(_a_14, 3, '')); -(_a_15 = ["", "", ""], _a_15.raw = ["", "", ""], fn4(_a_15, 3, undefined)); -(_a_16 = ["", "", ""], _a_16.raw = ["", "", ""], fn4(_a_16, '', null)); +(_o = ["", "", ""], _o.raw = ["", "", ""], fn4(_o, '', 3)); +(_p = ["", "", ""], _p.raw = ["", "", ""], fn4(_p, 3, '')); +(_q = ["", "", ""], _q.raw = ["", "", ""], fn4(_q, 3, undefined)); +(_r = ["", "", ""], _r.raw = ["", "", ""], fn4(_r, '', null)); // Generic overloads with constraints called with type arguments that do not satisfy the constraints -(_a_17 = ["", "", ""], _a_17.raw = ["", "", ""], fn4(_a_17, null, null)); // Error +(_s = ["", "", ""], _s.raw = ["", "", ""], fn4(_s, null, null)); // Error // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints -(_a_18 = ["", "", ""], _a_18.raw = ["", "", ""], fn4(_a_18, true, null)); -(_a_19 = ["", "", ""], _a_19.raw = ["", "", ""], fn4(_a_19, null, true)); +(_t = ["", "", ""], _t.raw = ["", "", ""], fn4(_t, true, null)); +(_u = ["", "", ""], _u.raw = ["", "", ""], fn4(_u, null, true)); function fn5() { return undefined; } -(_a_20 = ["", ""], _a_20.raw = ["", ""], fn5(_a_20, function (n) { return n.toFixed(); })); // will error; 'n' should have type 'string'. -(_a_21 = ["", ""], _a_21.raw = ["", ""], fn5(_a_21, function (n) { return n.substr(0); })); -var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11, _a_12, _a_13, _a_14, _a_15, _a_16, _a_17, _a_18, _a_19, _a_20, _a_21; +(_v = ["", ""], _v.raw = ["", ""], fn5(_v, function (n) { return n.toFixed(); })); // will error; 'n' should have type 'string'. +(_w = ["", ""], _w.raw = ["", ""], fn5(_w, function (n) { return n.substr(0); })); +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js index 2bcbc173ab2..fd83d9d0ba0 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js @@ -28,15 +28,15 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithTagsTypedAsAny.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); -(_a_2 = ["abc"], _a_2.raw = ["abc"], f.g.h(_a_2)); -(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f.g.h(_a_3, 1, 2)); -(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4)).member; -(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2)).member; -(_a_6 = ["abc"], _a_6.raw = ["abc"], f(_a_6))["member"]; -(_a_7 = ["abc", "def", "ghi"], _a_7.raw = ["abc", "def", "ghi"], f(_a_7, 1, 2))["member"]; -(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc"], _a_9.raw = ["abc"], f(_a_9))["member"].someOtherTag(_a_8, 1, 2)); -(_a_10 = ["abc", "def", "ghi"], _a_10.raw = ["abc", "def", "ghi"], (_a_11 = ["abc", "def", "ghi"], _a_11.raw = ["abc", "def", "ghi"], f(_a_11, 1, 2))["member"].someOtherTag(_a_10, 1, 2)); +(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); +(_c = ["abc"], _c.raw = ["abc"], f.g.h(_c)); +(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f.g.h(_d, 1, 2)); +(_e = ["abc"], _e.raw = ["abc"], f(_e)).member; +(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2)).member; +(_g = ["abc"], _g.raw = ["abc"], f(_g))["member"]; +(_h = ["abc", "def", "ghi"], _h.raw = ["abc", "def", "ghi"], f(_h, 1, 2))["member"]; +(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc"], _k.raw = ["abc"], f(_k))["member"].someOtherTag(_j, 1, 2)); +(_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, 1, 2))["member"].someOtherTag(_l, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9, _a_10, _a_11; +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js index 16b14d32d93..fcc2cda86dc 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js @@ -34,13 +34,13 @@ f.thisIsNotATag(`abc${1}def${2}ghi`); //// [taggedTemplateStringsWithTypedTags.js] var f; (_a = ["abc"], _a.raw = ["abc"], f(_a)); -(_a_1 = ["abc", "def", "ghi"], _a_1.raw = ["abc", "def", "ghi"], f(_a_1, 1, 2)); -(_a_2 = ["abc"], _a_2.raw = ["abc"], f(_a_2)).member; -(_a_3 = ["abc", "def", "ghi"], _a_3.raw = ["abc", "def", "ghi"], f(_a_3, 1, 2)).member; -(_a_4 = ["abc"], _a_4.raw = ["abc"], f(_a_4))["member"]; -(_a_5 = ["abc", "def", "ghi"], _a_5.raw = ["abc", "def", "ghi"], f(_a_5, 1, 2))["member"]; -(_a_6 = ["abc", "def", "ghi"], _a_6.raw = ["abc", "def", "ghi"], (_a_7 = ["abc"], _a_7.raw = ["abc"], f(_a_7))[0].member(_a_6, 1, 2)); -(_a_8 = ["abc", "def", "ghi"], _a_8.raw = ["abc", "def", "ghi"], (_a_9 = ["abc", "def", "ghi"], _a_9.raw = ["abc", "def", "ghi"], f(_a_9, 1, 2))["member"].member(_a_8, 1, 2)); +(_b = ["abc", "def", "ghi"], _b.raw = ["abc", "def", "ghi"], f(_b, 1, 2)); +(_c = ["abc"], _c.raw = ["abc"], f(_c)).member; +(_d = ["abc", "def", "ghi"], _d.raw = ["abc", "def", "ghi"], f(_d, 1, 2)).member; +(_e = ["abc"], _e.raw = ["abc"], f(_e))["member"]; +(_f = ["abc", "def", "ghi"], _f.raw = ["abc", "def", "ghi"], f(_f, 1, 2))["member"]; +(_g = ["abc", "def", "ghi"], _g.raw = ["abc", "def", "ghi"], (_h = ["abc"], _h.raw = ["abc"], f(_h))[0].member(_g, 1, 2)); +(_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc", "def", "ghi"], _k.raw = ["abc", "def", "ghi"], f(_k, 1, 2))["member"].member(_j, 1, 2)); f.thisIsNotATag("abc"); f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi"); -var _a, _a_1, _a_2, _a_3, _a_4, _a_5, _a_6, _a_7, _a_8, _a_9; +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k; diff --git a/tests/baselines/reference/templateStringInModuleName.js b/tests/baselines/reference/templateStringInModuleName.js index 9ebb92a3801..36f619176e4 100644 --- a/tests/baselines/reference/templateStringInModuleName.js +++ b/tests/baselines/reference/templateStringInModuleName.js @@ -11,7 +11,7 @@ declare; { } declare; -(_a_1 = ["M", ""], _a_1.raw = ["M", ""], module(_a_1, 2)); +(_b = ["M", ""], _b.raw = ["M", ""], module(_b, 2)); { } -var _a, _a_1; +var _a, _b; From 4bb0587dd44d173f0bb979988df6be0d14442b3f Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 15:50:43 -0800 Subject: [PATCH 036/251] Fix createTempVariable to always record the name in the currentScopeNames --- src/compiler/emitter.ts | 11 ++++++++++- tests/baselines/reference/ES5For-of10.js | 4 ++-- tests/baselines/reference/ES5For-of15.js | 4 ++-- tests/baselines/reference/ES5For-of16.js | 4 ++-- tests/baselines/reference/ES5For-of17.js | 4 ++-- tests/baselines/reference/ES5For-of18.js | 4 ++-- tests/baselines/reference/ES5For-of19.js | 4 ++-- tests/baselines/reference/ES5For-of20.js | 4 ++-- tests/baselines/reference/ES5For-of21.js | 2 +- tests/baselines/reference/ES5For-of22.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of23.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of6.js | 4 ++-- tests/baselines/reference/ES5For-of7.js | 4 ++-- tests/baselines/reference/ES5For-of9.js | 4 ++-- .../reference/overloadResolutionOverNonCTLambdas.js | 4 ++-- .../statements/for-ofStatements/ES5For-of22.ts | 4 ++++ .../statements/for-ofStatements/ES5For-of23.ts | 4 ++++ 17 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of22.js create mode 100644 tests/baselines/reference/ES5For-of23.js create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4eb2b3a8842..693391a19ba 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1684,7 +1684,11 @@ module ts { else { name = generateUniqueName(baseName, n => isExistingName(location, n)); } - + + return putNameInCurrentScopeNames(name); + } + + function putNameInCurrentScopeNames(name: string): string { if (!currentScopeNames) { currentScopeNames = {}; } @@ -2099,6 +2103,11 @@ module ts { name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + CharacterCodes.a) : tempCount - 25); tempCount++; } + + // This is necessary so that a name generated via renameNonTopLevelLetAndConst will see the name + // we just generated. + putNameInCurrentScopeNames(name); + var result = createSynthesizedNode(SyntaxKind.Identifier); result.text = name; return result; diff --git a/tests/baselines/reference/ES5For-of10.js b/tests/baselines/reference/ES5For-of10.js index ea081ed8ab0..f12dc9d8acb 100644 --- a/tests/baselines/reference/ES5For-of10.js +++ b/tests/baselines/reference/ES5For-of10.js @@ -13,8 +13,8 @@ function foo() { } for (var _i = 0, _a = []; _i < _a.length; _i++) { foo().x = _a[_i]; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - foo().x = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + foo().x = _c[_b]; var p = foo().x; } } diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js index 90ed376b805..46d3dbd1d6e 100644 --- a/tests/baselines/reference/ES5For-of15.js +++ b/tests/baselines/reference/ES5For-of15.js @@ -10,8 +10,8 @@ for (let v of []) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var _v = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + var _v = _c[_b]; var x = _v; } } diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js index da1f0e8b337..1649e4481f2 100644 --- a/tests/baselines/reference/ES5For-of16.js +++ b/tests/baselines/reference/ES5For-of16.js @@ -11,8 +11,8 @@ for (let v of []) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var _v = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + var _v = _c[_b]; var x = _v; _v++; } diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js index e7f059477b5..688375b82bc 100644 --- a/tests/baselines/reference/ES5For-of17.js +++ b/tests/baselines/reference/ES5For-of17.js @@ -11,8 +11,8 @@ for (let v of []) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; - for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) { - var _v = _a_1[_i_1]; + for (var _b = 0, _c = [v]; _b < _c.length; _b++) { + var _v = _c[_b]; var x = _v; _v++; } diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js index 656d4f57233..a135b8b0463 100644 --- a/tests/baselines/reference/ES5For-of18.js +++ b/tests/baselines/reference/ES5For-of18.js @@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; } -for (var _i = 0, _b = []; _i < _b.length; _i++) { - var _v = _b[_i]; +for (var _b = 0, _c = []; _b < _c.length; _b++) { + var _v = _c[_b]; _v; } diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js index 9ff3f9aca2a..7af9418f04f 100644 --- a/tests/baselines/reference/ES5For-of19.js +++ b/tests/baselines/reference/ES5For-of19.js @@ -14,8 +14,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; v; function foo() { - for (var _i = 0, _a = []; _i < _a.length; _i++) { - var _v = _a[_i]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + var _v = _c[_b]; _v; } } diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js index 04b7cca5cc4..b70ac66b767 100644 --- a/tests/baselines/reference/ES5For-of20.js +++ b/tests/baselines/reference/ES5For-of20.js @@ -10,8 +10,8 @@ for (let v of []) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; var _v; - for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) { - var _v_1 = _a_1[_i_1]; + for (var _b = 0, _c = [v]; _b < _c.length; _b++) { + var _v_1 = _c[_b]; var _v_2; } } diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js index e23ea282998..9356514ea6b 100644 --- a/tests/baselines/reference/ES5For-of21.js +++ b/tests/baselines/reference/ES5For-of21.js @@ -7,6 +7,6 @@ for (let v of []) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var v = _a[_i]; for (var _b = 0, _c = []; _b < _c.length; _b++) { - var _i = _c[_b]; + var _i_1 = _c[_b]; } } diff --git a/tests/baselines/reference/ES5For-of22.js b/tests/baselines/reference/ES5For-of22.js new file mode 100644 index 00000000000..d5ebc55e04a --- /dev/null +++ b/tests/baselines/reference/ES5For-of22.js @@ -0,0 +1,12 @@ +//// [ES5For-of22.ts] +for (var x of [1, 2, 3]) { + let _a = 0; + console.log(x); +} + +//// [ES5For-of22.js] +for (var _i = 0, _a = [1, 2, 3]; _i < _a.length; _i++) { + var x = _a[_i]; + var _a_1 = 0; + console.log(x); +} diff --git a/tests/baselines/reference/ES5For-of23.js b/tests/baselines/reference/ES5For-of23.js new file mode 100644 index 00000000000..3842591820f --- /dev/null +++ b/tests/baselines/reference/ES5For-of23.js @@ -0,0 +1,12 @@ +//// [ES5For-of23.ts] +for (var x of [1, 2, 3]) { + var _a = 0; + console.log(x); +} + +//// [ES5For-of23.js] +for (var _i = 0, _b = [1, 2, 3]; _i < _b.length; _i++) { + var x = _b[_i]; + var _a = 0; + console.log(x); +} diff --git a/tests/baselines/reference/ES5For-of6.js b/tests/baselines/reference/ES5For-of6.js index e0b134407c0..bf966a0a5ae 100644 --- a/tests/baselines/reference/ES5For-of6.js +++ b/tests/baselines/reference/ES5For-of6.js @@ -8,8 +8,8 @@ for (var w of []) { //// [ES5For-of6.js] for (var _i = 0, _a = []; _i < _a.length; _i++) { var w = _a[_i]; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - var v = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + var v = _c[_b]; var x = [w, v]; } } diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js index 474cb2749ad..ad2302cdc5c 100644 --- a/tests/baselines/reference/ES5For-of7.js +++ b/tests/baselines/reference/ES5For-of7.js @@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var w = _a[_i]; var x = w; } -for (var _i = 0, _b = []; _i < _b.length; _i++) { - var v = _b[_i]; +for (var _b = 0, _c = []; _b < _c.length; _b++) { + var v = _c[_b]; var x = [w, v]; } diff --git a/tests/baselines/reference/ES5For-of9.js b/tests/baselines/reference/ES5For-of9.js index f0c5142d4eb..3a2cd2b1f74 100644 --- a/tests/baselines/reference/ES5For-of9.js +++ b/tests/baselines/reference/ES5For-of9.js @@ -14,8 +14,8 @@ function foo() { } for (var _i = 0, _a = []; _i < _a.length; _i++) { foo().x = _a[_i]; - for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) { - foo().x = _a_1[_i_1]; + for (var _b = 0, _c = []; _b < _c.length; _b++) { + foo().x = _c[_b]; var p = foo().x; } } diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index e77e8d3371f..b29941393d1 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -39,8 +39,8 @@ var Bugs; } var result = message.replace(/\{(\d+)\}/g, function (match) { var rest = []; - for (var _i = 1; _i < arguments.length; _i++) { - rest[_i - 1] = arguments[_i]; + for (var _a = 1; _a < arguments.length; _a++) { + rest[_a - 1] = arguments[_a]; } var index = rest[0]; return typeof args[index] !== 'undefined' ? args[index] : match; diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts new file mode 100644 index 00000000000..ef35b6efd9c --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts @@ -0,0 +1,4 @@ +for (var x of [1, 2, 3]) { + let _a = 0; + console.log(x); +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts new file mode 100644 index 00000000000..7d93246f2bb --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts @@ -0,0 +1,4 @@ +for (var x of [1, 2, 3]) { + var _a = 0; + console.log(x); +} \ No newline at end of file From 905f35091f7bb442a90ea0f7edb530bfef1cf54e Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 16:06:37 -0800 Subject: [PATCH 037/251] Do not create a temp for RHS if it's an identifier --- src/compiler/emitter.ts | 23 +++++++++++++------ tests/baselines/reference/ES5For-of24.js | 12 ++++++++++ tests/baselines/reference/ES5For-of25.js | 14 +++++++++++ .../reference/parserES5ForOfStatement10.js | 4 ++-- .../reference/parserES5ForOfStatement11.js | 4 ++-- .../reference/parserES5ForOfStatement12.js | 4 ++-- .../reference/parserES5ForOfStatement13.js | 4 ++-- .../reference/parserES5ForOfStatement14.js | 4 ++-- .../reference/parserES5ForOfStatement15.js | 4 ++-- .../reference/parserES5ForOfStatement16.js | 4 ++-- .../reference/parserES5ForOfStatement18.js | 4 ++-- .../reference/parserES5ForOfStatement2.js | 4 ++-- .../reference/parserES5ForOfStatement21.js | 4 ++-- .../reference/parserES5ForOfStatement3.js | 4 ++-- .../reference/parserES5ForOfStatement4.js | 4 ++-- .../reference/parserES5ForOfStatement5.js | 4 ++-- .../reference/parserES5ForOfStatement6.js | 4 ++-- .../reference/parserES5ForOfStatement7.js | 4 ++-- .../reference/parserES5ForOfStatement8.js | 4 ++-- .../reference/parserES5ForOfStatement9.js | 4 ++-- .../for-ofStatements/ES5For-of24.ts | 4 ++++ .../for-ofStatements/ES5For-of25.ts | 5 ++++ 22 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of24.js create mode 100644 tests/baselines/reference/ES5For-of25.js create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 693391a19ba..98a04a1d6d6 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3523,17 +3523,26 @@ module ts { // Do not call create recordTempDeclaration because we are declaring the temps // right here. Recording means they will be declared later. + // In the case where the user wrote an identifier as the RHS, like this: + // + // for (var v of arr) { } + // + // we don't want to emit a temporary variable for the RHS, just use it directly. + var rhsIsIdentifier = node.expression.kind === SyntaxKind.Identifier; var counter = createTempVariable(node, /*forLoopVariable*/ true); - var rhsReference = createTempVariable(node, /*forLoopVariable*/ false); + var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, /*forLoopVariable*/ false); - // _i = 0, + // _i = 0 emit(counter); - write(" = 0, "); + write(" = 0"); - // _a = expr; - emit(rhsReference); - write(" = "); - emit(node.expression); + if (!rhsIsIdentifier) { + // , _a = expr + write(", "); + emit(rhsReference); + write(" = "); + emit(node.expression); + } write("; "); // _i < _a.length; diff --git a/tests/baselines/reference/ES5For-of24.js b/tests/baselines/reference/ES5For-of24.js new file mode 100644 index 00000000000..d5489016523 --- /dev/null +++ b/tests/baselines/reference/ES5For-of24.js @@ -0,0 +1,12 @@ +//// [ES5For-of24.ts] +var a = [1, 2, 3]; +for (var v of a) { + let a = 0; +} + +//// [ES5For-of24.js] +var a = [1, 2, 3]; +for (var _i = 0; _i < a.length; _i++) { + var v = a[_i]; + var _a = 0; +} diff --git a/tests/baselines/reference/ES5For-of25.js b/tests/baselines/reference/ES5For-of25.js new file mode 100644 index 00000000000..5e52f7cad5d --- /dev/null +++ b/tests/baselines/reference/ES5For-of25.js @@ -0,0 +1,14 @@ +//// [ES5For-of25.ts] +var a = [1, 2, 3]; +for (var v of a) { + v; + a; +} + +//// [ES5For-of25.js] +var a = [1, 2, 3]; +for (var _i = 0; _i < a.length; _i++) { + var v = a[_i]; + v; + a; +} diff --git a/tests/baselines/reference/parserES5ForOfStatement10.js b/tests/baselines/reference/parserES5ForOfStatement10.js index e3e339b0972..cac70523022 100644 --- a/tests/baselines/reference/parserES5ForOfStatement10.js +++ b/tests/baselines/reference/parserES5ForOfStatement10.js @@ -3,6 +3,6 @@ for (const v of X) { } //// [parserES5ForOfStatement10.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var v = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var v = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement11.js b/tests/baselines/reference/parserES5ForOfStatement11.js index 0cde774a4dd..40e4ca68d6b 100644 --- a/tests/baselines/reference/parserES5ForOfStatement11.js +++ b/tests/baselines/reference/parserES5ForOfStatement11.js @@ -3,6 +3,6 @@ for (const [a, b] of X) { } //// [parserES5ForOfStatement11.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b[0], b = _b[1]; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a[0], b = _a[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement12.js b/tests/baselines/reference/parserES5ForOfStatement12.js index 1826005c09a..f877ebdb757 100644 --- a/tests/baselines/reference/parserES5ForOfStatement12.js +++ b/tests/baselines/reference/parserES5ForOfStatement12.js @@ -3,6 +3,6 @@ for (const {a, b} of X) { } //// [parserES5ForOfStatement12.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b.a, b = _b.b; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a.a, b = _a.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement13.js b/tests/baselines/reference/parserES5ForOfStatement13.js index 5d1c725ee21..45199480518 100644 --- a/tests/baselines/reference/parserES5ForOfStatement13.js +++ b/tests/baselines/reference/parserES5ForOfStatement13.js @@ -3,6 +3,6 @@ for (let {a, b} of X) { } //// [parserES5ForOfStatement13.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b.a, b = _b.b; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a.a, b = _a.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement14.js b/tests/baselines/reference/parserES5ForOfStatement14.js index 9edbf845174..d05fdb96e57 100644 --- a/tests/baselines/reference/parserES5ForOfStatement14.js +++ b/tests/baselines/reference/parserES5ForOfStatement14.js @@ -3,6 +3,6 @@ for (let [a, b] of X) { } //// [parserES5ForOfStatement14.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b[0], b = _b[1]; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a[0], b = _a[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement15.js b/tests/baselines/reference/parserES5ForOfStatement15.js index 39c0ddd879b..0af74961145 100644 --- a/tests/baselines/reference/parserES5ForOfStatement15.js +++ b/tests/baselines/reference/parserES5ForOfStatement15.js @@ -3,6 +3,6 @@ for (var [a, b] of X) { } //// [parserES5ForOfStatement15.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b[0], b = _b[1]; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a[0], b = _a[1]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement16.js b/tests/baselines/reference/parserES5ForOfStatement16.js index 956ce126390..1e7c6e005a8 100644 --- a/tests/baselines/reference/parserES5ForOfStatement16.js +++ b/tests/baselines/reference/parserES5ForOfStatement16.js @@ -3,6 +3,6 @@ for (var {a, b} of X) { } //// [parserES5ForOfStatement16.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i], a = _b.a, b = _b.b; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i], a = _a.a, b = _a.b; } diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js index 02aa0b59422..905ba9c1d1e 100644 --- a/tests/baselines/reference/parserES5ForOfStatement18.js +++ b/tests/baselines/reference/parserES5ForOfStatement18.js @@ -2,6 +2,6 @@ for (var of of of) { } //// [parserES5ForOfStatement18.js] -for (var _i = 0, _a = of; _i < _a.length; _i++) { - var of = _a[_i]; +for (var _i = 0; _i < of.length; _i++) { + var of = of[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js index 1666cbdf7ae..287602dfb9c 100644 --- a/tests/baselines/reference/parserES5ForOfStatement2.js +++ b/tests/baselines/reference/parserES5ForOfStatement2.js @@ -3,6 +3,6 @@ for (var of X) { } //// [parserES5ForOfStatement2.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var _b = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var _a = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js index 26ea78e3089..dcdffbc3cf0 100644 --- a/tests/baselines/reference/parserES5ForOfStatement21.js +++ b/tests/baselines/reference/parserES5ForOfStatement21.js @@ -2,6 +2,6 @@ for (var of of) { } //// [parserES5ForOfStatement21.js] -for (var _i = 0, _a = of; _i < _a.length; _i++) { - var _b = _a[_i]; +for (var _i = 0; _i < of.length; _i++) { + var _a = of[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement3.js b/tests/baselines/reference/parserES5ForOfStatement3.js index 8e4e5b9e426..a99e96a23b8 100644 --- a/tests/baselines/reference/parserES5ForOfStatement3.js +++ b/tests/baselines/reference/parserES5ForOfStatement3.js @@ -3,6 +3,6 @@ for (var a, b of X) { } //// [parserES5ForOfStatement3.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var a = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var a = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js index 751753da14b..f1558005f20 100644 --- a/tests/baselines/reference/parserES5ForOfStatement4.js +++ b/tests/baselines/reference/parserES5ForOfStatement4.js @@ -3,6 +3,6 @@ for (var a = 1 of X) { } //// [parserES5ForOfStatement4.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var a = 1 = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var a = 1 = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement5.js b/tests/baselines/reference/parserES5ForOfStatement5.js index fe0471f4d4f..328b2fba0a7 100644 --- a/tests/baselines/reference/parserES5ForOfStatement5.js +++ b/tests/baselines/reference/parserES5ForOfStatement5.js @@ -3,6 +3,6 @@ for (var a: number of X) { } //// [parserES5ForOfStatement5.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var a = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var a = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js index 2e01da0a0c4..15747b93ba9 100644 --- a/tests/baselines/reference/parserES5ForOfStatement6.js +++ b/tests/baselines/reference/parserES5ForOfStatement6.js @@ -3,6 +3,6 @@ for (var a = 1, b = 2 of X) { } //// [parserES5ForOfStatement6.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var a = 1 = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var a = 1 = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js index 845bec0e2cc..29e4de8787f 100644 --- a/tests/baselines/reference/parserES5ForOfStatement7.js +++ b/tests/baselines/reference/parserES5ForOfStatement7.js @@ -3,6 +3,6 @@ for (var a: number = 1, b: string = "" of X) { } //// [parserES5ForOfStatement7.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var a = 1 = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var a = 1 = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement8.js b/tests/baselines/reference/parserES5ForOfStatement8.js index bd20d375502..5c449fc6433 100644 --- a/tests/baselines/reference/parserES5ForOfStatement8.js +++ b/tests/baselines/reference/parserES5ForOfStatement8.js @@ -3,6 +3,6 @@ for (var v of X) { } //// [parserES5ForOfStatement8.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var v = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var v = X[_i]; } diff --git a/tests/baselines/reference/parserES5ForOfStatement9.js b/tests/baselines/reference/parserES5ForOfStatement9.js index 3da36ecdd5b..6b63d58a88a 100644 --- a/tests/baselines/reference/parserES5ForOfStatement9.js +++ b/tests/baselines/reference/parserES5ForOfStatement9.js @@ -3,6 +3,6 @@ for (let v of X) { } //// [parserES5ForOfStatement9.js] -for (var _i = 0, _a = X; _i < _a.length; _i++) { - var v = _a[_i]; +for (var _i = 0; _i < X.length; _i++) { + var v = X[_i]; } diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts new file mode 100644 index 00000000000..7e025183f5f --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts @@ -0,0 +1,4 @@ +var a = [1, 2, 3]; +for (var v of a) { + let a = 0; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts new file mode 100644 index 00000000000..5cf7efe8d65 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts @@ -0,0 +1,5 @@ +var a = [1, 2, 3]; +for (var v of a) { + v; + a; +} \ No newline at end of file From ed3ab96eed1c177095c6119b704f5e0982a00917 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 18:39:49 -0800 Subject: [PATCH 038/251] Add tests for destructuring 'for...of' --- src/compiler/checker.ts | 4 ++-- src/compiler/emitter.ts | 5 +++-- src/compiler/types.ts | 2 +- tests/baselines/reference/ES5For-of26.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of27.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of28.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of29.js | 12 ++++++++++++ tests/baselines/reference/ES5For-of30.js | 17 +++++++++++++++++ tests/baselines/reference/ES5For-of31.js | 16 ++++++++++++++++ .../statements/for-ofStatements/ES5For-of26.ts | 4 ++++ .../statements/for-ofStatements/ES5For-of27.ts | 4 ++++ .../statements/for-ofStatements/ES5For-of28.ts | 4 ++++ .../statements/for-ofStatements/ES5For-of29.ts | 4 ++++ .../statements/for-ofStatements/ES5For-of30.ts | 6 ++++++ .../statements/for-ofStatements/ES5For-of31.ts | 6 ++++++ 15 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of26.js create mode 100644 tests/baselines/reference/ES5For-of27.js create mode 100644 tests/baselines/reference/ES5For-of28.js create mode 100644 tests/baselines/reference/ES5For-of29.js create mode 100644 tests/baselines/reference/ES5For-of30.js create mode 100644 tests/baselines/reference/ES5For-of31.js create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7220182bfe9..949fc922c21 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10891,9 +10891,9 @@ module ts { getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags); } - function isUnknownIdentifier(location: Node, name: string): boolean { + function isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean { return !resolveName(location, name, SymbolFlags.Value, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined) && - !hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name); + !hasProperty(getGeneratedNamesForSourceFile(sourceFile), name); } function getBlockScopedVariableId(n: Identifier): number { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 98a04a1d6d6..8f01232ef77 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1639,10 +1639,12 @@ module ts { } if (root) { + currentSourceFile = root; emit(root); } else { forEach(host.getSourceFiles(), sourceFile => { + currentSourceFile = sourceFile; if (!isExternalModuleOrDeclarationFile(sourceFile)) { emit(sourceFile); } @@ -1698,7 +1700,7 @@ module ts { function isExistingName(location: Node, name: string) { // check if resolver is aware of this name (if name was seen during the typecheck) - if (!resolver.isUnknownIdentifier(location, name)) { + if (!resolver.isUnknownIdentifier(location, name, currentSourceFile)) { return true; } @@ -5191,7 +5193,6 @@ module ts { } function emitSourceFile(node: SourceFile) { - currentSourceFile = node; // Start new file on new line writeLine(); emitDetachedComments(node); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c7339bcd60d..40a44ab9705 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1204,7 +1204,7 @@ module ts { isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; // Returns the constant value this property access resolves to, or 'undefined' for a non-constant getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; - isUnknownIdentifier(location: Node, name: string): boolean; + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; getBlockScopedVariableId(node: Identifier): number; } diff --git a/tests/baselines/reference/ES5For-of26.js b/tests/baselines/reference/ES5For-of26.js new file mode 100644 index 00000000000..02d462b6025 --- /dev/null +++ b/tests/baselines/reference/ES5For-of26.js @@ -0,0 +1,12 @@ +//// [ES5For-of26.ts] +for (var [a = 0, b = 1] of [2, 3]) { + a; + b; +} + +//// [ES5For-of26.js] +for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { + var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d; + a; + b; +} diff --git a/tests/baselines/reference/ES5For-of27.js b/tests/baselines/reference/ES5For-of27.js new file mode 100644 index 00000000000..c8e5a03b114 --- /dev/null +++ b/tests/baselines/reference/ES5For-of27.js @@ -0,0 +1,12 @@ +//// [ES5For-of27.ts] +for (var {x: a = 0, y: b = 1} of [2, 3]) { + a; + b; +} + +//// [ES5For-of27.js] +for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { + var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d; + a; + b; +} diff --git a/tests/baselines/reference/ES5For-of28.js b/tests/baselines/reference/ES5For-of28.js new file mode 100644 index 00000000000..362b8835212 --- /dev/null +++ b/tests/baselines/reference/ES5For-of28.js @@ -0,0 +1,12 @@ +//// [ES5For-of28.ts] +for (let [a = 0, b = 1] of [2, 3]) { + a; + b; +} + +//// [ES5For-of28.js] +for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { + var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d; + a; + b; +} diff --git a/tests/baselines/reference/ES5For-of29.js b/tests/baselines/reference/ES5For-of29.js new file mode 100644 index 00000000000..338ff311dba --- /dev/null +++ b/tests/baselines/reference/ES5For-of29.js @@ -0,0 +1,12 @@ +//// [ES5For-of29.ts] +for (const {x: a = 0, y: b = 1} of [2, 3]) { + a; + b; +} + +//// [ES5For-of29.js] +for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { + var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d; + a; + b; +} diff --git a/tests/baselines/reference/ES5For-of30.js b/tests/baselines/reference/ES5For-of30.js new file mode 100644 index 00000000000..2a1dc5a3399 --- /dev/null +++ b/tests/baselines/reference/ES5For-of30.js @@ -0,0 +1,17 @@ +//// [ES5For-of30.ts] +var a: string, b: number; +var tuple: [number, string] = [2, "3"]; +for ([a = 1, b = ""] of tuple) { + a; + b; +} + +//// [ES5For-of30.js] +var a, b; +var tuple = [2, "3"]; +for (var _i = 0; _i < tuple.length; _i++) { + _a = tuple[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c; + a; + b; +} +var _a, _b, _c; diff --git a/tests/baselines/reference/ES5For-of31.js b/tests/baselines/reference/ES5For-of31.js new file mode 100644 index 00000000000..6b038e377cb --- /dev/null +++ b/tests/baselines/reference/ES5For-of31.js @@ -0,0 +1,16 @@ +//// [ES5For-of31.ts] +var a: string, b: number; + +for ({ a: b = 1, b: a = ""} of []) { + a; + b; +} + +//// [ES5For-of31.js] +var a, b; +for (var _i = 0, _a = []; _i < _a.length; _i++) { + _b = _a[_i], _c = _b.a, b = _c === void 0 ? 1 : _c, _d = _b.b, a = _d === void 0 ? "" : _d; + a; + b; +} +var _b, _c, _d; diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts new file mode 100644 index 00000000000..d0b944dcec7 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts @@ -0,0 +1,4 @@ +for (var [a = 0, b = 1] of [2, 3]) { + a; + b; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts new file mode 100644 index 00000000000..4a56779b68d --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts @@ -0,0 +1,4 @@ +for (var {x: a = 0, y: b = 1} of [2, 3]) { + a; + b; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts new file mode 100644 index 00000000000..00f36f7d5d2 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts @@ -0,0 +1,4 @@ +for (let [a = 0, b = 1] of [2, 3]) { + a; + b; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts new file mode 100644 index 00000000000..5b5e52e75c5 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts @@ -0,0 +1,4 @@ +for (const {x: a = 0, y: b = 1} of [2, 3]) { + a; + b; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts new file mode 100644 index 00000000000..c25b7b98b5f --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts @@ -0,0 +1,6 @@ +var a: string, b: number; +var tuple: [number, string] = [2, "3"]; +for ([a = 1, b = ""] of tuple) { + a; + b; +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts new file mode 100644 index 00000000000..a00f4516541 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts @@ -0,0 +1,6 @@ +var a: string, b: number; + +for ({ a: b = 1, b: a = ""} of []) { + a; + b; +} \ No newline at end of file From 946dc0e0bcad5c2f105d4b506e7b2336387988d3 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Wed, 4 Mar 2015 19:33:49 -0800 Subject: [PATCH 039/251] Accept error baselines and API breaks --- tests/baselines/reference/APISample_compile.js | 2 +- .../baselines/reference/APISample_compile.types | 6 ++++-- tests/baselines/reference/APISample_linter.js | 2 +- tests/baselines/reference/APISample_linter.types | 6 ++++-- tests/baselines/reference/APISample_transform.js | 2 +- .../reference/APISample_transform.types | 6 ++++-- tests/baselines/reference/APISample_watcher.js | 2 +- .../baselines/reference/APISample_watcher.types | 6 ++++-- tests/baselines/reference/ES5For-of1.errors.txt | 7 +++++++ tests/baselines/reference/ES5For-of10.errors.txt | 13 +++++++++++++ tests/baselines/reference/ES5For-of11.errors.txt | 8 ++++++++ tests/baselines/reference/ES5For-of12.errors.txt | 7 +++++++ tests/baselines/reference/ES5For-of13.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of14.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of15.errors.txt | 12 ++++++++++++ tests/baselines/reference/ES5For-of16.errors.txt | 13 +++++++++++++ tests/baselines/reference/ES5For-of17.errors.txt | 13 +++++++++++++ tests/baselines/reference/ES5For-of18.errors.txt | 16 ++++++++++++++++ tests/baselines/reference/ES5For-of19.errors.txt | 15 +++++++++++++++ tests/baselines/reference/ES5For-of2.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of20.errors.txt | 12 ++++++++++++ tests/baselines/reference/ES5For-of21.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of22.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of23.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of24.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of25.errors.txt | 11 +++++++++++ tests/baselines/reference/ES5For-of26.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of27.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of28.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of29.errors.txt | 10 ++++++++++ tests/baselines/reference/ES5For-of3.errors.txt | 8 ++++++++ tests/baselines/reference/ES5For-of30.errors.txt | 12 ++++++++++++ tests/baselines/reference/ES5For-of31.errors.txt | 12 ++++++++++++ tests/baselines/reference/ES5For-of4.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of5.errors.txt | 9 +++++++++ tests/baselines/reference/ES5For-of6.errors.txt | 11 +++++++++++ tests/baselines/reference/ES5For-of7.errors.txt | 16 ++++++++++++++++ tests/baselines/reference/ES5For-of8.errors.txt | 12 ++++++++++++ tests/baselines/reference/ES5For-of9.errors.txt | 14 ++++++++++++++ .../reference/downlevelLetConst16.errors.txt | 13 ++++++------- .../statements/for-ofStatements/ES5For-of32.ts | 4 ++++ 41 files changed, 366 insertions(+), 19 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of1.errors.txt create mode 100644 tests/baselines/reference/ES5For-of10.errors.txt create mode 100644 tests/baselines/reference/ES5For-of11.errors.txt create mode 100644 tests/baselines/reference/ES5For-of12.errors.txt create mode 100644 tests/baselines/reference/ES5For-of13.errors.txt create mode 100644 tests/baselines/reference/ES5For-of14.errors.txt create mode 100644 tests/baselines/reference/ES5For-of15.errors.txt create mode 100644 tests/baselines/reference/ES5For-of16.errors.txt create mode 100644 tests/baselines/reference/ES5For-of17.errors.txt create mode 100644 tests/baselines/reference/ES5For-of18.errors.txt create mode 100644 tests/baselines/reference/ES5For-of19.errors.txt create mode 100644 tests/baselines/reference/ES5For-of2.errors.txt create mode 100644 tests/baselines/reference/ES5For-of20.errors.txt create mode 100644 tests/baselines/reference/ES5For-of21.errors.txt create mode 100644 tests/baselines/reference/ES5For-of22.errors.txt create mode 100644 tests/baselines/reference/ES5For-of23.errors.txt create mode 100644 tests/baselines/reference/ES5For-of24.errors.txt create mode 100644 tests/baselines/reference/ES5For-of25.errors.txt create mode 100644 tests/baselines/reference/ES5For-of26.errors.txt create mode 100644 tests/baselines/reference/ES5For-of27.errors.txt create mode 100644 tests/baselines/reference/ES5For-of28.errors.txt create mode 100644 tests/baselines/reference/ES5For-of29.errors.txt create mode 100644 tests/baselines/reference/ES5For-of3.errors.txt create mode 100644 tests/baselines/reference/ES5For-of30.errors.txt create mode 100644 tests/baselines/reference/ES5For-of31.errors.txt create mode 100644 tests/baselines/reference/ES5For-of4.errors.txt create mode 100644 tests/baselines/reference/ES5For-of5.errors.txt create mode 100644 tests/baselines/reference/ES5For-of6.errors.txt create mode 100644 tests/baselines/reference/ES5For-of7.errors.txt create mode 100644 tests/baselines/reference/ES5For-of8.errors.txt create mode 100644 tests/baselines/reference/ES5For-of9.errors.txt create mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 30fe1d09060..158d75df1cb 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -940,7 +940,7 @@ declare module "typescript" { isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; - isUnknownIdentifier(location: Node, name: string): boolean; + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 81b98949c7b..a56ba7c43a5 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3057,11 +3057,13 @@ declare module "typescript" { >PropertyAccessExpression : PropertyAccessExpression >ElementAccessExpression : ElementAccessExpression - isUnknownIdentifier(location: Node, name: string): boolean; ->isUnknownIdentifier : (location: Node, name: string) => boolean + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; +>isUnknownIdentifier : (location: Node, name: string, sourceFile: SourceFile) => boolean >location : Node >Node : Node >name : string +>sourceFile : SourceFile +>SourceFile : SourceFile getBlockScopedVariableId(node: Identifier): number; >getBlockScopedVariableId : (node: Identifier) => number diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b7a67081440..db0442017b2 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -971,7 +971,7 @@ declare module "typescript" { isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; - isUnknownIdentifier(location: Node, name: string): boolean; + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 6da030e8617..fdbb17625bc 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3203,11 +3203,13 @@ declare module "typescript" { >PropertyAccessExpression : PropertyAccessExpression >ElementAccessExpression : ElementAccessExpression - isUnknownIdentifier(location: Node, name: string): boolean; ->isUnknownIdentifier : (location: Node, name: string) => boolean + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; +>isUnknownIdentifier : (location: Node, name: string, sourceFile: SourceFile) => boolean >location : Node >Node : Node >name : string +>sourceFile : SourceFile +>SourceFile : SourceFile getBlockScopedVariableId(node: Identifier): number; >getBlockScopedVariableId : (node: Identifier) => number diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index c30d4f03456..798b158539c 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -972,7 +972,7 @@ declare module "typescript" { isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; - isUnknownIdentifier(location: Node, name: string): boolean; + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 42862def15f..557409b9457 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3153,11 +3153,13 @@ declare module "typescript" { >PropertyAccessExpression : PropertyAccessExpression >ElementAccessExpression : ElementAccessExpression - isUnknownIdentifier(location: Node, name: string): boolean; ->isUnknownIdentifier : (location: Node, name: string) => boolean + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; +>isUnknownIdentifier : (location: Node, name: string, sourceFile: SourceFile) => boolean >location : Node >Node : Node >name : string +>sourceFile : SourceFile +>SourceFile : SourceFile getBlockScopedVariableId(node: Identifier): number; >getBlockScopedVariableId : (node: Identifier) => number diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index a9ed17e924d..648dd0fcdeb 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1009,7 +1009,7 @@ declare module "typescript" { isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; - isUnknownIdentifier(location: Node, name: string): boolean; + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 3dd324c421e..eb444c4141d 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -3326,11 +3326,13 @@ declare module "typescript" { >PropertyAccessExpression : PropertyAccessExpression >ElementAccessExpression : ElementAccessExpression - isUnknownIdentifier(location: Node, name: string): boolean; ->isUnknownIdentifier : (location: Node, name: string) => boolean + isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean; +>isUnknownIdentifier : (location: Node, name: string, sourceFile: SourceFile) => boolean >location : Node >Node : Node >name : string +>sourceFile : SourceFile +>SourceFile : SourceFile getBlockScopedVariableId(node: Identifier): number; >getBlockScopedVariableId : (node: Identifier) => number diff --git a/tests/baselines/reference/ES5For-of1.errors.txt b/tests/baselines/reference/ES5For-of1.errors.txt new file mode 100644 index 00000000000..845e6f63ba9 --- /dev/null +++ b/tests/baselines/reference/ES5For-of1.errors.txt @@ -0,0 +1,7 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts (1 errors) ==== + for (var v of []) { } + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of10.errors.txt b/tests/baselines/reference/ES5For-of10.errors.txt new file mode 100644 index 00000000000..70f69ed204f --- /dev/null +++ b/tests/baselines/reference/ES5For-of10.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts(4,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts (1 errors) ==== + function foo() { + return { x: 0 }; + } + for (foo().x of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + for (foo().x of []) + var p = foo().x; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of11.errors.txt b/tests/baselines/reference/ES5For-of11.errors.txt new file mode 100644 index 00000000000..bfb494f83a5 --- /dev/null +++ b/tests/baselines/reference/ES5For-of11.errors.txt @@ -0,0 +1,8 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts(2,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts (1 errors) ==== + var v; + for (v of []) { } + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of12.errors.txt b/tests/baselines/reference/ES5For-of12.errors.txt new file mode 100644 index 00000000000..ca7c2b190a2 --- /dev/null +++ b/tests/baselines/reference/ES5For-of12.errors.txt @@ -0,0 +1,7 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts (1 errors) ==== + for ([""] of []) { } + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of13.errors.txt b/tests/baselines/reference/ES5For-of13.errors.txt new file mode 100644 index 00000000000..107170c556e --- /dev/null +++ b/tests/baselines/reference/ES5For-of13.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = v; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of14.errors.txt b/tests/baselines/reference/ES5For-of14.errors.txt new file mode 100644 index 00000000000..073c3869028 --- /dev/null +++ b/tests/baselines/reference/ES5For-of14.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts (1 errors) ==== + for (const v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = v; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of15.errors.txt b/tests/baselines/reference/ES5For-of15.errors.txt new file mode 100644 index 00000000000..a63e1202cec --- /dev/null +++ b/tests/baselines/reference/ES5For-of15.errors.txt @@ -0,0 +1,12 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + for (const v of []) { + var x = v; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of16.errors.txt b/tests/baselines/reference/ES5For-of16.errors.txt new file mode 100644 index 00000000000..969d83b8058 --- /dev/null +++ b/tests/baselines/reference/ES5For-of16.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + for (let v of []) { + var x = v; + v++; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of17.errors.txt b/tests/baselines/reference/ES5For-of17.errors.txt new file mode 100644 index 00000000000..05c89874fcf --- /dev/null +++ b/tests/baselines/reference/ES5For-of17.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + for (let v of [v]) { + var x = v; + v++; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of18.errors.txt b/tests/baselines/reference/ES5For-of18.errors.txt new file mode 100644 index 00000000000..77872e93b97 --- /dev/null +++ b/tests/baselines/reference/ES5For-of18.errors.txt @@ -0,0 +1,16 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts(4,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts (2 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + } + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + } + \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of19.errors.txt b/tests/baselines/reference/ES5For-of19.errors.txt new file mode 100644 index 00000000000..0e1352d988d --- /dev/null +++ b/tests/baselines/reference/ES5For-of19.errors.txt @@ -0,0 +1,15 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + function foo() { + for (const v of []) { + v; + } + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of2.errors.txt b/tests/baselines/reference/ES5For-of2.errors.txt new file mode 100644 index 00000000000..2b39c276796 --- /dev/null +++ b/tests/baselines/reference/ES5For-of2.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts (1 errors) ==== + for (var v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = v; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of20.errors.txt b/tests/baselines/reference/ES5For-of20.errors.txt new file mode 100644 index 00000000000..35e5130b0de --- /dev/null +++ b/tests/baselines/reference/ES5For-of20.errors.txt @@ -0,0 +1,12 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + let v; + for (let v of [v]) { + const v; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of21.errors.txt b/tests/baselines/reference/ES5For-of21.errors.txt new file mode 100644 index 00000000000..bd0a6ccee64 --- /dev/null +++ b/tests/baselines/reference/ES5For-of21.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts (1 errors) ==== + for (let v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + for (let _i of []) { } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of22.errors.txt b/tests/baselines/reference/ES5For-of22.errors.txt new file mode 100644 index 00000000000..0acfcb6dde8 --- /dev/null +++ b/tests/baselines/reference/ES5For-of22.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts (1 errors) ==== + for (var x of [1, 2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + let _a = 0; + console.log(x); + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of23.errors.txt b/tests/baselines/reference/ES5For-of23.errors.txt new file mode 100644 index 00000000000..a659436ad9d --- /dev/null +++ b/tests/baselines/reference/ES5For-of23.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts (1 errors) ==== + for (var x of [1, 2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var _a = 0; + console.log(x); + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of24.errors.txt b/tests/baselines/reference/ES5For-of24.errors.txt new file mode 100644 index 00000000000..378bc42ecd9 --- /dev/null +++ b/tests/baselines/reference/ES5For-of24.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts(2,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts (1 errors) ==== + var a = [1, 2, 3]; + for (var v of a) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + let a = 0; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of25.errors.txt b/tests/baselines/reference/ES5For-of25.errors.txt new file mode 100644 index 00000000000..d53cdbadd50 --- /dev/null +++ b/tests/baselines/reference/ES5For-of25.errors.txt @@ -0,0 +1,11 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts(2,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts (1 errors) ==== + var a = [1, 2, 3]; + for (var v of a) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + v; + a; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of26.errors.txt b/tests/baselines/reference/ES5For-of26.errors.txt new file mode 100644 index 00000000000..4fae8257d79 --- /dev/null +++ b/tests/baselines/reference/ES5For-of26.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts (1 errors) ==== + for (var [a = 0, b = 1] of [2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of27.errors.txt b/tests/baselines/reference/ES5For-of27.errors.txt new file mode 100644 index 00000000000..f54c66d7eae --- /dev/null +++ b/tests/baselines/reference/ES5For-of27.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts (1 errors) ==== + for (var {x: a = 0, y: b = 1} of [2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of28.errors.txt b/tests/baselines/reference/ES5For-of28.errors.txt new file mode 100644 index 00000000000..31080bb5648 --- /dev/null +++ b/tests/baselines/reference/ES5For-of28.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts (1 errors) ==== + for (let [a = 0, b = 1] of [2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of29.errors.txt b/tests/baselines/reference/ES5For-of29.errors.txt new file mode 100644 index 00000000000..24a0b67aec8 --- /dev/null +++ b/tests/baselines/reference/ES5For-of29.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts (1 errors) ==== + for (const {x: a = 0, y: b = 1} of [2, 3]) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of3.errors.txt b/tests/baselines/reference/ES5For-of3.errors.txt new file mode 100644 index 00000000000..9c6bd4e8864 --- /dev/null +++ b/tests/baselines/reference/ES5For-of3.errors.txt @@ -0,0 +1,8 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts (1 errors) ==== + for (var v of []) + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = v; \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of30.errors.txt b/tests/baselines/reference/ES5For-of30.errors.txt new file mode 100644 index 00000000000..9ab0dfca3cd --- /dev/null +++ b/tests/baselines/reference/ES5For-of30.errors.txt @@ -0,0 +1,12 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts (1 errors) ==== + var a: string, b: number; + var tuple: [number, string] = [2, "3"]; + for ([a = 1, b = ""] of tuple) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of31.errors.txt b/tests/baselines/reference/ES5For-of31.errors.txt new file mode 100644 index 00000000000..fa3b7617980 --- /dev/null +++ b/tests/baselines/reference/ES5For-of31.errors.txt @@ -0,0 +1,12 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts(3,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts (1 errors) ==== + var a: string, b: number; + + for ({ a: b = 1, b: a = ""} of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + a; + b; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of4.errors.txt b/tests/baselines/reference/ES5For-of4.errors.txt new file mode 100644 index 00000000000..047c6f4e153 --- /dev/null +++ b/tests/baselines/reference/ES5For-of4.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts (1 errors) ==== + for (var v of []) + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = v; + var y = v; \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of5.errors.txt b/tests/baselines/reference/ES5For-of5.errors.txt new file mode 100644 index 00000000000..6109498afb2 --- /dev/null +++ b/tests/baselines/reference/ES5For-of5.errors.txt @@ -0,0 +1,9 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts (1 errors) ==== + for (var _a of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = _a; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of6.errors.txt b/tests/baselines/reference/ES5For-of6.errors.txt new file mode 100644 index 00000000000..3664b51b217 --- /dev/null +++ b/tests/baselines/reference/ES5For-of6.errors.txt @@ -0,0 +1,11 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts (1 errors) ==== + for (var w of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + for (var v of []) { + var x = [w, v]; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of7.errors.txt b/tests/baselines/reference/ES5For-of7.errors.txt new file mode 100644 index 00000000000..21f9c4d137c --- /dev/null +++ b/tests/baselines/reference/ES5For-of7.errors.txt @@ -0,0 +1,16 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts(5,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts (2 errors) ==== + for (var w of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = w; + } + + for (var v of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var x = [w, v]; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.errors.txt b/tests/baselines/reference/ES5For-of8.errors.txt new file mode 100644 index 00000000000..03c972e5e49 --- /dev/null +++ b/tests/baselines/reference/ES5For-of8.errors.txt @@ -0,0 +1,12 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts(4,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts (1 errors) ==== + function foo() { + return { x: 0 }; + } + for (foo().x of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + var p = foo().x; + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of9.errors.txt b/tests/baselines/reference/ES5For-of9.errors.txt new file mode 100644 index 00000000000..1b6607afb30 --- /dev/null +++ b/tests/baselines/reference/ES5For-of9.errors.txt @@ -0,0 +1,14 @@ +tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts(4,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + + +==== tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts (1 errors) ==== + function foo() { + return { x: 0 }; + } + for (foo().x of []) { + ~~~ +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + for (foo().x of []) { + var p = foo().x; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/downlevelLetConst16.errors.txt b/tests/baselines/reference/downlevelLetConst16.errors.txt index c488e96ca23..6156bfe4a2b 100644 --- a/tests/baselines/reference/downlevelLetConst16.errors.txt +++ b/tests/baselines/reference/downlevelLetConst16.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/downlevelLetConst16.ts(189,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. -tests/cases/compiler/downlevelLetConst16.ts(196,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. -tests/cases/compiler/downlevelLetConst16.ts(203,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. -tests/cases/compiler/downlevelLetConst16.ts(210,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. -tests/cases/compiler/downlevelLetConst16.ts(217,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. -tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(188,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(195,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(202,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(209,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(216,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. +tests/cases/compiler/downlevelLetConst16.ts(223,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. ==== tests/cases/compiler/downlevelLetConst16.ts (6 errors) ==== @@ -193,7 +193,6 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta use(x); } - // TODO: once for-of is supported downlevel function foo7() { for (let x of []) { ~~~ diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts new file mode 100644 index 00000000000..65ad9bdbdc3 --- /dev/null +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts @@ -0,0 +1,4 @@ +// @sourcemap: true +for (var a of ['a', 'b', 'c']) { + console.log(a); +} \ No newline at end of file From 62d304b069a322ce739079da04d6546236fc3966 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Thu, 5 Mar 2015 02:31:55 -0800 Subject: [PATCH 040/251] Preserve newlines for property access expressions on multiple lines. --- src/compiler/emitter.ts | 21 +++++++++++++++++++ src/compiler/parser.ts | 20 +++++++++++------- src/compiler/types.ts | 1 + .../baselines/reference/APISample_compile.js | 1 + .../reference/APISample_compile.types | 4 ++++ tests/baselines/reference/APISample_linter.js | 1 + .../reference/APISample_linter.types | 4 ++++ .../reference/APISample_transform.js | 1 + .../reference/APISample_transform.types | 4 ++++ .../baselines/reference/APISample_watcher.js | 8 +++++-- .../reference/APISample_watcher.types | 4 ++++ tests/baselines/reference/arrayConcatMap.js | 3 ++- .../enumConflictsWithGlobalIdentifier.js | 3 ++- .../reference/enumMemberResolution.js | 3 ++- ...nsMissingReturnStatementsAndExpressions.js | 3 ++- .../reference/genericChainedCalls.js | 5 +++-- .../overEagerReturnTypeSpecialization.js | 4 ++-- tests/baselines/reference/parse1.js | 3 ++- tests/baselines/reference/parser509667.js | 3 ++- tests/baselines/reference/underscoreTest1.js | 6 +++++- .../reference/wrappedIncovations1.js | 11 ++++++++++ .../reference/wrappedIncovations1.types | 20 ++++++++++++++++++ .../reference/wrappedIncovations2.js | 11 ++++++++++ .../reference/wrappedIncovations2.types | 20 ++++++++++++++++++ tests/cases/compiler/wrappedIncovations1.ts | 4 ++++ tests/cases/compiler/wrappedIncovations2.ts | 4 ++++ tests/cases/unittests/incrementalParser.ts | 2 +- 27 files changed, 152 insertions(+), 22 deletions(-) create mode 100644 tests/baselines/reference/wrappedIncovations1.js create mode 100644 tests/baselines/reference/wrappedIncovations1.types create mode 100644 tests/baselines/reference/wrappedIncovations2.js create mode 100644 tests/baselines/reference/wrappedIncovations2.types create mode 100644 tests/cases/compiler/wrappedIncovations1.ts create mode 100644 tests/cases/compiler/wrappedIncovations2.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index b1dcbfbcd95..a0c887414cd 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3036,9 +3036,30 @@ module ts { if (tryEmitConstantValue(node)) { return; } + emit(node.expression); + + var indented = false; + var isSynthesied = nodeIsSynthesized(node); + if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.expression, node.dotToken)) { + indented = true; + increaseIndent(); + writeLine(); + } + write("."); + + if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.dotToken, node.name) && !indented) { + indented = true; + increaseIndent(); + writeLine(); + } + emit(node.name); + + if (indented) { + decreaseIndent(); + } } function emitQualifiedName(node: QualifiedName) { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 0bb09330070..557d6505984 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -120,6 +120,7 @@ module ts { return visitNodes(cbNodes, (node).properties); case SyntaxKind.PropertyAccessExpression: return visitNode(cbNode, (node).expression) || + visitNode(cbNode, (node).dotToken) || visitNode(cbNode, (node).name); case SyntaxKind.ElementAccessExpression: return visitNode(cbNode, (node).expression) || @@ -1326,13 +1327,16 @@ module ts { function parseOptionalToken(t: SyntaxKind): Node { if (token === t) { - var node = createNode(t); - nextToken(); - return finishNode(node); + return parseTokenNode(); } return undefined; } + function parseExpectedToken(t: SyntaxKind, reportAtCurrentPosition: boolean, diagnosticMessage: DiagnosticMessage, arg0?: any): Node { + return parseOptionalToken(t) || + createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0); + } + function parseTokenNode(): T { var node = createNode(token); nextToken(); @@ -2150,8 +2154,7 @@ module ts { literal = parseLiteralNode(); } else { - literal = createMissingNode( - SyntaxKind.TemplateTail, /*reportAtCurrentPosition:*/ false, Diagnostics._0_expected, tokenToString(SyntaxKind.CloseBraceToken)); + literal = parseExpectedToken(SyntaxKind.TemplateTail, /*reportAtCurrentPosition:*/ false, Diagnostics._0_expected, tokenToString(SyntaxKind.CloseBraceToken)); } span.literal = literal; @@ -3446,7 +3449,7 @@ module ts { // If it wasn't then just try to parse out a '.' and report an error. var node = createNode(SyntaxKind.PropertyAccessExpression, expression.pos); node.expression = expression; - parseExpected(SyntaxKind.DotToken, Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.dotToken = parseExpectedToken(SyntaxKind.DotToken, /*reportAtCurrentPosition:*/ false, Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); node.name = parseRightSideOfDot(/*allowIdentifierNames:*/ true); return finishNode(node); } @@ -3462,10 +3465,11 @@ module ts { function parseMemberExpressionRest(expression: LeftHandSideExpression): MemberExpression { while (true) { - var dotOrBracketStart = scanner.getTokenPos(); - if (parseOptional(SyntaxKind.DotToken)) { + var dotToken = parseOptionalToken(SyntaxKind.DotToken); + if (dotToken) { var propertyAccess = createNode(SyntaxKind.PropertyAccessExpression, expression.pos); propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames:*/ true); expression = finishNode(propertyAccess); continue; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c7339bcd60d..97706ac324b 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -693,6 +693,7 @@ module ts { export interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 30fe1d09060..f10e9c9030c 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -579,6 +579,7 @@ declare module "typescript" { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 81b98949c7b..1365a0e903b 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -1743,6 +1743,10 @@ declare module "typescript" { >expression : LeftHandSideExpression >LeftHandSideExpression : LeftHandSideExpression + dotToken: Node; +>dotToken : Node +>Node : Node + name: Identifier; >name : Identifier >Identifier : Identifier diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b7a67081440..3e8c579a051 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -610,6 +610,7 @@ declare module "typescript" { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 6da030e8617..0f428ecdec2 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -1889,6 +1889,10 @@ declare module "typescript" { >expression : LeftHandSideExpression >LeftHandSideExpression : LeftHandSideExpression + dotToken: Node; +>dotToken : Node +>Node : Node + name: Identifier; >name : Identifier >Identifier : Identifier diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index c30d4f03456..4cd5c5c0983 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -611,6 +611,7 @@ declare module "typescript" { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 42862def15f..b78b0565a45 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -1839,6 +1839,10 @@ declare module "typescript" { >expression : LeftHandSideExpression >LeftHandSideExpression : LeftHandSideExpression + dotToken: Node; +>dotToken : Node +>Node : Node + name: Identifier; >name : Identifier >Identifier : Identifier diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index a9ed17e924d..139af5b7cd2 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -648,6 +648,7 @@ declare module "typescript" { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { @@ -2108,7 +2109,9 @@ function watch(rootFileNames, options) { }); } function logErrors(fileName) { - var allDiagnostics = services.getCompilerOptionsDiagnostics().concat(services.getSyntacticDiagnostics(fileName)).concat(services.getSemanticDiagnostics(fileName)); + var allDiagnostics = services.getCompilerOptionsDiagnostics() + .concat(services.getSyntacticDiagnostics(fileName)) + .concat(services.getSemanticDiagnostics(fileName)); allDiagnostics.forEach(function (diagnostic) { if (diagnostic.file) { var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); @@ -2121,6 +2124,7 @@ function watch(rootFileNames, options) { } } // Initialize files constituting the program as all .ts files in the current directory -var currentDirectoryFiles = fs.readdirSync(process.cwd()).filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); +var currentDirectoryFiles = fs.readdirSync(process.cwd()). + filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); // Start the watcher watch(currentDirectoryFiles, { module: 1 /* CommonJS */ }); diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 3dd324c421e..5570c9ff12a 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -2012,6 +2012,10 @@ declare module "typescript" { >expression : LeftHandSideExpression >LeftHandSideExpression : LeftHandSideExpression + dotToken: Node; +>dotToken : Node +>Node : Node + name: Identifier; >name : Identifier >Identifier : Identifier diff --git a/tests/baselines/reference/arrayConcatMap.js b/tests/baselines/reference/arrayConcatMap.js index dc7272b7223..715ca158a43 100644 --- a/tests/baselines/reference/arrayConcatMap.js +++ b/tests/baselines/reference/arrayConcatMap.js @@ -3,4 +3,5 @@ var x = [].concat([{ a: 1 }], [{ a: 2 }]) .map(b => b.a); //// [arrayConcatMap.js] -var x = [].concat([{ a: 1 }], [{ a: 2 }]).map(function (b) { return b.a; }); +var x = [].concat([{ a: 1 }], [{ a: 2 }]) + .map(function (b) { return b.a; }); diff --git a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js index 67d9a020bb6..a0a6afb172f 100644 --- a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js +++ b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js @@ -11,5 +11,6 @@ var Position; (function (Position) { Position[Position["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; })(Position || (Position = {})); -var x = IgnoreRulesSpecific.; +var x = IgnoreRulesSpecific. +; var y = 0 /* IgnoreRulesSpecific */; diff --git a/tests/baselines/reference/enumMemberResolution.js b/tests/baselines/reference/enumMemberResolution.js index e1d79ebeb92..ebfcac3a59e 100644 --- a/tests/baselines/reference/enumMemberResolution.js +++ b/tests/baselines/reference/enumMemberResolution.js @@ -12,6 +12,7 @@ var Position2; (function (Position2) { Position2[Position2["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; })(Position2 || (Position2 = {})); -var x = IgnoreRulesSpecific.; // error +var x = IgnoreRulesSpecific. +; // error var y = 1; var z = 0 /* IgnoreRulesSpecific */; // no error diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js index ae8e7d9c918..592a03d7158 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js @@ -228,7 +228,8 @@ var C = (function () { // Not fine, since we can *only* consist of a single throw statement // if no return statements are present but we are a get accessor. throw null; - throw undefined.; + throw undefined. + ; }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/genericChainedCalls.js b/tests/baselines/reference/genericChainedCalls.js index 71d83a906bf..a738e19023b 100644 --- a/tests/baselines/reference/genericChainedCalls.js +++ b/tests/baselines/reference/genericChainedCalls.js @@ -15,8 +15,9 @@ var s3 = s2.func(num => num.toString()) //// [genericChainedCalls.js] -var r1 = v1.func(function (num) { return num.toString(); }).func(function (str) { return str.length; }) // error, number doesn't have a length -.func(function (num) { return num.toString(); }); +var r1 = v1.func(function (num) { return num.toString(); }) + .func(function (str) { return str.length; }) // error, number doesn't have a length + .func(function (num) { return num.toString(); }); var s1 = v1.func(function (num) { return num.toString(); }); var s2 = s1.func(function (str) { return str.length; }); // should also error var s3 = s2.func(function (num) { return num.toString(); }); diff --git a/tests/baselines/reference/overEagerReturnTypeSpecialization.js b/tests/baselines/reference/overEagerReturnTypeSpecialization.js index 67d2005eca9..90fcc388b76 100644 --- a/tests/baselines/reference/overEagerReturnTypeSpecialization.js +++ b/tests/baselines/reference/overEagerReturnTypeSpecialization.js @@ -17,6 +17,6 @@ var r2: I1 = v1.func(num => num.toString()) // Correctly returns an I1 -.func(function (str) { return str.length; }); // should error + .func(function (str) { return str.length; }); // should error var r2 = v1.func(function (num) { return num.toString(); }) // Correctly returns an I1 -.func(function (str) { return str.length; }); // should be ok + .func(function (str) { return str.length; }); // should be ok diff --git a/tests/baselines/reference/parse1.js b/tests/baselines/reference/parse1.js index 08af81bda17..4804e31adcd 100644 --- a/tests/baselines/reference/parse1.js +++ b/tests/baselines/reference/parse1.js @@ -8,5 +8,6 @@ function foo() { //// [parse1.js] var bar = 42; function foo() { - bar.; + bar. + ; } diff --git a/tests/baselines/reference/parser509667.js b/tests/baselines/reference/parser509667.js index 21e0bc55ce4..0938613b295 100644 --- a/tests/baselines/reference/parser509667.js +++ b/tests/baselines/reference/parser509667.js @@ -16,7 +16,8 @@ var Foo = (function () { function Foo() { } Foo.prototype.f1 = function () { - if (this.) + if (this. + ) ; }; Foo.prototype.f2 = function () { diff --git a/tests/baselines/reference/underscoreTest1.js b/tests/baselines/reference/underscoreTest1.js index a4fa2cbc65d..ddd5201b858 100644 --- a/tests/baselines/reference/underscoreTest1.js +++ b/tests/baselines/reference/underscoreTest1.js @@ -1018,7 +1018,11 @@ _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid'); var iceCream = { flavor: "chocolate" }; _.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" }); _.clone({ name: 'moe' }); -_.chain([1, 2, 3, 200]).filter(function (num) { return num % 2 == 0; }).tap(alert).map(function (num) { return num * num; }).value(); +_.chain([1, 2, 3, 200]) + .filter(function (num) { return num % 2 == 0; }) + .tap(alert) + .map(function (num) { return num * num; }) + .value(); _.has({ a: 1, b: 2, c: 3 }, "b"); var moe = { name: 'moe', luckyNumbers: [13, 27, 34] }; var clone = { name: 'moe', luckyNumbers: [13, 27, 34] }; diff --git a/tests/baselines/reference/wrappedIncovations1.js b/tests/baselines/reference/wrappedIncovations1.js new file mode 100644 index 00000000000..b9e5ed688f9 --- /dev/null +++ b/tests/baselines/reference/wrappedIncovations1.js @@ -0,0 +1,11 @@ +//// [wrappedIncovations1.ts] +var v = this + .foo() + .bar() + .baz(); + +//// [wrappedIncovations1.js] +var v = this + .foo() + .bar() + .baz(); diff --git a/tests/baselines/reference/wrappedIncovations1.types b/tests/baselines/reference/wrappedIncovations1.types new file mode 100644 index 00000000000..32f7bb0e1b8 --- /dev/null +++ b/tests/baselines/reference/wrappedIncovations1.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/wrappedIncovations1.ts === +var v = this +>v : any +>this .foo() .bar() .baz() : any +>this .foo() .bar() .baz : any +>this .foo() .bar() : any +>this .foo() .bar : any +>this .foo() : any +>this .foo : any +>this : any + + .foo() +>foo : any + + .bar() +>bar : any + + .baz(); +>baz : any + diff --git a/tests/baselines/reference/wrappedIncovations2.js b/tests/baselines/reference/wrappedIncovations2.js new file mode 100644 index 00000000000..09951996c94 --- /dev/null +++ b/tests/baselines/reference/wrappedIncovations2.js @@ -0,0 +1,11 @@ +//// [wrappedIncovations2.ts] +var v = this. + foo(). + bar(). + baz(); + +//// [wrappedIncovations2.js] +var v = this. + foo(). + bar(). + baz(); diff --git a/tests/baselines/reference/wrappedIncovations2.types b/tests/baselines/reference/wrappedIncovations2.types new file mode 100644 index 00000000000..96337796bcd --- /dev/null +++ b/tests/baselines/reference/wrappedIncovations2.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/wrappedIncovations2.ts === +var v = this. +>v : any +>this. foo(). bar(). baz() : any +>this. foo(). bar(). baz : any +>this. foo(). bar() : any +>this. foo(). bar : any +>this. foo() : any +>this. foo : any +>this : any + + foo(). +>foo : any + + bar(). +>bar : any + + baz(); +>baz : any + diff --git a/tests/cases/compiler/wrappedIncovations1.ts b/tests/cases/compiler/wrappedIncovations1.ts new file mode 100644 index 00000000000..2c8ee00fe0e --- /dev/null +++ b/tests/cases/compiler/wrappedIncovations1.ts @@ -0,0 +1,4 @@ +var v = this + .foo() + .bar() + .baz(); \ No newline at end of file diff --git a/tests/cases/compiler/wrappedIncovations2.ts b/tests/cases/compiler/wrappedIncovations2.ts new file mode 100644 index 00000000000..eba99b425e4 --- /dev/null +++ b/tests/cases/compiler/wrappedIncovations2.ts @@ -0,0 +1,4 @@ +var v = this. + foo(). + bar(). + baz(); \ No newline at end of file diff --git a/tests/cases/unittests/incrementalParser.ts b/tests/cases/unittests/incrementalParser.ts index 54adcaf345f..e785f1cdf00 100644 --- a/tests/cases/unittests/incrementalParser.ts +++ b/tests/cases/unittests/incrementalParser.ts @@ -664,7 +664,7 @@ module m3 { }\ var oldText = ScriptSnapshot.fromString(source); var newTextAndChange = withInsert(oldText, 0, ""); - compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 7); + compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 8); }); it('Class to interface',() => { From fecd20a3dbdc71855bfc601d99c9d95034d99766 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Thu, 5 Mar 2015 11:47:40 -0800 Subject: [PATCH 041/251] Fix sourcemaps for 'for...of' and no source maps for synthesized nodes --- src/compiler/emitter.ts | 45 +++-- tests/baselines/reference/ES5For-of1.js | 8 +- tests/baselines/reference/ES5For-of1.js.map | 2 + .../reference/ES5For-of1.sourcemap.txt | 116 ++++++++++++ tests/baselines/reference/ES5For-of13.js | 5 +- tests/baselines/reference/ES5For-of13.js.map | 2 + .../reference/ES5For-of13.sourcemap.txt | 109 +++++++++++ tests/baselines/reference/ES5For-of25.js | 1 + tests/baselines/reference/ES5For-of25.js.map | 2 + .../reference/ES5For-of25.sourcemap.txt | 135 +++++++++++++ tests/baselines/reference/ES5For-of26.js | 1 + tests/baselines/reference/ES5For-of26.js.map | 2 + .../reference/ES5For-of26.sourcemap.txt | 126 +++++++++++++ tests/baselines/reference/ES5For-of3.js | 5 +- tests/baselines/reference/ES5For-of3.js.map | 2 + .../reference/ES5For-of3.sourcemap.txt | 108 +++++++++++ tests/baselines/reference/ES5For-of8.js | 5 +- tests/baselines/reference/ES5For-of8.js.map | 2 + .../reference/ES5For-of8.sourcemap.txt | 178 ++++++++++++++++++ ...computedPropertyNamesSourceMap2_ES5.js.map | 2 +- ...dPropertyNamesSourceMap2_ES5.sourcemap.txt | 130 +++---------- .../statements/for-ofStatements/ES5For-of1.ts | 5 +- .../for-ofStatements/ES5For-of13.ts | 3 +- .../for-ofStatements/ES5For-of25.ts | 1 + .../for-ofStatements/ES5For-of26.ts | 1 + .../statements/for-ofStatements/ES5For-of3.ts | 3 +- .../for-ofStatements/ES5For-of32.ts | 4 - .../statements/for-ofStatements/ES5For-of8.ts | 3 +- 28 files changed, 865 insertions(+), 141 deletions(-) create mode 100644 tests/baselines/reference/ES5For-of1.js.map create mode 100644 tests/baselines/reference/ES5For-of1.sourcemap.txt create mode 100644 tests/baselines/reference/ES5For-of13.js.map create mode 100644 tests/baselines/reference/ES5For-of13.sourcemap.txt create mode 100644 tests/baselines/reference/ES5For-of25.js.map create mode 100644 tests/baselines/reference/ES5For-of25.sourcemap.txt create mode 100644 tests/baselines/reference/ES5For-of26.js.map create mode 100644 tests/baselines/reference/ES5For-of26.sourcemap.txt create mode 100644 tests/baselines/reference/ES5For-of3.js.map create mode 100644 tests/baselines/reference/ES5For-of3.sourcemap.txt create mode 100644 tests/baselines/reference/ES5For-of8.js.map create mode 100644 tests/baselines/reference/ES5For-of8.sourcemap.txt delete mode 100644 tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 8f01232ef77..3fef1735a2d 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2067,6 +2067,9 @@ module ts { function emitNodeWithMap(node: Node) { if (node) { + if (nodeIsSynthesized(node)) { + return emitNode(node); + } if (node.kind != SyntaxKind.SourceFile) { recordEmitNodeStartSpan(node); emitNode(node); @@ -3517,9 +3520,6 @@ module ts { var endPos = emitToken(SyntaxKind.ForKeyword, node.pos); write(" "); endPos = emitToken(SyntaxKind.OpenParenToken, endPos); - // This is the var keyword for the counter and rhsReference. The var keyword for - // the LHS will be emitted inside the body. - write("var "); // Do not emit the LHS var declaration yet, because it might contain destructuring. @@ -3533,29 +3533,42 @@ module ts { var rhsIsIdentifier = node.expression.kind === SyntaxKind.Identifier; var counter = createTempVariable(node, /*forLoopVariable*/ true); var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, /*forLoopVariable*/ false); + + // This is the var keyword for the counter and rhsReference. The var keyword for + // the LHS will be emitted inside the body. + emitStart(node.expression); + write("var "); // _i = 0 - emit(counter); + emitNode(counter); write(" = 0"); + emitEnd(node.expression); if (!rhsIsIdentifier) { // , _a = expr write(", "); - emit(rhsReference); + emitStart(node.expression); + emitNode(rhsReference); write(" = "); - emit(node.expression); + emitNode(node.expression); + emitEnd(node.expression); } write("; "); // _i < _a.length; - emit(counter); + emitStart(node.initializer); + emitNode(counter); write(" < "); - emit(rhsReference); - write(".length; "); + emitNode(rhsReference); + write(".length"); + emitEnd(node.initializer); + write("; "); // _i++) - emit(counter); + emitStart(node.initializer); + emitNode(counter); write("++"); + emitEnd(node.initializer); emitToken(SyntaxKind.CloseParenToken, node.expression.end); // Body @@ -3566,6 +3579,7 @@ module ts { // Initialize LHS // var v = _a[_i]; var rhsIterationValue = createElementAccessExpression(rhsReference, counter); + emitStart(node.initializer); if (node.initializer.kind === SyntaxKind.VariableDeclarationList) { write("var "); var variableDeclarationList = node.initializer; @@ -3579,18 +3593,18 @@ module ts { else { // The following call does not include the initializer, so we have // to emit it separately. - emit(declaration); + emitNode(declaration); write(" = "); - emit(rhsIterationValue); + emitNode(rhsIterationValue); } } else { // It's an empty declaration list. This can only happen in an error case, if the user wrote // for (var of []) {} var emptyDeclarationListTemp = createTempVariable(node, /*forLoopVariable*/ false); - emit(emptyDeclarationListTemp); + emitNode(emptyDeclarationListTemp); write(" = "); - emit(rhsIterationValue); + emitNode(rhsIterationValue); } } else { @@ -3604,9 +3618,10 @@ module ts { emitDestructuring(assignmentExpressionStatement); } else { - emit(assignmentExpression); + emitNode(assignmentExpression); } } + emitEnd(node.initializer); write(";"); if (node.statement.kind === SyntaxKind.Block) { diff --git a/tests/baselines/reference/ES5For-of1.js b/tests/baselines/reference/ES5For-of1.js index 8001d5b537f..dffe843399f 100644 --- a/tests/baselines/reference/ES5For-of1.js +++ b/tests/baselines/reference/ES5For-of1.js @@ -1,7 +1,11 @@ //// [ES5For-of1.ts] -for (var v of []) { } +for (var v of ['a', 'b', 'c']) { + console.log(v); +} //// [ES5For-of1.js] -for (var _i = 0, _a = []; _i < _a.length; _i++) { +for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { var v = _a[_i]; + console.log(v); } +//# sourceMappingURL=ES5For-of1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of1.js.map b/tests/baselines/reference/ES5For-of1.js.map new file mode 100644 index 00000000000..568ac1987e7 --- /dev/null +++ b/tests/baselines/reference/ES5For-of1.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of1.js.map] +{"version":3,"file":"ES5For-of1.js","sourceRoot":"","sources":["ES5For-of1.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClB"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of1.sourcemap.txt b/tests/baselines/reference/ES5For-of1.sourcemap.txt new file mode 100644 index 00000000000..7bdd7edfa13 --- /dev/null +++ b/tests/baselines/reference/ES5For-of1.sourcemap.txt @@ -0,0 +1,116 @@ +=================================================================== +JsFile: ES5For-of1.js +mapUrl: ES5For-of1.js.map +sourceRoot: +sources: ES5For-of1.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of1.js +sourceFile:ES5For-of1.ts +------------------------------------------------------------------- +>>>for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { +1 > +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^ +8 > ^^^ +9 > ^^ +10> ^^^ +11> ^^ +12> ^^^ +13> ^ +14> ^^ +15> ^^^^^^^^^^^^^^ +16> ^^ +17> ^^^^ +18> ^ +1 > +2 >for +3 > +4 > (var v of +5 > ['a', 'b', 'c'] +6 > +7 > [ +8 > 'a' +9 > , +10> 'b' +11> , +12> 'c' +13> ] +14> +15> var v +16> +17> var v of ['a', 'b', 'c'] +18> ) +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0) +3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) +4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0) +5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0) +6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0) +7 >Emitted(1, 24) Source(1, 16) + SourceIndex(0) +8 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) +9 >Emitted(1, 29) Source(1, 21) + SourceIndex(0) +10>Emitted(1, 32) Source(1, 24) + SourceIndex(0) +11>Emitted(1, 34) Source(1, 26) + SourceIndex(0) +12>Emitted(1, 37) Source(1, 29) + SourceIndex(0) +13>Emitted(1, 38) Source(1, 30) + SourceIndex(0) +14>Emitted(1, 40) Source(1, 6) + SourceIndex(0) +15>Emitted(1, 54) Source(1, 11) + SourceIndex(0) +16>Emitted(1, 56) Source(1, 6) + SourceIndex(0) +17>Emitted(1, 60) Source(1, 30) + SourceIndex(0) +18>Emitted(1, 61) Source(1, 31) + SourceIndex(0) +--- +>>> var v = _a[_i]; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^^^^^^ +5 > ^^-> +1 > +2 > var +3 > v +4 > +1 >Emitted(2, 5) Source(1, 6) + SourceIndex(0) +2 >Emitted(2, 9) Source(1, 10) + SourceIndex(0) +3 >Emitted(2, 10) Source(1, 11) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 11) + SourceIndex(0) +--- +>>> console.log(v); +1->^^^^ +2 > ^^^^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^ +7 > ^ +8 > ^ +1-> of ['a', 'b', 'c']) { + > +2 > console +3 > . +4 > log +5 > ( +6 > v +7 > ) +8 > ; +1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 12) Source(2, 12) + SourceIndex(0) +3 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 16) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 17) + SourceIndex(0) +6 >Emitted(3, 18) Source(2, 18) + SourceIndex(0) +7 >Emitted(3, 19) Source(2, 19) + SourceIndex(0) +8 >Emitted(3, 20) Source(2, 20) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >} +1 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of13.js b/tests/baselines/reference/ES5For-of13.js index 93aa8dec765..2bcf98e14f1 100644 --- a/tests/baselines/reference/ES5For-of13.js +++ b/tests/baselines/reference/ES5For-of13.js @@ -1,10 +1,11 @@ //// [ES5For-of13.ts] -for (let v of []) { +for (let v of ['a', 'b', 'c']) { var x = v; } //// [ES5For-of13.js] -for (var _i = 0, _a = []; _i < _a.length; _i++) { +for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { var v = _a[_i]; var x = v; } +//# sourceMappingURL=ES5For-of13.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of13.js.map b/tests/baselines/reference/ES5For-of13.js.map new file mode 100644 index 00000000000..5ff54bb8816 --- /dev/null +++ b/tests/baselines/reference/ES5For-of13.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of13.js.map] +{"version":3,"file":"ES5For-of13.js","sourceRoot":"","sources":["ES5For-of13.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CACb"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of13.sourcemap.txt b/tests/baselines/reference/ES5For-of13.sourcemap.txt new file mode 100644 index 00000000000..c3a188e7221 --- /dev/null +++ b/tests/baselines/reference/ES5For-of13.sourcemap.txt @@ -0,0 +1,109 @@ +=================================================================== +JsFile: ES5For-of13.js +mapUrl: ES5For-of13.js.map +sourceRoot: +sources: ES5For-of13.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of13.js +sourceFile:ES5For-of13.ts +------------------------------------------------------------------- +>>>for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { +1 > +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^ +8 > ^^^ +9 > ^^ +10> ^^^ +11> ^^ +12> ^^^ +13> ^ +14> ^^ +15> ^^^^^^^^^^^^^^ +16> ^^ +17> ^^^^ +18> ^ +1 > +2 >for +3 > +4 > (let v of +5 > ['a', 'b', 'c'] +6 > +7 > [ +8 > 'a' +9 > , +10> 'b' +11> , +12> 'c' +13> ] +14> +15> let v +16> +17> let v of ['a', 'b', 'c'] +18> ) +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0) +3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) +4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0) +5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0) +6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0) +7 >Emitted(1, 24) Source(1, 16) + SourceIndex(0) +8 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) +9 >Emitted(1, 29) Source(1, 21) + SourceIndex(0) +10>Emitted(1, 32) Source(1, 24) + SourceIndex(0) +11>Emitted(1, 34) Source(1, 26) + SourceIndex(0) +12>Emitted(1, 37) Source(1, 29) + SourceIndex(0) +13>Emitted(1, 38) Source(1, 30) + SourceIndex(0) +14>Emitted(1, 40) Source(1, 6) + SourceIndex(0) +15>Emitted(1, 54) Source(1, 11) + SourceIndex(0) +16>Emitted(1, 56) Source(1, 6) + SourceIndex(0) +17>Emitted(1, 60) Source(1, 30) + SourceIndex(0) +18>Emitted(1, 61) Source(1, 31) + SourceIndex(0) +--- +>>> var v = _a[_i]; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^^^^^^ +1 > +2 > let +3 > v +4 > +1 >Emitted(2, 5) Source(1, 6) + SourceIndex(0) +2 >Emitted(2, 9) Source(1, 10) + SourceIndex(0) +3 >Emitted(2, 10) Source(1, 11) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 11) + SourceIndex(0) +--- +>>> var x = v; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^ +1 > of ['a', 'b', 'c']) { + > +2 > var +3 > x +4 > = +5 > v +6 > ; +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) +5 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) +6 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >} +1 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of13.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of25.js b/tests/baselines/reference/ES5For-of25.js index 5e52f7cad5d..756c14fbe81 100644 --- a/tests/baselines/reference/ES5For-of25.js +++ b/tests/baselines/reference/ES5For-of25.js @@ -12,3 +12,4 @@ for (var _i = 0; _i < a.length; _i++) { v; a; } +//# sourceMappingURL=ES5For-of25.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of25.js.map b/tests/baselines/reference/ES5For-of25.js.map new file mode 100644 index 00000000000..cc31767128b --- /dev/null +++ b/tests/baselines/reference/ES5For-of25.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of25.js.map] +{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAV,aAAK,EAAL,IAAU,CAAC;IAAX,IAAI,CAAC,GAAI,CAAC,IAAL;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of25.sourcemap.txt b/tests/baselines/reference/ES5For-of25.sourcemap.txt new file mode 100644 index 00000000000..623627fde20 --- /dev/null +++ b/tests/baselines/reference/ES5For-of25.sourcemap.txt @@ -0,0 +1,135 @@ +=================================================================== +JsFile: ES5For-of25.js +mapUrl: ES5For-of25.js.map +sourceRoot: +sources: ES5For-of25.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of25.js +sourceFile:ES5For-of25.ts +------------------------------------------------------------------- +>>>var a = [1, 2, 3]; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^ +7 > ^^ +8 > ^ +9 > ^^ +10> ^ +11> ^ +12> ^ +13> ^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >var +3 > a +4 > = +5 > [ +6 > 1 +7 > , +8 > 2 +9 > , +10> 3 +11> ] +12> ; +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0) +5 >Emitted(1, 10) Source(1, 10) + SourceIndex(0) +6 >Emitted(1, 11) Source(1, 11) + SourceIndex(0) +7 >Emitted(1, 13) Source(1, 13) + SourceIndex(0) +8 >Emitted(1, 14) Source(1, 14) + SourceIndex(0) +9 >Emitted(1, 16) Source(1, 16) + SourceIndex(0) +10>Emitted(1, 17) Source(1, 17) + SourceIndex(0) +11>Emitted(1, 18) Source(1, 18) + SourceIndex(0) +12>Emitted(1, 19) Source(1, 19) + SourceIndex(0) +--- +>>>for (var _i = 0; _i < a.length; _i++) { +1-> +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^^^^^^ +8 > ^^ +9 > ^^^^ +10> ^ +1-> + > +2 >for +3 > +4 > (var v of +5 > a +6 > +7 > var v +8 > +9 > var v of a +10> ) +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(2, 4) Source(2, 4) + SourceIndex(0) +3 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) +4 >Emitted(2, 6) Source(2, 15) + SourceIndex(0) +5 >Emitted(2, 16) Source(2, 16) + SourceIndex(0) +6 >Emitted(2, 18) Source(2, 6) + SourceIndex(0) +7 >Emitted(2, 31) Source(2, 11) + SourceIndex(0) +8 >Emitted(2, 33) Source(2, 6) + SourceIndex(0) +9 >Emitted(2, 37) Source(2, 16) + SourceIndex(0) +10>Emitted(2, 38) Source(2, 17) + SourceIndex(0) +--- +>>> var v = a[_i]; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^^^^ +1 > +2 > var +3 > v +4 > of +5 > a +6 > +1 >Emitted(3, 5) Source(2, 6) + SourceIndex(0) +2 >Emitted(3, 9) Source(2, 10) + SourceIndex(0) +3 >Emitted(3, 10) Source(2, 11) + SourceIndex(0) +4 >Emitted(3, 13) Source(2, 15) + SourceIndex(0) +5 >Emitted(3, 14) Source(2, 16) + SourceIndex(0) +6 >Emitted(3, 18) Source(2, 11) + SourceIndex(0) +--- +>>> v; +1 >^^^^ +2 > ^ +3 > ^ +4 > ^-> +1 > of a) { + > +2 > v +3 > ; +1 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(4, 6) Source(3, 6) + SourceIndex(0) +3 >Emitted(4, 7) Source(3, 7) + SourceIndex(0) +--- +>>> a; +1->^^^^ +2 > ^ +3 > ^ +1-> + > +2 > a +3 > ; +1->Emitted(5, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 6) + SourceIndex(0) +3 >Emitted(5, 7) Source(4, 7) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >} +1 >Emitted(6, 2) Source(5, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of25.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of26.js b/tests/baselines/reference/ES5For-of26.js index 02d462b6025..4571cc660a3 100644 --- a/tests/baselines/reference/ES5For-of26.js +++ b/tests/baselines/reference/ES5For-of26.js @@ -10,3 +10,4 @@ for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { a; b; } +//# sourceMappingURL=ES5For-of26.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of26.js.map b/tests/baselines/reference/ES5For-of26.js.map new file mode 100644 index 00000000000..704a3a24f2a --- /dev/null +++ b/tests/baselines/reference/ES5For-of26.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of26.js.map] +{"version":3,"file":"ES5For-of26.js","sourceRoot":"","sources":["ES5For-of26.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAuB,UAAM,EAAN,MAAC,CAAC,EAAE,CAAC,CAAC,EAA5B,cAAkB,EAAlB,IAA4B,CAAC;IAA7B,6BAAK,CAAC,mBAAG,CAAC,mBAAE,CAAC,mBAAG,CAAC,KAAC;IACnB,CAAC,CAAC;IACF,CAAC,CAAC;CACL"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of26.sourcemap.txt b/tests/baselines/reference/ES5For-of26.sourcemap.txt new file mode 100644 index 00000000000..c9942b1e861 --- /dev/null +++ b/tests/baselines/reference/ES5For-of26.sourcemap.txt @@ -0,0 +1,126 @@ +=================================================================== +JsFile: ES5For-of26.js +mapUrl: ES5For-of26.js.map +sourceRoot: +sources: ES5For-of26.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of26.js +sourceFile:ES5For-of26.ts +------------------------------------------------------------------- +>>>for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) { +1 > +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^ +8 > ^ +9 > ^^ +10> ^ +11> ^ +12> ^^ +13> ^^^^^^^^^^^^^^ +14> ^^ +15> ^^^^ +16> ^ +17> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >for +3 > +4 > (var [a = 0, b = 1] of +5 > [2, 3] +6 > +7 > [ +8 > 2 +9 > , +10> 3 +11> ] +12> +13> var [a = 0, b = 1] +14> +15> var [a = 0, b = 1] of [2, 3] +16> ) +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0) +3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) +4 >Emitted(1, 6) Source(1, 28) + SourceIndex(0) +5 >Emitted(1, 16) Source(1, 34) + SourceIndex(0) +6 >Emitted(1, 18) Source(1, 28) + SourceIndex(0) +7 >Emitted(1, 24) Source(1, 29) + SourceIndex(0) +8 >Emitted(1, 25) Source(1, 30) + SourceIndex(0) +9 >Emitted(1, 27) Source(1, 32) + SourceIndex(0) +10>Emitted(1, 28) Source(1, 33) + SourceIndex(0) +11>Emitted(1, 29) Source(1, 34) + SourceIndex(0) +12>Emitted(1, 31) Source(1, 6) + SourceIndex(0) +13>Emitted(1, 45) Source(1, 24) + SourceIndex(0) +14>Emitted(1, 47) Source(1, 6) + SourceIndex(0) +15>Emitted(1, 51) Source(1, 34) + SourceIndex(0) +16>Emitted(1, 52) Source(1, 35) + SourceIndex(0) +--- +>>> var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d; +1->^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^ +5 > ^ +6 > ^^^^^^^^^^^^^^^^^^^ +7 > ^ +8 > ^^^^^^^^^^^^^^^^^^^ +9 > ^ +10> ^^^^^ +1-> +2 > var [ +3 > a +4 > = +5 > 0 +6 > , +7 > b +8 > = +9 > 1 +10> ] +1->Emitted(2, 5) Source(1, 6) + SourceIndex(0) +2 >Emitted(2, 34) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 35) Source(1, 12) + SourceIndex(0) +4 >Emitted(2, 54) Source(1, 15) + SourceIndex(0) +5 >Emitted(2, 55) Source(1, 16) + SourceIndex(0) +6 >Emitted(2, 74) Source(1, 18) + SourceIndex(0) +7 >Emitted(2, 75) Source(1, 19) + SourceIndex(0) +8 >Emitted(2, 94) Source(1, 22) + SourceIndex(0) +9 >Emitted(2, 95) Source(1, 23) + SourceIndex(0) +10>Emitted(2, 100) Source(1, 24) + SourceIndex(0) +--- +>>> a; +1 >^^^^ +2 > ^ +3 > ^ +4 > ^-> +1 > of [2, 3]) { + > +2 > a +3 > ; +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 6) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 7) + SourceIndex(0) +--- +>>> b; +1->^^^^ +2 > ^ +3 > ^ +1-> + > +2 > b +3 > ; +1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(4, 6) Source(3, 6) + SourceIndex(0) +3 >Emitted(4, 7) Source(3, 7) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >} +1 >Emitted(5, 2) Source(4, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of26.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of3.js b/tests/baselines/reference/ES5For-of3.js index c36110443b4..648d34a9b16 100644 --- a/tests/baselines/reference/ES5For-of3.js +++ b/tests/baselines/reference/ES5For-of3.js @@ -1,9 +1,10 @@ //// [ES5For-of3.ts] -for (var v of []) +for (var v of ['a', 'b', 'c']) var x = v; //// [ES5For-of3.js] -for (var _i = 0, _a = []; _i < _a.length; _i++) { +for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { var v = _a[_i]; var x = v; } +//# sourceMappingURL=ES5For-of3.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of3.js.map b/tests/baselines/reference/ES5For-of3.js.map new file mode 100644 index 00000000000..7454e1ca85d --- /dev/null +++ b/tests/baselines/reference/ES5For-of3.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of3.js.map] +{"version":3,"file":"ES5For-of3.js","sourceRoot":"","sources":["ES5For-of3.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of3.sourcemap.txt b/tests/baselines/reference/ES5For-of3.sourcemap.txt new file mode 100644 index 00000000000..dd0bca37b68 --- /dev/null +++ b/tests/baselines/reference/ES5For-of3.sourcemap.txt @@ -0,0 +1,108 @@ +=================================================================== +JsFile: ES5For-of3.js +mapUrl: ES5For-of3.js.map +sourceRoot: +sources: ES5For-of3.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of3.js +sourceFile:ES5For-of3.ts +------------------------------------------------------------------- +>>>for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { +1 > +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^ +8 > ^^^ +9 > ^^ +10> ^^^ +11> ^^ +12> ^^^ +13> ^ +14> ^^ +15> ^^^^^^^^^^^^^^ +16> ^^ +17> ^^^^ +18> ^ +1 > +2 >for +3 > +4 > (var v of +5 > ['a', 'b', 'c'] +6 > +7 > [ +8 > 'a' +9 > , +10> 'b' +11> , +12> 'c' +13> ] +14> +15> var v +16> +17> var v of ['a', 'b', 'c'] +18> ) +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0) +3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) +4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0) +5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0) +6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0) +7 >Emitted(1, 24) Source(1, 16) + SourceIndex(0) +8 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) +9 >Emitted(1, 29) Source(1, 21) + SourceIndex(0) +10>Emitted(1, 32) Source(1, 24) + SourceIndex(0) +11>Emitted(1, 34) Source(1, 26) + SourceIndex(0) +12>Emitted(1, 37) Source(1, 29) + SourceIndex(0) +13>Emitted(1, 38) Source(1, 30) + SourceIndex(0) +14>Emitted(1, 40) Source(1, 6) + SourceIndex(0) +15>Emitted(1, 54) Source(1, 11) + SourceIndex(0) +16>Emitted(1, 56) Source(1, 6) + SourceIndex(0) +17>Emitted(1, 60) Source(1, 30) + SourceIndex(0) +18>Emitted(1, 61) Source(1, 31) + SourceIndex(0) +--- +>>> var v = _a[_i]; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^^^^^^ +1 > +2 > var +3 > v +4 > +1 >Emitted(2, 5) Source(1, 6) + SourceIndex(0) +2 >Emitted(2, 9) Source(1, 10) + SourceIndex(0) +3 >Emitted(2, 10) Source(1, 11) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 11) + SourceIndex(0) +--- +>>> var x = v; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^ +1 > of ['a', 'b', 'c']) + > +2 > var +3 > x +4 > = +5 > v +6 > ; +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) +5 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) +6 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +1 >Emitted(4, 2) Source(2, 15) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of3.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.js b/tests/baselines/reference/ES5For-of8.js index a3d20b92056..dbe747b9690 100644 --- a/tests/baselines/reference/ES5For-of8.js +++ b/tests/baselines/reference/ES5For-of8.js @@ -2,7 +2,7 @@ function foo() { return { x: 0 }; } -for (foo().x of []) { +for (foo().x of ['a', 'b', 'c']) { var p = foo().x; } @@ -10,7 +10,8 @@ for (foo().x of []) { function foo() { return { x: 0 }; } -for (var _i = 0, _a = []; _i < _a.length; _i++) { +for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { foo().x = _a[_i]; var p = foo().x; } +//# sourceMappingURL=ES5For-of8.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.js.map b/tests/baselines/reference/ES5For-of8.js.map new file mode 100644 index 00000000000..23dec486d8d --- /dev/null +++ b/tests/baselines/reference/ES5For-of8.js.map @@ -0,0 +1,2 @@ +//// [ES5For-of8.js.map] +{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":["foo"],"mappings":"AAAA,SAAS,GAAG;IACRA,MAAMA,CAACA,EAAEA,CAACA,EAAEA,CAACA,EAAEA,CAACA;AACpBA,CAACA;AACD,GAAG,CAAC,CAAY,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAA1B,cAAO,EAAP,IAA0B,CAAC;IAA3B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.sourcemap.txt b/tests/baselines/reference/ES5For-of8.sourcemap.txt new file mode 100644 index 00000000000..e1cf66513a2 --- /dev/null +++ b/tests/baselines/reference/ES5For-of8.sourcemap.txt @@ -0,0 +1,178 @@ +=================================================================== +JsFile: ES5For-of8.js +mapUrl: ES5For-of8.js.map +sourceRoot: +sources: ES5For-of8.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of8.js +sourceFile:ES5For-of8.ts +------------------------------------------------------------------- +>>>function foo() { +1 > +2 >^^^^^^^^^ +3 > ^^^ +4 > ^^^^^^^^^-> +1 > +2 >function +3 > foo +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 10) Source(1, 10) + SourceIndex(0) +3 >Emitted(1, 13) Source(1, 13) + SourceIndex(0) +--- +>>> return { x: 0 }; +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^ +8 > ^^ +9 > ^ +1->() { + > +2 > return +3 > +4 > { +5 > x +6 > : +7 > 0 +8 > } +9 > ; +1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (foo) +2 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) name (foo) +3 >Emitted(2, 12) Source(2, 12) + SourceIndex(0) name (foo) +4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) name (foo) +5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) name (foo) +6 >Emitted(2, 17) Source(2, 17) + SourceIndex(0) name (foo) +7 >Emitted(2, 18) Source(2, 18) + SourceIndex(0) name (foo) +8 >Emitted(2, 20) Source(2, 20) + SourceIndex(0) name (foo) +9 >Emitted(2, 21) Source(2, 21) + SourceIndex(0) name (foo) +--- +>>>} +1 > +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >} +1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0) name (foo) +2 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) name (foo) +--- +>>>for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) { +1-> +2 >^^^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^ +8 > ^^^ +9 > ^^ +10> ^^^ +11> ^^ +12> ^^^ +13> ^ +14> ^^ +15> ^^^^^^^^^^^^^^ +16> ^^ +17> ^^^^ +18> ^ +1-> + > +2 >for +3 > +4 > (foo().x of +5 > ['a', 'b', 'c'] +6 > +7 > [ +8 > 'a' +9 > , +10> 'b' +11> , +12> 'c' +13> ] +14> +15> foo().x +16> +17> foo().x of ['a', 'b', 'c'] +18> ) +1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 4) Source(4, 4) + SourceIndex(0) +3 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) +4 >Emitted(4, 6) Source(4, 17) + SourceIndex(0) +5 >Emitted(4, 16) Source(4, 32) + SourceIndex(0) +6 >Emitted(4, 18) Source(4, 17) + SourceIndex(0) +7 >Emitted(4, 24) Source(4, 18) + SourceIndex(0) +8 >Emitted(4, 27) Source(4, 21) + SourceIndex(0) +9 >Emitted(4, 29) Source(4, 23) + SourceIndex(0) +10>Emitted(4, 32) Source(4, 26) + SourceIndex(0) +11>Emitted(4, 34) Source(4, 28) + SourceIndex(0) +12>Emitted(4, 37) Source(4, 31) + SourceIndex(0) +13>Emitted(4, 38) Source(4, 32) + SourceIndex(0) +14>Emitted(4, 40) Source(4, 6) + SourceIndex(0) +15>Emitted(4, 54) Source(4, 13) + SourceIndex(0) +16>Emitted(4, 56) Source(4, 6) + SourceIndex(0) +17>Emitted(4, 60) Source(4, 32) + SourceIndex(0) +18>Emitted(4, 61) Source(4, 33) + SourceIndex(0) +--- +>>> foo().x = _a[_i]; +1 >^^^^ +2 > ^^^ +3 > ^^ +4 > ^ +5 > ^ +6 > ^^^^^^^^^ +7 > ^-> +1 > +2 > foo +3 > () +4 > . +5 > x +6 > +1 >Emitted(5, 5) Source(4, 6) + SourceIndex(0) +2 >Emitted(5, 8) Source(4, 9) + SourceIndex(0) +3 >Emitted(5, 10) Source(4, 11) + SourceIndex(0) +4 >Emitted(5, 11) Source(4, 12) + SourceIndex(0) +5 >Emitted(5, 12) Source(4, 13) + SourceIndex(0) +6 >Emitted(5, 21) Source(4, 13) + SourceIndex(0) +--- +>>> var p = foo().x; +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^ +5 > ^^^ +6 > ^^ +7 > ^ +8 > ^ +9 > ^ +1-> of ['a', 'b', 'c']) { + > +2 > var +3 > p +4 > = +5 > foo +6 > () +7 > . +8 > x +9 > ; +1->Emitted(6, 5) Source(5, 5) + SourceIndex(0) +2 >Emitted(6, 9) Source(5, 9) + SourceIndex(0) +3 >Emitted(6, 10) Source(5, 10) + SourceIndex(0) +4 >Emitted(6, 13) Source(5, 13) + SourceIndex(0) +5 >Emitted(6, 16) Source(5, 16) + SourceIndex(0) +6 >Emitted(6, 18) Source(5, 18) + SourceIndex(0) +7 >Emitted(6, 19) Source(5, 19) + SourceIndex(0) +8 >Emitted(6, 20) Source(5, 20) + SourceIndex(0) +9 >Emitted(6, 21) Source(5, 21) + SourceIndex(0) +--- +>>>} +1 >^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >} +1 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=ES5For-of8.js.map \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map index d4df74499d0..413c98fa456 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map +++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map @@ -1,2 +1,2 @@ //// [computedPropertyNamesSourceMap2_ES5.js.map] -{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,AADA,CAAA,EAAA,GAAA,EAAA;IAAA,EAAA,CAEA,OAAO,CAFA,GAAA;QAGA,QAAQ,CAAC;IACb,CAAC,AAJA;IAAA,EAAA,CAKA,CAAA;IALA,EAAA"} \ No newline at end of file +{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;OACH,OAAO;QACJ,QAAQ,CAAC;IACb,CAAC;OACJ,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt index e1a4f764f42..03eec606718 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt +++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt @@ -13,144 +13,56 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts 2 >^^^^ 3 > ^ 4 > ^^^ -5 > -6 > ^ -7 > ^^ -8 > ^^^ -9 > ^^ -10> ^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >var 3 > v 4 > = -5 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -5 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 9) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 9) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -5 > -6 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -6 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 9) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 10) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -6 > -7 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -7 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 10) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 12) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -7 > -8 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -8 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 10) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 15) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -8 > -9 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -9 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 12) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 17) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -9 > 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0) 4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0) -5 >Emitted(1, 9) Source(0, NaN) + SourceIndex(0) -6 >Emitted(1, 10) Source(0, NaN) + SourceIndex(0) -7 >Emitted(1, 12) Source(0, NaN) + SourceIndex(0) -8 >Emitted(1, 15) Source(0, NaN) + SourceIndex(0) -9 >Emitted(1, 17) Source(0, NaN) + SourceIndex(0) --- >>> _a["hello"] = function () { -1->^^^^ -2 > ^^ -3 > ^ -4 > ^^^^^^^ -5 > ^ -6 > ^^^ -1->!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -1->!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 12) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -1-> -2 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -2 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 15) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -2 > -3 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -3 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 15) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 8) Source(2, 6) + SourceIndex(0) nameIndex (-1) -3 > -4 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -4 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 17) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 15) Source(2, 13) + SourceIndex(0) nameIndex (-1) -4 > "hello" -5 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -5 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 17) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 16) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -5 > -6 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -6 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 5) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 19) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -6 > -1->Emitted(2, 5) Source(0, NaN) + SourceIndex(0) -2 >Emitted(2, 7) Source(0, NaN) + SourceIndex(0) -3 >Emitted(2, 8) Source(2, 6) + SourceIndex(0) -4 >Emitted(2, 15) Source(2, 13) + SourceIndex(0) -5 >Emitted(2, 16) Source(0, NaN) + SourceIndex(0) -6 >Emitted(2, 19) Source(0, NaN) + SourceIndex(0) +1->^^^^^^^ +2 > ^^^^^^^ +3 > ^^^^-> +1->{ + > [ +2 > "hello" +1->Emitted(2, 8) Source(2, 6) + SourceIndex(0) +2 >Emitted(2, 15) Source(2, 13) + SourceIndex(0) --- >>> debugger; -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^^^^^^^^ 3 > ^ -1 >!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 5) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 9) Source(3, 9) + SourceIndex(0) nameIndex (-1) -1 > -2 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -2 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 7) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 17) Source(3, 17) + SourceIndex(0) nameIndex (-1) +1->]() { + > 2 > debugger -3 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -3 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 7) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 18) Source(3, 18) + SourceIndex(0) nameIndex (-1) 3 > ; -1 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) +1->Emitted(3, 9) Source(3, 9) + SourceIndex(0) 2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) 3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0) --- >>> }, 1 >^^^^ 2 > ^ -3 > -4 > ^^^^-> -1 >!!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span: -1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 8) Source(2, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 5) Source(4, 5) + SourceIndex(0) nameIndex (-1) +3 > ^^^^-> 1 > > -2 > !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span: -2 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 15) Source(2, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 6) Source(4, 6) + SourceIndex(0) nameIndex (-1) 2 > } -3 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -3 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 16) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 6) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -3 > 1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) 2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0) -3 >Emitted(4, 6) Source(0, NaN) + SourceIndex(0) --- >>> _a); -1->^^^^ -2 > ^^ -3 > ^ -4 > ^ -1->!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -1->!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 16) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -1-> -2 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found -2 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 19) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -2 > -3 > !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column -3 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 19) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 8) Source(5, 2) + SourceIndex(0) nameIndex (-1) -3 > -4 > !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span: -4 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 9) Source(3, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 9) Source(5, 2) + SourceIndex(0) nameIndex (-1) -4 > -1->Emitted(5, 5) Source(0, NaN) + SourceIndex(0) -2 >Emitted(5, 7) Source(0, NaN) + SourceIndex(0) -3 >Emitted(5, 8) Source(5, 2) + SourceIndex(0) -4 >Emitted(5, 9) Source(5, 2) + SourceIndex(0) +1->^^^^^^^ +2 > ^ +1-> + >} +2 > +1->Emitted(5, 8) Source(5, 2) + SourceIndex(0) +2 >Emitted(5, 9) Source(5, 2) + SourceIndex(0) --- >>>var _a; -1 >^^^^ -2 > ^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >!!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span: -1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 17) Source(3, 24) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(6, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -1 > -2 > !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span: -2 > !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 18) Source(3, 25) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(6, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1) -2 > -1 >Emitted(6, 5) Source(0, NaN) + SourceIndex(0) -2 >Emitted(6, 7) Source(0, NaN) + SourceIndex(0) ---- -!!!! **** There are more source map entries in the sourceMap's mapping than what was encoded -!!!! **** Remaining decoded string: ;IACb,CAAC,AAJA;IAAA,EAAA,CAKA,CAAA;IALA,EAAA >>>//# sourceMappingURL=computedPropertyNamesSourceMap2_ES5.js.map \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts index 24bb2f9759f..3dd4ec5a360 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts @@ -1 +1,4 @@ -for (var v of []) { } \ No newline at end of file +//@sourcemap: true +for (var v of ['a', 'b', 'c']) { + console.log(v); +} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts index 743cdf919f6..274d8541bc6 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts @@ -1,3 +1,4 @@ -for (let v of []) { +//@sourcemap: true +for (let v of ['a', 'b', 'c']) { var x = v; } \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts index 5cf7efe8d65..7017991c7f2 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts @@ -1,3 +1,4 @@ +//@sourcemap: true var a = [1, 2, 3]; for (var v of a) { v; diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts index d0b944dcec7..13a386309bb 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts @@ -1,3 +1,4 @@ +//@sourcemap: true for (var [a = 0, b = 1] of [2, 3]) { a; b; diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts index 4543b6f74ec..c2fb21f68ce 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts @@ -1,2 +1,3 @@ -for (var v of []) +//@sourcemap: true +for (var v of ['a', 'b', 'c']) var x = v; \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts deleted file mode 100644 index 65ad9bdbdc3..00000000000 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of32.ts +++ /dev/null @@ -1,4 +0,0 @@ -// @sourcemap: true -for (var a of ['a', 'b', 'c']) { - console.log(a); -} \ No newline at end of file diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts index 5ad1fb7d58f..e902f50031e 100644 --- a/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts +++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts @@ -1,6 +1,7 @@ +//@sourcemap: true function foo() { return { x: 0 }; } -for (foo().x of []) { +for (foo().x of ['a', 'b', 'c']) { var p = foo().x; } \ No newline at end of file From 835c84f834c863e66512f3d266c60482ac94fa85 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Thu, 5 Mar 2015 11:52:00 -0800 Subject: [PATCH 042/251] Minor baseline adjustment --- tests/baselines/reference/ES5For-of1.errors.txt | 6 ++++-- tests/baselines/reference/ES5For-of13.errors.txt | 2 +- tests/baselines/reference/ES5For-of3.errors.txt | 2 +- tests/baselines/reference/ES5For-of8.errors.txt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/baselines/reference/ES5For-of1.errors.txt b/tests/baselines/reference/ES5For-of1.errors.txt index 845e6f63ba9..7579ea04528 100644 --- a/tests/baselines/reference/ES5For-of1.errors.txt +++ b/tests/baselines/reference/ES5For-of1.errors.txt @@ -2,6 +2,8 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts(1,1): error TS ==== tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts (1 errors) ==== - for (var v of []) { } + for (var v of ['a', 'b', 'c']) { ~~~ -!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. \ No newline at end of file +!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. + console.log(v); + } \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of13.errors.txt b/tests/baselines/reference/ES5For-of13.errors.txt index 107170c556e..a217d590f5e 100644 --- a/tests/baselines/reference/ES5For-of13.errors.txt +++ b/tests/baselines/reference/ES5For-of13.errors.txt @@ -2,7 +2,7 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts(1,1): error T ==== tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts (1 errors) ==== - for (let v of []) { + for (let v of ['a', 'b', 'c']) { ~~~ !!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. var x = v; diff --git a/tests/baselines/reference/ES5For-of3.errors.txt b/tests/baselines/reference/ES5For-of3.errors.txt index 9c6bd4e8864..ecf6b73db13 100644 --- a/tests/baselines/reference/ES5For-of3.errors.txt +++ b/tests/baselines/reference/ES5For-of3.errors.txt @@ -2,7 +2,7 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts(1,1): error TS ==== tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts (1 errors) ==== - for (var v of []) + for (var v of ['a', 'b', 'c']) ~~~ !!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. var x = v; \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.errors.txt b/tests/baselines/reference/ES5For-of8.errors.txt index 03c972e5e49..d32d50a6610 100644 --- a/tests/baselines/reference/ES5For-of8.errors.txt +++ b/tests/baselines/reference/ES5For-of8.errors.txt @@ -5,7 +5,7 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts(4,1): error TS function foo() { return { x: 0 }; } - for (foo().x of []) { + for (foo().x of ['a', 'b', 'c']) { ~~~ !!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher. var p = foo().x; From 02eb7466a7a5aeb6d83c0e87210aefa80cc4e767 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 5 Mar 2015 23:32:54 -0800 Subject: [PATCH 043/251] Fix watch to honor tsconfig.json setting --- src/compiler/tsc.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 57c2298d3d3..c4422e12bf6 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -250,7 +250,7 @@ module ts { var compileResult = compile(rootFileNames, compilerOptions, compilerHost); - if (!commandLine.options.watch) { + if (!compilerOptions.watch) { return sys.exit(compileResult.exitStatus); } @@ -269,7 +269,7 @@ module ts { } // Use default host function var sourceFile = hostGetSourceFile(fileName, languageVersion, onError); - if (sourceFile && commandLine.options.watch) { + if (sourceFile && compilerOptions.watch) { // Attach a file watcher sourceFile.fileWatcher = sys.watchFile(sourceFile.fileName, () => sourceFileChanged(sourceFile)); } From ee912ee1cd1f7d83f07d1e6a06ef94f5a06791c1 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 5 Mar 2015 22:57:11 -0800 Subject: [PATCH 044/251] Fix path normalization for patterns such as './/tsconfig.json' --- src/compiler/core.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 2518b95d37e..1fb73c90698 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -430,7 +430,11 @@ module ts { normalized.pop(); } else { - normalized.push(part); + // A part may be an empty string (which is 'falsy') if the path had consecutive slashes, + // e.g. "path//file.ts". Drop these before re-joining the parts. + if(part) { + normalized.push(part); + } } } } From 5ca703eeb4315b2ba9deb2dd642f38f84964b915 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Mar 2015 20:53:15 +0100 Subject: [PATCH 045/251] Add new diagnostics message for let/const declarations in a catch clause --- src/compiler/diagnosticInformationMap.generated.ts | 1 + src/compiler/diagnosticMessages.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index 477fd5d46af..f616de8bd4b 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -337,6 +337,7 @@ module ts { The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: DiagnosticCategory.Error, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." }, The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." }, The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." }, + Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" }, Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index da153903b8c..ddd3f72aaf0 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1339,6 +1339,10 @@ "category": "Error", "code": 2491 }, + "Cannot redeclare identifier '{0}' in catch clause": { + "category": "Error", + "code": 2492 + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", From b4d723217e67c63addfae44b0592b8bcfc28f22a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Mar 2015 21:42:42 +0100 Subject: [PATCH 046/251] Error on redeclaring a variable with let/const already defined as catch parameter --- src/compiler/checker.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7220182bfe9..4281d8a5bd3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9158,6 +9158,15 @@ module ts { grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, Diagnostics.Catch_clause_variable_cannot_have_an_initializer); } else { + var identifierName = (catchClause.variableDeclaration.name).text; + var locals = catchClause.block.locals; + if (locals && locals[identifierName]) { + var localSymbol = locals[identifierName] + if (localSymbol && (localSymbol.flags & SymbolFlags.BlockScopedVariable) !== 0) { + grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); + } + } + // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the // Catch production is eval or arguments checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.variableDeclaration.name); From 0ba3a04c5492b011fb265b6d69d602aa15fa46bb Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 6 Mar 2015 13:37:12 -0800 Subject: [PATCH 047/251] Fixed baselines to account for correct path normalization --- .../amd/{diskFile1.d.ts => test.d.ts} | 0 .../amd/{diskFile0.js => test.js} | 0 .../node/{diskFile1.d.ts => test.d.ts} | 0 .../node/{diskFile0.js => test.js} | 0 .../amd/{diskFile1.d.ts => test.d.ts} | 0 .../amd/{diskFile0.js => test.js} | 0 .../node/{diskFile1.d.ts => test.d.ts} | 0 .../node/{diskFile0.js => test.js} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/node/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/node/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/{diskFile0.js => test.js} (100%) diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js From 129ef7222c00706c2cb3fc31893f309db231f934 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Mar 2015 22:56:59 +0100 Subject: [PATCH 048/251] Use hasProperty instead --- 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 4281d8a5bd3..98cfac70be3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9160,7 +9160,7 @@ module ts { else { var identifierName = (catchClause.variableDeclaration.name).text; var locals = catchClause.block.locals; - if (locals && locals[identifierName]) { + if (locals && hasProperty(locals, identifierName)) { var localSymbol = locals[identifierName] if (localSymbol && (localSymbol.flags & SymbolFlags.BlockScopedVariable) !== 0) { grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); From 2edb5c88d841750e774769f3cbbc7b126de8aeeb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Mar 2015 23:00:43 +0100 Subject: [PATCH 049/251] Added tests for let/const variable declarations in catch clause (with the same name) --- .../redeclareParameterInCatchBlock.errors.txt | 31 ++++++++++++++ .../redeclareParameterInCatchBlock.js | 42 +++++++++++++++++++ .../redeclareParameterInCatchBlock.ts | 22 ++++++++++ 3 files changed, 95 insertions(+) create mode 100644 tests/baselines/reference/redeclareParameterInCatchBlock.errors.txt create mode 100644 tests/baselines/reference/redeclareParameterInCatchBlock.js create mode 100644 tests/cases/compiler/redeclareParameterInCatchBlock.ts diff --git a/tests/baselines/reference/redeclareParameterInCatchBlock.errors.txt b/tests/baselines/reference/redeclareParameterInCatchBlock.errors.txt new file mode 100644 index 00000000000..07dbbefefe0 --- /dev/null +++ b/tests/baselines/reference/redeclareParameterInCatchBlock.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/redeclareParameterInCatchBlock.ts(5,11): error TS2492: Cannot redeclare identifier 'e' in catch clause +tests/cases/compiler/redeclareParameterInCatchBlock.ts(11,9): error TS2492: Cannot redeclare identifier 'e' in catch clause + + +==== tests/cases/compiler/redeclareParameterInCatchBlock.ts (2 errors) ==== + + try { + + } catch(e) { + const e = null; + ~ +!!! error TS2492: Cannot redeclare identifier 'e' in catch clause + } + + try { + + } catch(e) { + let e; + ~ +!!! error TS2492: Cannot redeclare identifier 'e' in catch clause + } + + try { + + } catch(e) { + function test() { + let e; + } + } + + \ No newline at end of file diff --git a/tests/baselines/reference/redeclareParameterInCatchBlock.js b/tests/baselines/reference/redeclareParameterInCatchBlock.js new file mode 100644 index 00000000000..a187e2fcf0c --- /dev/null +++ b/tests/baselines/reference/redeclareParameterInCatchBlock.js @@ -0,0 +1,42 @@ +//// [redeclareParameterInCatchBlock.ts] + +try { + +} catch(e) { + const e = null; +} + +try { + +} catch(e) { + let e; +} + +try { + +} catch(e) { + function test() { + let e; + } +} + + + +//// [redeclareParameterInCatchBlock.js] +try { +} +catch (e) { + const e = null; +} +try { +} +catch (e) { + let e; +} +try { +} +catch (e) { + function test() { + let e; + } +} diff --git a/tests/cases/compiler/redeclareParameterInCatchBlock.ts b/tests/cases/compiler/redeclareParameterInCatchBlock.ts new file mode 100644 index 00000000000..37ca5fc3a9e --- /dev/null +++ b/tests/cases/compiler/redeclareParameterInCatchBlock.ts @@ -0,0 +1,22 @@ +// @target: es6 + +try { + +} catch(e) { + const e = null; +} + +try { + +} catch(e) { + let e; +} + +try { + +} catch(e) { + function test() { + let e; + } +} + From e9cb12aeab1241a520164221999d0916500df9f3 Mon Sep 17 00:00:00 2001 From: Paul van Brenk Date: Fri, 6 Mar 2015 14:29:23 -0800 Subject: [PATCH 050/251] Add diagnostics for signaturehelp crash --- src/services/signatureHelp.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index 8b7dea13ead..e5ddb9012cc 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -264,12 +264,16 @@ module ts.SignatureHelp { // the comma. That amounts to taking the ceiling of half the index. var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1; + var argumentCount = getCommaBasedArgCount(list); + + Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + return { kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments, invocation: callExpression, argumentsSpan: getApplicableSpanForArguments(list), argumentIndex: argumentIndex, - argumentCount: getCommaBasedArgCount(list) + argumentCount: argumentCount }; } } @@ -347,6 +351,8 @@ module ts.SignatureHelp { ? 1 : (tagExpression.template).templateSpans.length + 1; + Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + return { kind: ArgumentListKind.TaggedTemplateArguments, invocation: tagExpression, @@ -512,6 +518,8 @@ module ts.SignatureHelp { selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); } + Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + return { items, applicableSpan, From 564dd2eb4af257e84c67610af202ba76f40da964 Mon Sep 17 00:00:00 2001 From: Caitlin Potter Date: Fri, 6 Mar 2015 18:07:02 -0500 Subject: [PATCH 051/251] Document procedure for digital CLA signature in CONTRIBUTING.md Closes #2237 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a30b2154133..92eb646f480 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Design changes will not be accepted at this time. If you have a design change pr ## Legal You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright. -Please submit a Contributor License Agreement (CLA) before submitting a pull request. Download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to . Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features. +Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to . Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features. ## Housekeeping Your pull request should: From 80f9cf299c250b46205ba2770dd7175e6a7f01f1 Mon Sep 17 00:00:00 2001 From: Paul van Brenk Date: Fri, 6 Mar 2015 15:09:19 -0800 Subject: [PATCH 052/251] fix check to allow for empty argument list --- src/services/signatureHelp.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index 7686bb470e3..6f4f38aa736 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -266,7 +266,7 @@ module ts.SignatureHelp { var argumentCount = getCommaBasedArgCount(list); - Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); return { kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments, @@ -351,7 +351,7 @@ module ts.SignatureHelp { ? 1 : (tagExpression.template).templateSpans.length + 1; - Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); return { kind: ArgumentListKind.TaggedTemplateArguments, @@ -518,7 +518,7 @@ module ts.SignatureHelp { selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); } - Debug.assert(argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); + Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); return { items, From 4c16b239bed098b4248f08fdff4563d32eb5c88a Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sat, 7 Mar 2015 01:38:42 +0100 Subject: [PATCH 053/251] Fixed jake runtests-browser on node 0.12 --- tests/webTestServer.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts index 40e347fed50..6d3144eeaec 100644 --- a/tests/webTestServer.ts +++ b/tests/webTestServer.ts @@ -281,8 +281,6 @@ if ((browser && browser === 'chrome')) { console.log('Using browser: ' + browserPath); var queryString = grep ? "?grep=" + grep : ''; -child_process.spawn(browserPath, ['http://localhost:' + port + '/tests/webTestResults.html' + queryString], (err: Error, stdout: any, stderr: any) => { - console.log("ERR: " + err.message); - console.log("STDOUT: " + stdout.toString()); - console.log("STDERR: " + stderr.toString()); -}); \ No newline at end of file +child_process.spawn(browserPath, ['http://localhost:' + port + '/tests/webTestResults.html' + queryString], { + stdio: 'inherit' +}); From da5caf5f72911e5eadb60ef814b6c1c15682dd7e Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 6 Mar 2015 17:09:55 -0800 Subject: [PATCH 054/251] Made the 'version' string an exported property --- src/compiler/program.ts | 2 ++ src/compiler/tsc.ts | 6 ++---- tests/baselines/reference/APISample_compile.js | 1 + tests/baselines/reference/APISample_compile.types | 3 +++ tests/baselines/reference/APISample_linter.js | 1 + tests/baselines/reference/APISample_linter.types | 3 +++ tests/baselines/reference/APISample_transform.js | 1 + tests/baselines/reference/APISample_transform.types | 3 +++ tests/baselines/reference/APISample_watcher.js | 1 + tests/baselines/reference/APISample_watcher.types | 3 +++ 10 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 9d1dc652441..6cd429b5301 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -5,6 +5,8 @@ module ts { /* @internal */ export var emitTime = 0; /* @internal */ export var ioReadTime = 0; + export var version = "1.5.0.0"; + export function createCompilerHost(options: CompilerOptions): CompilerHost { var currentDirectory: string; var existingDirectories: Map = {}; diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index c4422e12bf6..fc0e143e666 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -2,8 +2,6 @@ /// module ts { - var version = "1.5.0.0"; - export interface SourceFile { fileWatcher: FileWatcher; } @@ -178,7 +176,7 @@ module ts { } if (commandLine.options.version) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, version)); + reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version)); return sys.exit(ExitStatus.Success); } @@ -419,7 +417,7 @@ module ts { } function printVersion() { - sys.write(getDiagnosticText(Diagnostics.Version_0, version) + sys.newLine); + sys.write(getDiagnosticText(Diagnostics.Version_0, ts.version) + sys.newLine); } function printHelp() { diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 30fe1d09060..ec0618c517a 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -1472,6 +1472,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 81b98949c7b..dbd947e17db 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -4716,6 +4716,9 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + var version: string; +>version : string + function createCompilerHost(options: CompilerOptions): CompilerHost; >createCompilerHost : (options: CompilerOptions) => CompilerHost >options : CompilerOptions diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b7a67081440..62b30eab4eb 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -1503,6 +1503,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 6da030e8617..7e9101988ea 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -4862,6 +4862,9 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + var version: string; +>version : string + function createCompilerHost(options: CompilerOptions): CompilerHost; >createCompilerHost : (options: CompilerOptions) => CompilerHost >options : CompilerOptions diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index c30d4f03456..de8ee896f88 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -1504,6 +1504,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 42862def15f..a79c32c359c 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -4812,6 +4812,9 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + var version: string; +>version : string + function createCompilerHost(options: CompilerOptions): CompilerHost; >createCompilerHost : (options: CompilerOptions) => CompilerHost >options : CompilerOptions diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index a9ed17e924d..4d4e5f0d5dc 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1541,6 +1541,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 3dd324c421e..0ee826cb36d 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -4985,6 +4985,9 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + var version: string; +>version : string + function createCompilerHost(options: CompilerOptions): CompilerHost; >createCompilerHost : (options: CompilerOptions) => CompilerHost >options : CompilerOptions From a76eb69996b10e1ba4a9239381c6ea6b9679285e Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Fri, 6 Mar 2015 18:45:45 -0800 Subject: [PATCH 055/251] Add an 'isVariableLike' helper function. --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 10 +++++----- src/compiler/emitter.ts | 4 ++-- src/compiler/utilities.ts | 26 ++++++++++++++++++++++---- src/services/breakpoints.ts | 4 ++-- src/services/services.ts | 8 ++++---- src/services/utilities.ts | 2 +- 7 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 5731d636103..2e17d8bf3a1 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -528,7 +528,7 @@ module ts { // var x; // } // 'var x' will be placed into the function locals and 'let x' - into the locals of the block - bindChildren(node, 0, /*isBlockScopeContainer*/ !isAnyFunction(node.parent)); + bindChildren(node, 0, /*isBlockScopeContainer*/ !isFunctionLike(node.parent)); break; case SyntaxKind.CatchClause: case SyntaxKind.ForStatement: diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index eae595cfaf5..8908501593c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5045,7 +5045,7 @@ module ts { function isInsideFunction(node: Node, threshold: Node): boolean { var current = node; while (current && current !== threshold) { - if (isAnyFunction(current)) { + if (isFunctionLike(current)) { return true; } current = current.parent; @@ -8550,7 +8550,7 @@ module ts { // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting) var namesShareScope = container && - (container.kind === SyntaxKind.Block && isAnyFunction(container.parent) || + (container.kind === SyntaxKind.Block && isFunctionLike(container.parent) || (container.kind === SyntaxKind.ModuleBlock && container.kind === SyntaxKind.ModuleDeclaration) || container.kind === SyntaxKind.SourceFile); @@ -9065,7 +9065,7 @@ module ts { if (!checkGrammarStatementInAmbientContext(node)) { var current = node.parent; while (current) { - if (isAnyFunction(current)) { + if (isFunctionLike(current)) { break; } if (current.kind === SyntaxKind.LabeledStatement && (current).label.text === node.label.text) { @@ -11623,7 +11623,7 @@ module ts { function checkGrammarBreakOrContinueStatement(node: BreakOrContinueStatement): boolean { var current: Node = node; while (current) { - if (isAnyFunction(current)) { + if (isFunctionLike(current)) { return grammarErrorOnNode(node, Diagnostics.Jump_target_cannot_cross_function_boundary); } @@ -11954,7 +11954,7 @@ module ts { // Find containing block which is either Block, ModuleBlock, SourceFile var links = getNodeLinks(node); - if (!links.hasReportedStatementInAmbientContext && isAnyFunction(node.parent)) { + if (!links.hasReportedStatementInAmbientContext && isFunctionLike(node.parent)) { return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts) } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ec9ab083fbc..d3b248b41ff 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3888,7 +3888,7 @@ module ts { function getEnclosingBlockScopeContainer(node: Node): Node { var current = node; while (current) { - if (isAnyFunction(current)) { + if (isFunctionLike(current)) { return current; } switch (current.kind) { @@ -3903,7 +3903,7 @@ module ts { case SyntaxKind.Block: // function block is not considered block-scope container // see comment in binder.ts: bind(...), case for SyntaxKind.Block - if (!isAnyFunction(current.parent)) { + if (!isFunctionLike(current.parent)) { return current; } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index efbe9e9825c..63c2edad6c2 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -395,7 +395,25 @@ module ts { } } - export function isAnyFunction(node: Node): boolean { + /* @internal */ + export function isVariableLike(node: Node): boolean { + if (node) { + switch (node.kind) { + case SyntaxKind.VariableDeclaration: + case SyntaxKind.Parameter: + case SyntaxKind.BindingElement: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.PropertyAssignment: + case SyntaxKind.ShorthandPropertyAssignment: + case SyntaxKind.EnumMember: + return true; + } + } + + return false; + } + + export function isFunctionLike(node: Node): boolean { if (node) { switch (node.kind) { case SyntaxKind.Constructor: @@ -422,7 +440,7 @@ module ts { } export function isFunctionBlock(node: Node) { - return node && node.kind === SyntaxKind.Block && isAnyFunction(node.parent); + return node && node.kind === SyntaxKind.Block && isFunctionLike(node.parent); } export function isObjectLiteralMethod(node: Node) { @@ -432,7 +450,7 @@ module ts { export function getContainingFunction(node: Node): FunctionLikeDeclaration { while (true) { node = node.parent; - if (!node || isAnyFunction(node)) { + if (!node || isFunctionLike(node)) { return node; } } @@ -1151,7 +1169,7 @@ module ts { } export function nodeStartsNewLexicalEnvironment(n: Node): boolean { - return isAnyFunction(n) || n.kind === SyntaxKind.ModuleDeclaration || n.kind === SyntaxKind.SourceFile; + return isFunctionLike(n) || n.kind === SyntaxKind.ModuleDeclaration || n.kind === SyntaxKind.SourceFile; } export function nodeIsSynthesized(node: Node): boolean { diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index bd4cc841854..d59718322c9 100644 --- a/src/services/breakpoints.ts +++ b/src/services/breakpoints.ts @@ -259,7 +259,7 @@ module ts.BreakpointResolver { } // return type of function go to previous token - if (isAnyFunction(node.parent) && (node.parent).type === node) { + if (isFunctionLike(node.parent) && (node.parent).type === node) { return spanInPreviousNode(node); } @@ -499,7 +499,7 @@ module ts.BreakpointResolver { function spanInColonToken(node: Node): TextSpan { // Is this : specifying return annotation of the function declaration - if (isAnyFunction(node.parent) || node.parent.kind === SyntaxKind.PropertyAssignment) { + if (isFunctionLike(node.parent) || node.parent.kind === SyntaxKind.PropertyAssignment) { return spanInPreviousNode(node); } diff --git a/src/services/services.ts b/src/services/services.ts index cd8fc13a2b7..3b06b887a05 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2014,7 +2014,7 @@ module ts { function isNameOfFunctionDeclaration(node: Node): boolean { return node.kind === SyntaxKind.Identifier && - isAnyFunction(node.parent) && (node.parent).name === node; + isFunctionLike(node.parent) && (node.parent).name === node; } /** Returns true if node is a name of an object literal property, e.g. "a" in x = { "a": 1 } */ @@ -3799,7 +3799,7 @@ module ts { } } // Do not cross function boundaries. - else if (!isAnyFunction(node)) { + else if (!isFunctionLike(node)) { forEachChild(node, aggregate); } }; @@ -3931,7 +3931,7 @@ module ts { statementAccumulator.push(node); } // Do not cross function boundaries. - else if (!isAnyFunction(node)) { + else if (!isFunctionLike(node)) { forEachChild(node, aggregate); } }; @@ -3962,7 +3962,7 @@ module ts { break; default: // Don't cross function boundaries. - if (isAnyFunction(node)) { + if (isFunctionLike(node)) { return undefined; } break; diff --git a/src/services/utilities.ts b/src/services/utilities.ts index ee92ed8af0d..e0ff5293546 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -283,7 +283,7 @@ module ts { return (node).typeArguments; } - if (isAnyFunction(node) || node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.InterfaceDeclaration) { + if (isFunctionLike(node) || node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.InterfaceDeclaration) { return (node).typeParameters; } From 7f00378eef9bdd29b1ee43b86e8f83bc75c769d6 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Fri, 6 Mar 2015 18:51:58 -0800 Subject: [PATCH 056/251] CR feedback. --- src/compiler/utilities.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 63c2edad6c2..5d7c23dd18b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -399,13 +399,14 @@ module ts { export function isVariableLike(node: Node): boolean { if (node) { switch (node.kind) { - case SyntaxKind.VariableDeclaration: - case SyntaxKind.Parameter: case SyntaxKind.BindingElement: - case SyntaxKind.PropertyDeclaration: - case SyntaxKind.PropertyAssignment: - case SyntaxKind.ShorthandPropertyAssignment: case SyntaxKind.EnumMember: + case SyntaxKind.Parameter: + case SyntaxKind.PropertyAssignment: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.PropertySignature: + case SyntaxKind.ShorthandPropertyAssignment: + case SyntaxKind.VariableDeclaration: return true; } } From c76f71cfaeeac94a35fae7601f7a4247e35092d9 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 01:30:45 -0800 Subject: [PATCH 057/251] When emitting an arrow function, parenthesize the body if it could be interpreted as a block instead of an object literal. --- src/compiler/emitter.ts | 14 ++++++++++++-- .../arrowFunctionWithObjectLiteralBody1.js | 5 +++++ .../arrowFunctionWithObjectLiteralBody1.types | 8 ++++++++ .../arrowFunctionWithObjectLiteralBody2.js | 5 +++++ .../arrowFunctionWithObjectLiteralBody2.types | 9 +++++++++ .../arrowFunctionWithObjectLiteralBody3.js | 5 +++++ .../arrowFunctionWithObjectLiteralBody3.types | 8 ++++++++ .../arrowFunctionWithObjectLiteralBody4.js | 5 +++++ .../arrowFunctionWithObjectLiteralBody4.types | 9 +++++++++ .../arrowFunctionWithObjectLiteralBody1.ts | 1 + .../arrowFunctionWithObjectLiteralBody2.ts | 1 + .../arrowFunctionWithObjectLiteralBody3.ts | 2 ++ .../arrowFunctionWithObjectLiteralBody4.ts | 2 ++ 13 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.types create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.types create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.types create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.types create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody1.ts create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody2.ts create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d3b248b41ff..c96ed1299fe 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4202,9 +4202,19 @@ module ts { return; } - // For es6 and higher we can emit the expression as is. + // For es6 and higher we can emit the expression as is. However, in the case + // where the expression might end up looking like a block when down-leveled, we'll + // also wrap it in parentheses first. For example if you have: a => {} + // then we need to generate: a => ({}) write(" "); - emit(body); + + // Unwrap all type assertions. + var current = body; + while (current.kind === SyntaxKind.TypeAssertionExpression) { + current = (current).expression; + } + + emitParenthesizedIf(body, current.kind === SyntaxKind.ObjectLiteralExpression); } function emitDownLevelExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) { diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js new file mode 100644 index 00000000000..d53f33deadc --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js @@ -0,0 +1,5 @@ +//// [arrowFunctionWithObjectLiteralBody1.ts] +var v = a => {} + +//// [arrowFunctionWithObjectLiteralBody1.js] +var v = function (a) { return {}; }; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.types new file mode 100644 index 00000000000..2446c97d4ce --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody1.ts === +var v = a => {} +>v : (a: any) => any +>a => {} : (a: any) => any +>a : any +>{} : any +>{} : {} + diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js new file mode 100644 index 00000000000..f2fc086c082 --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js @@ -0,0 +1,5 @@ +//// [arrowFunctionWithObjectLiteralBody2.ts] +var v = a => {} + +//// [arrowFunctionWithObjectLiteralBody2.js] +var v = function (a) { return {}; }; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.types new file mode 100644 index 00000000000..df8e87e82ea --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody2.ts === +var v = a => {} +>v : (a: any) => any +>a => {} : (a: any) => any +>a : any +>{} : any +>{} : any +>{} : {} + diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.js new file mode 100644 index 00000000000..91a699dfc4b --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.js @@ -0,0 +1,5 @@ +//// [arrowFunctionWithObjectLiteralBody3.ts] +var v = a => {} + +//// [arrowFunctionWithObjectLiteralBody3.js] +var v = a => ({}); diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.types new file mode 100644 index 00000000000..91e11ab9104 --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody3.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts === +var v = a => {} +>v : (a: any) => any +>a => {} : (a: any) => any +>a : any +>{} : any +>{} : {} + diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.js new file mode 100644 index 00000000000..83bc0c878ca --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.js @@ -0,0 +1,5 @@ +//// [arrowFunctionWithObjectLiteralBody4.ts] +var v = a => {} + +//// [arrowFunctionWithObjectLiteralBody4.js] +var v = a => ({}); diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.types new file mode 100644 index 00000000000..400a91b459d --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody4.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts === +var v = a => {} +>v : (a: any) => any +>a => {} : (a: any) => any +>a : any +>{} : any +>{} : any +>{} : {} + diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody1.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody1.ts new file mode 100644 index 00000000000..3c874f3fd5e --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody1.ts @@ -0,0 +1 @@ +var v = a => {} \ No newline at end of file diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody2.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody2.ts new file mode 100644 index 00000000000..f5dd4fc2bcc --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody2.ts @@ -0,0 +1 @@ +var v = a => {} \ No newline at end of file diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts new file mode 100644 index 00000000000..f5c1a86f296 --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody3.ts @@ -0,0 +1,2 @@ +// @target: es6 +var v = a => {} \ No newline at end of file diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts new file mode 100644 index 00000000000..33fe8439ebe --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody4.ts @@ -0,0 +1,2 @@ +// @target: es6 +var v = a => {} \ No newline at end of file From 0c5654164fbd080cf47c7bb81d87c622784e8b57 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 01:33:18 -0800 Subject: [PATCH 058/251] Fix up comment. --- 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 c96ed1299fe..8560e44dcf8 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4203,7 +4203,7 @@ module ts { } // For es6 and higher we can emit the expression as is. However, in the case - // where the expression might end up looking like a block when down-leveled, we'll + // where the expression might end up looking like a block when emitted, we'll // also wrap it in parentheses first. For example if you have: a => {} // then we need to generate: a => ({}) write(" "); From bdcdd84dda276e9db3c710008e1ca4e823f34d0d Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 02:08:36 -0800 Subject: [PATCH 059/251] CR feedback. --- src/compiler/emitter.ts | 53 ++++++++++--------- .../arrowFunctionWithObjectLiteralBody5.js | 14 +++++ .../arrowFunctionWithObjectLiteralBody5.types | 40 ++++++++++++++ .../arrowFunctionWithObjectLiteralBody6.js | 14 +++++ .../arrowFunctionWithObjectLiteralBody6.types | 40 ++++++++++++++ .../arrowFunctionWithObjectLiteralBody5.ts | 7 +++ .../arrowFunctionWithObjectLiteralBody6.ts | 8 +++ 7 files changed, 151 insertions(+), 25 deletions(-) create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js create mode 100644 tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody5.ts create mode 100644 tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 8560e44dcf8..e6ba8b76704 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3179,35 +3179,38 @@ module ts { } function emitParenExpression(node: ParenthesizedExpression) { - if (node.expression.kind === SyntaxKind.TypeAssertionExpression) { - var operand = (node.expression).expression; + if (!node.parent || node.parent.kind !== SyntaxKind.ArrowFunction) { + if (node.expression.kind === SyntaxKind.TypeAssertionExpression) { + var operand = (node.expression).expression; - // Make sure we consider all nested cast expressions, e.g.: - // (-A).x; - while (operand.kind == SyntaxKind.TypeAssertionExpression) { - operand = (operand).expression; - } + // Make sure we consider all nested cast expressions, e.g.: + // (-A).x; + while (operand.kind == SyntaxKind.TypeAssertionExpression) { + operand = (operand).expression; + } - // We have an expression of the form: (SubExpr) - // Emitting this as (SubExpr) is really not desirable. We would like to emit the subexpr as is. - // Omitting the parentheses, however, could cause change in the semantics of the generated - // code if the casted expression has a lower precedence than the rest of the expression, e.g.: - // (new A).foo should be emitted as (new A).foo and not new A.foo - // (typeof A).toString() should be emitted as (typeof A).toString() and not typeof A.toString() - // new (A()) should be emitted as new (A()) and not new A() - // (function foo() { })() should be emitted as an IIF (function foo(){})() and not declaration function foo(){} () - if (operand.kind !== SyntaxKind.PrefixUnaryExpression && - operand.kind !== SyntaxKind.VoidExpression && - operand.kind !== SyntaxKind.TypeOfExpression && - operand.kind !== SyntaxKind.DeleteExpression && - operand.kind !== SyntaxKind.PostfixUnaryExpression && - operand.kind !== SyntaxKind.NewExpression && - !(operand.kind === SyntaxKind.CallExpression && node.parent.kind === SyntaxKind.NewExpression) && - !(operand.kind === SyntaxKind.FunctionExpression && node.parent.kind === SyntaxKind.CallExpression)) { - emit(operand); - return; + // We have an expression of the form: (SubExpr) + // Emitting this as (SubExpr) is really not desirable. We would like to emit the subexpr as is. + // Omitting the parentheses, however, could cause change in the semantics of the generated + // code if the casted expression has a lower precedence than the rest of the expression, e.g.: + // (new A).foo should be emitted as (new A).foo and not new A.foo + // (typeof A).toString() should be emitted as (typeof A).toString() and not typeof A.toString() + // new (A()) should be emitted as new (A()) and not new A() + // (function foo() { })() should be emitted as an IIF (function foo(){})() and not declaration function foo(){} () + if (operand.kind !== SyntaxKind.PrefixUnaryExpression && + operand.kind !== SyntaxKind.VoidExpression && + operand.kind !== SyntaxKind.TypeOfExpression && + operand.kind !== SyntaxKind.DeleteExpression && + operand.kind !== SyntaxKind.PostfixUnaryExpression && + operand.kind !== SyntaxKind.NewExpression && + !(operand.kind === SyntaxKind.CallExpression && node.parent.kind === SyntaxKind.NewExpression) && + !(operand.kind === SyntaxKind.FunctionExpression && node.parent.kind === SyntaxKind.CallExpression)) { + emit(operand); + return; + } } } + write("("); emit(node.expression); write(")"); diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js new file mode 100644 index 00000000000..77f5c2d4c3d --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js @@ -0,0 +1,14 @@ +//// [arrowFunctionWithObjectLiteralBody5.ts] +var a = () => { name: "foo", message: "bar" }; + +var b = () => ({ name: "foo", message: "bar" }); + +var c = () => ({ name: "foo", message: "bar" }); + +var d = () => ((({ name: "foo", message: "bar" }))); + +//// [arrowFunctionWithObjectLiteralBody5.js] +var a = function () { return { name: "foo", message: "bar" }; }; +var b = function () { return ({ name: "foo", message: "bar" }); }; +var c = function () { return ({ name: "foo", message: "bar" }); }; +var d = function () { return (({ name: "foo", message: "bar" })); }; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types new file mode 100644 index 00000000000..15b3697732a --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types @@ -0,0 +1,40 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody5.ts === +var a = () => { name: "foo", message: "bar" }; +>a : () => Error +>() => { name: "foo", message: "bar" } : () => Error +>{ name: "foo", message: "bar" } : Error +>Error : Error +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var b = () => ({ name: "foo", message: "bar" }); +>b : () => Error +>() => ({ name: "foo", message: "bar" }) : () => Error +>({ name: "foo", message: "bar" }) : Error +>{ name: "foo", message: "bar" } : Error +>Error : Error +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var c = () => ({ name: "foo", message: "bar" }); +>c : () => { name: string; message: string; } +>() => ({ name: "foo", message: "bar" }) : () => { name: string; message: string; } +>({ name: "foo", message: "bar" }) : { name: string; message: string; } +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var d = () => ((({ name: "foo", message: "bar" }))); +>d : () => Error +>() => ((({ name: "foo", message: "bar" }))) : () => Error +>((({ name: "foo", message: "bar" }))) : Error +>(({ name: "foo", message: "bar" })) : Error +>({ name: "foo", message: "bar" }) : Error +>Error : Error +>({ name: "foo", message: "bar" }) : { name: string; message: string; } +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js new file mode 100644 index 00000000000..6128a6bef86 --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js @@ -0,0 +1,14 @@ +//// [arrowFunctionWithObjectLiteralBody6.ts] +var a = () => { name: "foo", message: "bar" }; + +var b = () => ({ name: "foo", message: "bar" }); + +var c = () => ({ name: "foo", message: "bar" }); + +var d = () => ((({ name: "foo", message: "bar" }))); + +//// [arrowFunctionWithObjectLiteralBody6.js] +var a = () => ({ name: "foo", message: "bar" }); +var b = () => ({ name: "foo", message: "bar" }); +var c = () => ({ name: "foo", message: "bar" }); +var d = () => (({ name: "foo", message: "bar" })); diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types new file mode 100644 index 00000000000..14a45dca213 --- /dev/null +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types @@ -0,0 +1,40 @@ +=== tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts === +var a = () => { name: "foo", message: "bar" }; +>a : () => Error +>() => { name: "foo", message: "bar" } : () => Error +>{ name: "foo", message: "bar" } : Error +>Error : Error +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var b = () => ({ name: "foo", message: "bar" }); +>b : () => Error +>() => ({ name: "foo", message: "bar" }) : () => Error +>({ name: "foo", message: "bar" }) : Error +>{ name: "foo", message: "bar" } : Error +>Error : Error +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var c = () => ({ name: "foo", message: "bar" }); +>c : () => { name: string; message: string; } +>() => ({ name: "foo", message: "bar" }) : () => { name: string; message: string; } +>({ name: "foo", message: "bar" }) : { name: string; message: string; } +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + +var d = () => ((({ name: "foo", message: "bar" }))); +>d : () => Error +>() => ((({ name: "foo", message: "bar" }))) : () => Error +>((({ name: "foo", message: "bar" }))) : Error +>(({ name: "foo", message: "bar" })) : Error +>({ name: "foo", message: "bar" }) : Error +>Error : Error +>({ name: "foo", message: "bar" }) : { name: string; message: string; } +>{ name: "foo", message: "bar" } : { name: string; message: string; } +>name : string +>message : string + diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody5.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody5.ts new file mode 100644 index 00000000000..1f805786815 --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody5.ts @@ -0,0 +1,7 @@ +var a = () => { name: "foo", message: "bar" }; + +var b = () => ({ name: "foo", message: "bar" }); + +var c = () => ({ name: "foo", message: "bar" }); + +var d = () => ((({ name: "foo", message: "bar" }))); \ No newline at end of file diff --git a/tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts new file mode 100644 index 00000000000..870717c849a --- /dev/null +++ b/tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts @@ -0,0 +1,8 @@ +// @target: es6 +var a = () => { name: "foo", message: "bar" }; + +var b = () => ({ name: "foo", message: "bar" }); + +var c = () => ({ name: "foo", message: "bar" }); + +var d = () => ((({ name: "foo", message: "bar" }))); \ No newline at end of file From a18934d6da7cf31c33fab65dee2ac4e2c277646b Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 12:27:20 -0800 Subject: [PATCH 060/251] Address omitted return keyword. --- src/compiler/tsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index c4422e12bf6..ac5f9df8c4c 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -411,7 +411,7 @@ module ts { // The emitter emitted something, inform the caller if that happened in the presence // of diagnostics or not. if (diagnostics.length > 0 || emitOutput.diagnostics.length > 0) { - ExitStatus.DiagnosticsPresent_OutputsGenerated; + return ExitStatus.DiagnosticsPresent_OutputsGenerated; } return ExitStatus.Success; From 680e48f507e38c3be58952b255f9a8201ea37bb3 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 12:54:12 -0800 Subject: [PATCH 061/251] Preserve newlines on either side of a binary expression. --- src/compiler/emitter.ts | 34 +++++++++++++++---- .../reference/APISample_transform.js | 3 +- tests/baselines/reference/asiArith.js | 8 ++--- ...constructorWithIncompleteTypeAnnotation.js | 3 +- .../parserGreaterThanTokenAmbiguity10.js | 4 +-- .../parserGreaterThanTokenAmbiguity15.js | 4 +-- .../parserGreaterThanTokenAmbiguity20.js | 4 +-- .../parserGreaterThanTokenAmbiguity4.js | 2 +- .../parserGreaterThanTokenAmbiguity5.js | 4 +-- .../parserGreaterThanTokenAmbiguity9.js | 2 +- ...parserRegularExpressionDivideAmbiguity1.js | 3 +- .../typeGuardsInConditionalExpression.js | 11 +++--- ...ypeGuardsInRightOperandOfAndAndOperator.js | 28 ++++++++------- .../typeGuardsInRightOperandOfOrOrOperator.js | 28 ++++++++------- 14 files changed, 83 insertions(+), 55 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a0c887414cd..9cdcfeef09d 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3290,26 +3290,46 @@ module ts { else { emit(node.left); - if (node.operatorToken.kind !== SyntaxKind.CommaToken) { - write(" "); + // If there was a newline between the left side of the binary expression and the + // operator, then try to preserve that. + var indented = false; + var isSynthesied = nodeIsSynthesized(node); + if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.left, node.operatorToken)) { + indented = true; + increaseIndent(); + writeLine(); + } + else { + // Otherwise just emit the operator right afterwards. For everything but + // comma, emit a space before the operator. + if (node.operatorToken.kind !== SyntaxKind.CommaToken) { + write(" "); + } } write(tokenToString(node.operatorToken.kind)); - var shouldPlaceOnNewLine = !nodeIsSynthesized(node) && !nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right); + // If there was a newline after the operator (or this is a synthesized node that + // wants to be on a new line), then put a newline in. But only if we haven't + // already done this for the left side. + var wantsIndent = (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right)) || + synthesizedNodeStartsOnNewLine(node.right); - // Check if the right expression is on a different line versus the operator itself. If so, - // we'll emit newline. - if (shouldPlaceOnNewLine || synthesizedNodeStartsOnNewLine(node.right)) { + if (wantsIndent && !indented) { + indented = true; increaseIndent(); writeLine(); emit(node.right); - decreaseIndent(); } else { write(" "); emit(node.right); } + + // If we indented the left or the right side, then dedent now. + if (indented) { + decreaseIndent(); + } } } diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 4cd5c5c0983..27e04bec1a0 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -2052,7 +2052,8 @@ function transform(contents, compilerOptions) { return { outputs: outputs, errors: errors.map(function (e) { - return e.file.fileName + "(" + (e.file.getLineAndCharacterOfPosition(e.start).line + 1) + "): " + ts.flattenDiagnosticMessageText(e.messageText, os.EOL); + return e.file.fileName + "(" + (e.file.getLineAndCharacterOfPosition(e.start).line + 1) + "): " + + ts.flattenDiagnosticMessageText(e.messageText, os.EOL); }) }; } diff --git a/tests/baselines/reference/asiArith.js b/tests/baselines/reference/asiArith.js index 8e957aae332..b5016af3117 100644 --- a/tests/baselines/reference/asiArith.js +++ b/tests/baselines/reference/asiArith.js @@ -37,9 +37,9 @@ y //// [asiArith.js] var x = 1; var y = 1; -var z = x + - + +y; +var z = x + + + +y; var a = 1; var b = 1; -var c = x - - - -y; +var c = x + - - -y; diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index ac77cc177b8..6adbaddb117 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -314,8 +314,7 @@ var TypeScriptAllInOne; Program.prototype.if = function (retValue) { if (retValue === void 0) { retValue = != 0; } return 1; - ^ - retValue; + ^ retValue; bfs.TYPES(); if (retValue != 0) { return 1 && diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js index a558407de43..64e142d7095 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js @@ -5,5 +5,5 @@ 2; //// [parserGreaterThanTokenAmbiguity10.js] -1 >>> - 2; +1 + >>> 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js index 83f2cda2364..7b44da35688 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js @@ -5,5 +5,5 @@ 2; //// [parserGreaterThanTokenAmbiguity15.js] -1 >>= - 2; +1 + >>= 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js index 9ac06e9644f..7a3650fdfd5 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js @@ -5,5 +5,5 @@ 2; //// [parserGreaterThanTokenAmbiguity20.js] -1 >>>= - 2; +1 + >>>= 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js index c0b8fc45cc1..dcfb51575e4 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js @@ -4,4 +4,4 @@ //// [parserGreaterThanTokenAmbiguity4.js] 1 > - > 2; + > 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js index cde18d5c63d..baa3af48e9d 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js @@ -5,5 +5,5 @@ 2; //// [parserGreaterThanTokenAmbiguity5.js] -1 >> - 2; +1 + >> 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js index 757ddf38a7f..96be8d0749c 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js @@ -4,4 +4,4 @@ //// [parserGreaterThanTokenAmbiguity9.js] 1 >> - > 2; + > 2; diff --git a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js index 79e0c04d409..c3e61545c2c 100644 --- a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js +++ b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js @@ -3,4 +3,5 @@ /notregexp/a.foo(); //// [parserRegularExpressionDivideAmbiguity1.js] -1 / notregexp / a.foo(); +1 + / notregexp / a.foo(); diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.js b/tests/baselines/reference/typeGuardsInConditionalExpression.js index 7c87d80d592..a1a546a193e 100644 --- a/tests/baselines/reference/typeGuardsInConditionalExpression.js +++ b/tests/baselines/reference/typeGuardsInConditionalExpression.js @@ -157,7 +157,8 @@ function foo10(x) { var b; return typeof x === "string" ? x // string : ((b = x) // x is number | boolean - && typeof x === "number" && x.toString()); // x is number + && typeof x === "number" + && x.toString()); // x is number } function foo11(x) { // Mixing typeguards @@ -165,8 +166,9 @@ function foo11(x) { var b; return typeof x === "string" ? x // number | boolean | string - changed in the false branch : ((b = x) // x is number | boolean | string - because the assignment changed it - && typeof x === "number" && (x = 10) // assignment to x - && x); // x is number | boolean | string + && typeof x === "number" + && (x = 10) // assignment to x + && x); // x is number | boolean | string } function foo12(x) { // Mixing typeguards @@ -174,5 +176,6 @@ function foo12(x) { var b; return typeof x === "string" ? (x = 10 && x.toString().length) // number | boolean | string - changed here : ((b = x) // x is number | boolean | string - changed in true branch - && typeof x === "number" && x); // x is number + && typeof x === "number" + && x); // x is number } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js index ffba829c37d..23ee7b29f51 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js @@ -72,36 +72,38 @@ function foo3(x) { } function foo4(x) { return typeof x !== "string" // string | number | boolean - && typeof x !== "number" // number | boolean - && x; // boolean + && typeof x !== "number" // number | boolean + && x; // boolean } function foo5(x) { // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop var b; return typeof x !== "string" // string | number | boolean - && ((b = x) && (typeof x !== "number" // number | boolean - && x)); // boolean + && ((b = x) && (typeof x !== "number" // number | boolean + && x)); // boolean } function foo6(x) { // Mixing typeguard narrowing in if statement with conditional expression typeguard return typeof x !== "string" // string | number | boolean - && (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + && (typeof x !== "number" // number | boolean + ? x // boolean + : x === 10); // number } function foo7(x) { var y; var z; // Mixing typeguard narrowing // Assigning value to x deep inside another guard stops narrowing of type too - return typeof x !== "string" && ((z = x) // string | number | boolean - x changed deeper in conditional expression - && (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + return typeof x !== "string" + && ((z = x) // string | number | boolean - x changed deeper in conditional expression + && (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression - return typeof x !== "string" && (x = 10) // change x - number| string - && (typeof x === "number" ? x // number - : x.length); // string + return typeof x !== "string" + && (x = 10) // change x - number| string + && (typeof x === "number" ? x // number + : x.length); // string } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js index 5f5880a4947..13bb090ab8c 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js @@ -72,36 +72,38 @@ function foo3(x) { } function foo4(x) { return typeof x === "string" // string | number | boolean - || typeof x === "number" // number | boolean - || x; // boolean + || typeof x === "number" // number | boolean + || x; // boolean } function foo5(x) { // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop var b; return typeof x === "string" // string | number | boolean - || ((b = x) || (typeof x === "number" // number | boolean - || x)); // boolean + || ((b = x) || (typeof x === "number" // number | boolean + || x)); // boolean } function foo6(x) { // Mixing typeguard return typeof x === "string" // string | number | boolean - || (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + || (typeof x !== "number" // number | boolean + ? x // boolean + : x === 10); // number } function foo7(x) { var y; var z; // Mixing typeguard narrowing // Assigning value to x deep inside another guard stops narrowing of type too - return typeof x === "string" || ((z = x) // string | number | boolean - x changed deeper in conditional expression - || (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + return typeof x === "string" + || ((z = x) // string | number | boolean - x changed deeper in conditional expression + || (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression - return typeof x === "string" || (x = 10) // change x - number| string - || (typeof x === "number" ? x // number - : x.length); // string + return typeof x === "string" + || (x = 10) // change x - number| string + || (typeof x === "number" ? x // number + : x.length); // string } From dddc4660a1134e1d6fdafff6814efa469c34d205 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 13:33:02 -0800 Subject: [PATCH 062/251] Simplify code to emit indent code. --- src/compiler/emitter.ts | 74 ++++++++----------- src/compiler/parser.ts | 9 ++- src/compiler/types.ts | 2 + .../baselines/reference/APISample_compile.js | 2 + .../reference/APISample_compile.types | 8 ++ tests/baselines/reference/APISample_linter.js | 2 + .../reference/APISample_linter.types | 8 ++ .../reference/APISample_transform.js | 2 + .../reference/APISample_transform.types | 8 ++ .../baselines/reference/APISample_watcher.js | 2 + .../reference/APISample_watcher.types | 8 ++ 11 files changed, 80 insertions(+), 45 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 9cdcfeef09d..154b0874548 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2917,6 +2917,7 @@ module ts { function createPropertyAccessExpression(expression: LeftHandSideExpression, name: Identifier): PropertyAccessExpression { var result = createSynthesizedNode(SyntaxKind.PropertyAccessExpression); result.expression = expression; + result.dotToken = createSynthesizedNode(SyntaxKind.DotToken); result.name = name; return result; @@ -3032,6 +3033,20 @@ module ts { return false; } + function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node) { + var isSynthesized = nodeIsSynthesized(parent); + + var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { + increaseIndent(); + writeLine(); + return true; + } + + return false; + } + function emitPropertyAccess(node: PropertyAccessExpression) { if (tryEmitConstantValue(node)) { return; @@ -3039,21 +3054,11 @@ module ts { emit(node.expression); - var indented = false; - var isSynthesied = nodeIsSynthesized(node); - if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.expression, node.dotToken)) { - indented = true; - increaseIndent(); - writeLine(); - } + var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken); write("."); - if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.dotToken, node.name) && !indented) { - indented = true; - increaseIndent(); - writeLine(); - } + indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name); emit(node.name); @@ -3292,42 +3297,28 @@ module ts { // If there was a newline between the left side of the binary expression and the // operator, then try to preserve that. - var indented = false; - var isSynthesied = nodeIsSynthesized(node); - if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.left, node.operatorToken)) { - indented = true; - increaseIndent(); - writeLine(); - } - else { - // Otherwise just emit the operator right afterwards. For everything but - // comma, emit a space before the operator. - if (node.operatorToken.kind !== SyntaxKind.CommaToken) { - write(" "); - } + var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken); + + // Otherwise just emit the operator right afterwards. For everything but + // comma, emit a space before the operator. + if (!indented1 && node.operatorToken.kind !== SyntaxKind.CommaToken) { + write(" "); } write(tokenToString(node.operatorToken.kind)); - // If there was a newline after the operator (or this is a synthesized node that - // wants to be on a new line), then put a newline in. But only if we haven't - // already done this for the left side. - var wantsIndent = (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right)) || - synthesizedNodeStartsOnNewLine(node.right); + if (!indented1) { + var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right); + } - if (wantsIndent && !indented) { - indented = true; - increaseIndent(); - writeLine(); - emit(node.right); - } - else { + if (!indented2) { write(" "); - emit(node.right); } + emit(node.right); + // If we indented the left or the right side, then dedent now. - if (indented) { + if (indented1 || indented2) { decreaseIndent(); } } @@ -3741,10 +3732,7 @@ module ts { if (propName.kind !== SyntaxKind.Identifier) { return createElementAccess(object, propName); } - var node = createSynthesizedNode(SyntaxKind.PropertyAccessExpression); - node.expression = parenthesizeForAccess(object); - node.name = propName; - return node; + return createPropertyAccessExpression(parenthesizeForAccess(object), propName); } function createElementAccess(object: Expression, index: Expression): Expression { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 557d6505984..3b3a2ddeda9 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -157,7 +157,9 @@ module ts { visitNode(cbNode, (node).right); case SyntaxKind.ConditionalExpression: return visitNode(cbNode, (node).condition) || + visitNode(cbNode, (node).questionToken) || visitNode(cbNode, (node).whenTrue) || + visitNode(cbNode, (node).colonToken) || visitNode(cbNode, (node).whenFalse); case SyntaxKind.SpreadElementExpression: return visitNode(cbNode, (node).expression); @@ -3177,7 +3179,8 @@ module ts { function parseConditionalExpressionRest(leftOperand: Expression): Expression { // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher. - if (!parseOptional(SyntaxKind.QuestionToken)) { + var questionToken = parseOptionalToken(SyntaxKind.QuestionToken); + if (!questionToken) { return leftOperand; } @@ -3185,8 +3188,10 @@ module ts { // we do not that for the 'whenFalse' part. var node = createNode(SyntaxKind.ConditionalExpression, leftOperand.pos); node.condition = leftOperand; + node.questionToken = questionToken; node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(SyntaxKind.ColonToken); + node.colonToken = parseExpectedToken(SyntaxKind.ColonToken, /*reportAtCurrentPosition:*/ false, + Diagnostics._0_expected, tokenToString(SyntaxKind.ColonToken)); node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 97706ac324b..e4132655f38 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -640,7 +640,9 @@ module ts { export interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index f10e9c9030c..88add2f8685 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -542,7 +542,9 @@ declare module "typescript" { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 1365a0e903b..7715fd36c77 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -1633,10 +1633,18 @@ declare module "typescript" { >condition : Expression >Expression : Expression + questionToken: Node; +>questionToken : Node +>Node : Node + whenTrue: Expression; >whenTrue : Expression >Expression : Expression + colonToken: Node; +>colonToken : Node +>Node : Node + whenFalse: Expression; >whenFalse : Expression >Expression : Expression diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 3e8c579a051..c8845aab968 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -573,7 +573,9 @@ declare module "typescript" { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 0f428ecdec2..a0550e967a1 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -1779,10 +1779,18 @@ declare module "typescript" { >condition : Expression >Expression : Expression + questionToken: Node; +>questionToken : Node +>Node : Node + whenTrue: Expression; >whenTrue : Expression >Expression : Expression + colonToken: Node; +>colonToken : Node +>Node : Node + whenFalse: Expression; >whenFalse : Expression >Expression : Expression diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 27e04bec1a0..9c0777413a0 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -574,7 +574,9 @@ declare module "typescript" { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index b78b0565a45..4803a94f39b 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -1729,10 +1729,18 @@ declare module "typescript" { >condition : Expression >Expression : Expression + questionToken: Node; +>questionToken : Node +>Node : Node + whenTrue: Expression; >whenTrue : Expression >Expression : Expression + colonToken: Node; +>colonToken : Node +>Node : Node + whenFalse: Expression; >whenFalse : Expression >Expression : Expression diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 139af5b7cd2..2426c0544d9 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -611,7 +611,9 @@ declare module "typescript" { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 5570c9ff12a..8cb082050fa 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -1902,10 +1902,18 @@ declare module "typescript" { >condition : Expression >Expression : Expression + questionToken: Node; +>questionToken : Node +>Node : Node + whenTrue: Expression; >whenTrue : Expression >Expression : Expression + colonToken: Node; +>colonToken : Node +>Node : Node + whenFalse: Expression; >whenFalse : Expression >Expression : Expression From 2a990a8685b85ac068a3c4541df5e804fa2388e9 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 13:50:26 -0800 Subject: [PATCH 063/251] Preserve newlines for conditional expressions --- src/compiler/emitter.ts | 51 ++++++++++-- .../reference/APISample_transform.js | 3 +- .../conditionalExpressionNewLine1.errors.txt | 13 +++ .../conditionalExpressionNewLine1.js | 5 ++ .../conditionalExpressionNewLine10.errors.txt | 31 +++++++ .../conditionalExpressionNewLine10.js | 17 ++++ .../conditionalExpressionNewLine2.errors.txt | 14 ++++ .../conditionalExpressionNewLine2.js | 7 ++ .../conditionalExpressionNewLine3.errors.txt | 14 ++++ .../conditionalExpressionNewLine3.js | 7 ++ .../conditionalExpressionNewLine4.errors.txt | 14 ++++ .../conditionalExpressionNewLine4.js | 7 ++ .../conditionalExpressionNewLine5.errors.txt | 14 ++++ .../conditionalExpressionNewLine5.js | 7 ++ .../conditionalExpressionNewLine6.errors.txt | 15 ++++ .../conditionalExpressionNewLine6.js | 9 +++ .../conditionalExpressionNewLine7.errors.txt | 15 ++++ .../conditionalExpressionNewLine7.js | 9 +++ .../conditionalExpressionNewLine8.errors.txt | 27 +++++++ .../conditionalExpressionNewLine8.js | 9 +++ .../conditionalExpressionNewLine9.errors.txt | 29 +++++++ .../conditionalExpressionNewLine9.js | 13 +++ ...constructorWithIncompleteTypeAnnotation.js | 3 +- ...ericRecursiveImplicitConstructorErrors3.js | 5 +- .../overloadResolutionOverNonCTLambdas.js | 4 +- tests/baselines/reference/scannertest1.js | 6 +- .../typeGuardsInConditionalExpression.js | 81 +++++++++++-------- .../typeGuardsInFunctionAndModuleBlock.js | 62 ++++++++------ .../reference/typeGuardsInIfStatement.js | 26 +++--- ...ypeGuardsInRightOperandOfAndAndOperator.js | 14 ++-- .../typeGuardsInRightOperandOfOrOrOperator.js | 14 ++-- .../compiler/conditionalExpressionNewLine1.ts | 1 + .../conditionalExpressionNewLine10.ts | 7 ++ .../compiler/conditionalExpressionNewLine2.ts | 2 + .../compiler/conditionalExpressionNewLine3.ts | 2 + .../compiler/conditionalExpressionNewLine4.ts | 2 + .../compiler/conditionalExpressionNewLine5.ts | 2 + .../compiler/conditionalExpressionNewLine6.ts | 3 + .../compiler/conditionalExpressionNewLine7.ts | 3 + .../compiler/conditionalExpressionNewLine8.ts | 3 + .../compiler/conditionalExpressionNewLine9.ts | 5 ++ 41 files changed, 485 insertions(+), 90 deletions(-) create mode 100644 tests/baselines/reference/conditionalExpressionNewLine1.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine1.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine10.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine10.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine2.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine2.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine3.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine3.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine4.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine4.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine5.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine5.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine6.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine6.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine7.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine7.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine8.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine8.js create mode 100644 tests/baselines/reference/conditionalExpressionNewLine9.errors.txt create mode 100644 tests/baselines/reference/conditionalExpressionNewLine9.js create mode 100644 tests/cases/compiler/conditionalExpressionNewLine1.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine10.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine2.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine3.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine4.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine5.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine6.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine7.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine8.ts create mode 100644 tests/cases/compiler/conditionalExpressionNewLine9.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 154b0874548..4d8ed28602f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3330,10 +3330,45 @@ module ts { function emitConditionalExpression(node: ConditionalExpression) { emit(node.condition); - write(" ? "); + var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken); + if (!indent1) { + write(" "); + } + + write("?"); + + if (!indent1) { + var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue); + } + + if (!indent2) { + write(" "); + } + emit(node.whenTrue); - write(" : "); + + if (indent1 || indent2) { + decreaseIndent(); + } + + var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken); + if (!indent3) { + write(" "); + } + + write(":"); + if (!indent3) { + var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse); + } + + if (!indent4) { + write(" "); + } + emit(node.whenFalse); + if (indent3 || indent4) { + decreaseIndent(); + } } function isSingleLineEmptyBlock(node: Node) { @@ -3706,10 +3741,16 @@ module ts { equals.left = value; equals.operatorToken = createSynthesizedNode(SyntaxKind.EqualsEqualsEqualsToken); equals.right = createVoidZero(); + return createConditionalExpression(equals, defaultValue, value); + } + + function createConditionalExpression(condition: Expression, whenTrue: Expression, whenFalse: Expression) { var cond = createSynthesizedNode(SyntaxKind.ConditionalExpression); - cond.condition = equals; - cond.whenTrue = defaultValue; - cond.whenFalse = value; + cond.condition = condition; + cond.questionToken = createSynthesizedNode(SyntaxKind.QuestionToken); + cond.whenTrue = whenTrue; + cond.colonToken = createSynthesizedNode(SyntaxKind.ColonToken); + cond.whenFalse = whenFalse; return cond; } diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 9c0777413a0..290421426c3 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -2034,7 +2034,8 @@ function transform(contents, compilerOptions) { // Create a compilerHost object to allow the compiler to read and write files var compilerHost = { getSourceFile: function (fileName, target) { - return files[fileName] !== undefined ? ts.createSourceFile(fileName, files[fileName], target) : undefined; + return files[fileName] !== undefined ? + ts.createSourceFile(fileName, files[fileName], target) : undefined; }, writeFile: function (name, text, writeByteOrderMark) { outputs.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); diff --git a/tests/baselines/reference/conditionalExpressionNewLine1.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine1.errors.txt new file mode 100644 index 00000000000..504d66fe3a7 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine1.errors.txt @@ -0,0 +1,13 @@ +tests/cases/compiler/conditionalExpressionNewLine1.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine1.ts(1,13): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine1.ts(1,17): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine1.ts (3 errors) ==== + var v = a ? b : c; + ~ +!!! error TS2304: Cannot find name 'a'. + ~ +!!! error TS2304: Cannot find name 'b'. + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine1.js b/tests/baselines/reference/conditionalExpressionNewLine1.js new file mode 100644 index 00000000000..02055e3e479 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine1.js @@ -0,0 +1,5 @@ +//// [conditionalExpressionNewLine1.ts] +var v = a ? b : c; + +//// [conditionalExpressionNewLine1.js] +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine10.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine10.errors.txt new file mode 100644 index 00000000000..a5c902361e6 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine10.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/conditionalExpressionNewLine10.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(2,5): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(3,7): error TS2304: Cannot find name 'd'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(4,7): error TS2304: Cannot find name 'e'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(5,5): error TS2304: Cannot find name 'c'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(6,7): error TS2304: Cannot find name 'f'. +tests/cases/compiler/conditionalExpressionNewLine10.ts(7,7): error TS2304: Cannot find name 'g'. + + +==== tests/cases/compiler/conditionalExpressionNewLine10.ts (7 errors) ==== + var v = a + ~ +!!! error TS2304: Cannot find name 'a'. + ? b + ~ +!!! error TS2304: Cannot find name 'b'. + ? d + ~ +!!! error TS2304: Cannot find name 'd'. + : e + ~ +!!! error TS2304: Cannot find name 'e'. + : c + ~ +!!! error TS2304: Cannot find name 'c'. + ? f + ~ +!!! error TS2304: Cannot find name 'f'. + : g; + ~ +!!! error TS2304: Cannot find name 'g'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine10.js b/tests/baselines/reference/conditionalExpressionNewLine10.js new file mode 100644 index 00000000000..bb2f3bec231 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine10.js @@ -0,0 +1,17 @@ +//// [conditionalExpressionNewLine10.ts] +var v = a + ? b + ? d + : e + : c + ? f + : g; + +//// [conditionalExpressionNewLine10.js] +var v = a + ? b + ? d + : e + : c + ? f + : g; diff --git a/tests/baselines/reference/conditionalExpressionNewLine2.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine2.errors.txt new file mode 100644 index 00000000000..5036b247304 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine2.errors.txt @@ -0,0 +1,14 @@ +tests/cases/compiler/conditionalExpressionNewLine2.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine2.ts(2,5): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine2.ts(2,9): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine2.ts (3 errors) ==== + var v = a + ~ +!!! error TS2304: Cannot find name 'a'. + ? b : c; + ~ +!!! error TS2304: Cannot find name 'b'. + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine2.js b/tests/baselines/reference/conditionalExpressionNewLine2.js new file mode 100644 index 00000000000..e69f2004ebc --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine2.js @@ -0,0 +1,7 @@ +//// [conditionalExpressionNewLine2.ts] +var v = a + ? b : c; + +//// [conditionalExpressionNewLine2.js] +var v = a + ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine3.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine3.errors.txt new file mode 100644 index 00000000000..34ea3d419d8 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine3.errors.txt @@ -0,0 +1,14 @@ +tests/cases/compiler/conditionalExpressionNewLine3.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine3.ts(2,3): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine3.ts(2,7): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine3.ts (3 errors) ==== + var v = a ? + ~ +!!! error TS2304: Cannot find name 'a'. + b : c; + ~ +!!! error TS2304: Cannot find name 'b'. + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine3.js b/tests/baselines/reference/conditionalExpressionNewLine3.js new file mode 100644 index 00000000000..4d11f45368f --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine3.js @@ -0,0 +1,7 @@ +//// [conditionalExpressionNewLine3.ts] +var v = a ? + b : c; + +//// [conditionalExpressionNewLine3.js] +var v = a ? + b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine4.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine4.errors.txt new file mode 100644 index 00000000000..74c39406c6c --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine4.errors.txt @@ -0,0 +1,14 @@ +tests/cases/compiler/conditionalExpressionNewLine4.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine4.ts(1,13): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine4.ts(2,3): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine4.ts (3 errors) ==== + var v = a ? b : + ~ +!!! error TS2304: Cannot find name 'a'. + ~ +!!! error TS2304: Cannot find name 'b'. + c; + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine4.js b/tests/baselines/reference/conditionalExpressionNewLine4.js new file mode 100644 index 00000000000..d6532ecb15b --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine4.js @@ -0,0 +1,7 @@ +//// [conditionalExpressionNewLine4.ts] +var v = a ? b : + c; + +//// [conditionalExpressionNewLine4.js] +var v = a ? b : + c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine5.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine5.errors.txt new file mode 100644 index 00000000000..86c8890e218 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine5.errors.txt @@ -0,0 +1,14 @@ +tests/cases/compiler/conditionalExpressionNewLine5.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine5.ts(1,13): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine5.ts(2,5): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine5.ts (3 errors) ==== + var v = a ? b + ~ +!!! error TS2304: Cannot find name 'a'. + ~ +!!! error TS2304: Cannot find name 'b'. + : c; + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine5.js b/tests/baselines/reference/conditionalExpressionNewLine5.js new file mode 100644 index 00000000000..6fdd0735bcd --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine5.js @@ -0,0 +1,7 @@ +//// [conditionalExpressionNewLine5.ts] +var v = a ? b + : c; + +//// [conditionalExpressionNewLine5.js] +var v = a ? b + : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine6.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine6.errors.txt new file mode 100644 index 00000000000..c59ea73b845 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine6.errors.txt @@ -0,0 +1,15 @@ +tests/cases/compiler/conditionalExpressionNewLine6.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine6.ts(2,5): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine6.ts(3,5): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine6.ts (3 errors) ==== + var v = a + ~ +!!! error TS2304: Cannot find name 'a'. + ? b + ~ +!!! error TS2304: Cannot find name 'b'. + : c; + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine6.js b/tests/baselines/reference/conditionalExpressionNewLine6.js new file mode 100644 index 00000000000..94539ab891e --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine6.js @@ -0,0 +1,9 @@ +//// [conditionalExpressionNewLine6.ts] +var v = a + ? b + : c; + +//// [conditionalExpressionNewLine6.js] +var v = a + ? b + : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine7.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine7.errors.txt new file mode 100644 index 00000000000..ff71c42ddae --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine7.errors.txt @@ -0,0 +1,15 @@ +tests/cases/compiler/conditionalExpressionNewLine7.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine7.ts(2,3): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine7.ts(3,3): error TS2304: Cannot find name 'c'. + + +==== tests/cases/compiler/conditionalExpressionNewLine7.ts (3 errors) ==== + var v = a ? + ~ +!!! error TS2304: Cannot find name 'a'. + b : + ~ +!!! error TS2304: Cannot find name 'b'. + c; + ~ +!!! error TS2304: Cannot find name 'c'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine7.js b/tests/baselines/reference/conditionalExpressionNewLine7.js new file mode 100644 index 00000000000..5c781f7d85a --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine7.js @@ -0,0 +1,9 @@ +//// [conditionalExpressionNewLine7.ts] +var v = a ? + b : + c; + +//// [conditionalExpressionNewLine7.js] +var v = a ? + b : + c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine8.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine8.errors.txt new file mode 100644 index 00000000000..1c6a039089c --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine8.errors.txt @@ -0,0 +1,27 @@ +tests/cases/compiler/conditionalExpressionNewLine8.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(2,5): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(2,9): error TS2304: Cannot find name 'd'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(2,13): error TS2304: Cannot find name 'e'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(3,5): error TS2304: Cannot find name 'c'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(3,9): error TS2304: Cannot find name 'f'. +tests/cases/compiler/conditionalExpressionNewLine8.ts(3,13): error TS2304: Cannot find name 'g'. + + +==== tests/cases/compiler/conditionalExpressionNewLine8.ts (7 errors) ==== + var v = a + ~ +!!! error TS2304: Cannot find name 'a'. + ? b ? d : e + ~ +!!! error TS2304: Cannot find name 'b'. + ~ +!!! error TS2304: Cannot find name 'd'. + ~ +!!! error TS2304: Cannot find name 'e'. + : c ? f : g; + ~ +!!! error TS2304: Cannot find name 'c'. + ~ +!!! error TS2304: Cannot find name 'f'. + ~ +!!! error TS2304: Cannot find name 'g'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine8.js b/tests/baselines/reference/conditionalExpressionNewLine8.js new file mode 100644 index 00000000000..61372eeadbc --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine8.js @@ -0,0 +1,9 @@ +//// [conditionalExpressionNewLine8.ts] +var v = a + ? b ? d : e + : c ? f : g; + +//// [conditionalExpressionNewLine8.js] +var v = a + ? b ? d : e + : c ? f : g; diff --git a/tests/baselines/reference/conditionalExpressionNewLine9.errors.txt b/tests/baselines/reference/conditionalExpressionNewLine9.errors.txt new file mode 100644 index 00000000000..821e3ac67f4 --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine9.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/conditionalExpressionNewLine9.ts(1,9): error TS2304: Cannot find name 'a'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(2,5): error TS2304: Cannot find name 'b'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(3,7): error TS2304: Cannot find name 'd'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(3,11): error TS2304: Cannot find name 'e'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(4,5): error TS2304: Cannot find name 'c'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(5,7): error TS2304: Cannot find name 'f'. +tests/cases/compiler/conditionalExpressionNewLine9.ts(5,11): error TS2304: Cannot find name 'g'. + + +==== tests/cases/compiler/conditionalExpressionNewLine9.ts (7 errors) ==== + var v = a + ~ +!!! error TS2304: Cannot find name 'a'. + ? b + ~ +!!! error TS2304: Cannot find name 'b'. + ? d : e + ~ +!!! error TS2304: Cannot find name 'd'. + ~ +!!! error TS2304: Cannot find name 'e'. + : c + ~ +!!! error TS2304: Cannot find name 'c'. + ? f : g; + ~ +!!! error TS2304: Cannot find name 'f'. + ~ +!!! error TS2304: Cannot find name 'g'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressionNewLine9.js b/tests/baselines/reference/conditionalExpressionNewLine9.js new file mode 100644 index 00000000000..79f4606754e --- /dev/null +++ b/tests/baselines/reference/conditionalExpressionNewLine9.js @@ -0,0 +1,13 @@ +//// [conditionalExpressionNewLine9.ts] +var v = a + ? b + ? d : e + : c + ? f : g; + +//// [conditionalExpressionNewLine9.js] +var v = a + ? b + ? d : e + : c + ? f : g; diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 6adbaddb117..16e936620d0 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -499,7 +499,8 @@ var CLASS = (function () { CLASS.prototype.Foo = function () { var myEvent = function () { return 1; }; if (myEvent() == 1) - return true ? : ; + return true ? + : ; else return false; }; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js index 11113b778d3..e01c9045345 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js @@ -69,7 +69,10 @@ var TypeScript; }; PullTypeSymbol.prototype.getScopedNameEx = function (scopeSymbol, useConstraintInName, getPrettyTypeName, getTypeParamMarkerInfo) { if (this.isArray()) { - var elementMemberName = this._elementType ? (this._elementType.isArray() || this._elementType.isNamedTypeSymbol() ? this._elementType.getScopedNameEx(scopeSymbol, false, getPrettyTypeName, getTypeParamMarkerInfo) : this._elementType.getMemberTypeNameEx(false, scopeSymbol, getPrettyTypeName)) : 1; + var elementMemberName = this._elementType ? + (this._elementType.isArray() || this._elementType.isNamedTypeSymbol() ? + this._elementType.getScopedNameEx(scopeSymbol, false, getPrettyTypeName, getTypeParamMarkerInfo) : + this._elementType.getMemberTypeNameEx(false, scopeSymbol, getPrettyTypeName)) : 1; return TypeScript.MemberName.create(elementMemberName, "", "[]"); } }; diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index e77e8d3371f..170f2dd2137 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -43,7 +43,9 @@ var Bugs; rest[_i - 1] = arguments[_i]; } var index = rest[0]; - return typeof args[index] !== 'undefined' ? args[index] : match; + return typeof args[index] !== 'undefined' + ? args[index] + : match; }); return result; } diff --git a/tests/baselines/reference/scannertest1.js b/tests/baselines/reference/scannertest1.js index 8c9d805c5f2..b96c965a79e 100644 --- a/tests/baselines/reference/scannertest1.js +++ b/tests/baselines/reference/scannertest1.js @@ -39,7 +39,11 @@ var CharacterInfo = (function () { }; CharacterInfo.hexValue = function (c) { Debug.assert(isHexDigit(c)); - return isDecimalDigit(c) ? (c - CharacterCodes._0) : (c >= CharacterCodes.A && c <= CharacterCodes.F) ? c - CharacterCodes.A + 10 : c - CharacterCodes.a + 10; + return isDecimalDigit(c) + ? (c - CharacterCodes._0) + : (c >= CharacterCodes.A && c <= CharacterCodes.F) + ? c - CharacterCodes.A + 10 + : c - CharacterCodes.a + 10; }; return CharacterInfo; })(); diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.js b/tests/baselines/reference/typeGuardsInConditionalExpression.js index a1a546a193e..118ebbc02c0 100644 --- a/tests/baselines/reference/typeGuardsInConditionalExpression.js +++ b/tests/baselines/reference/typeGuardsInConditionalExpression.js @@ -105,77 +105,92 @@ function foo12(x: number | string | boolean) { // the type of a variable or parameter is narrowed by any type guard in the condition when false, // provided the false expression contains no assignments to the variable or parameter. function foo(x) { - return typeof x === "string" ? x.length // string - : x++; // number + return typeof x === "string" + ? x.length // string + : x++; // number } function foo2(x) { // x is assigned in the if true branch, the type is not narrowed - return typeof x === "string" ? (x = 10 && x) // string | number - : x; // string | number + return typeof x === "string" + ? (x = 10 && x) // string | number + : x; // string | number } function foo3(x) { // x is assigned in the if false branch, the type is not narrowed // even though assigned using same type as narrowed expression - return typeof x === "string" ? (x = "Hello" && x) // string | number - : x; // string | number + return typeof x === "string" + ? (x = "Hello" && x) // string | number + : x; // string | number } function foo4(x) { // false branch updates the variable - so here it is not number // even though assigned using same type as narrowed expression - return typeof x === "string" ? x // string | number - : (x = 10 && x); // string | number + return typeof x === "string" + ? x // string | number + : (x = 10 && x); // string | number } function foo5(x) { // false branch updates the variable - so here it is not number - return typeof x === "string" ? x // string | number - : (x = "hello" && x); // string | number + return typeof x === "string" + ? x // string | number + : (x = "hello" && x); // string | number } function foo6(x) { // Modify in both branches - return typeof x === "string" ? (x = 10 && x) // string | number - : (x = "hello" && x); // string | number + return typeof x === "string" + ? (x = 10 && x) // string | number + : (x = "hello" && x); // string | number } function foo7(x) { - return typeof x === "string" ? x === "hello" // string - : typeof x === "boolean" ? x // boolean - : x == 10; // number + return typeof x === "string" + ? x === "hello" // string + : typeof x === "boolean" + ? x // boolean + : x == 10; // number } function foo8(x) { var b; - return typeof x === "string" ? x === "hello" : ((b = x) && - (typeof x === "boolean" ? x // boolean - : x == 10)); // number + return typeof x === "string" + ? x === "hello" + : ((b = x) && + (typeof x === "boolean" + ? x // boolean + : x == 10)); // number } function foo9(x) { var y = 10; // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop - return typeof x === "string" ? ((y = x.length) && x === "hello") // string - : x === 10; // number + return typeof x === "string" + ? ((y = x.length) && x === "hello") // string + : x === 10; // number } function foo10(x) { // Mixing typeguards var b; - return typeof x === "string" ? x // string - : ((b = x) // x is number | boolean - && typeof x === "number" - && x.toString()); // x is number + return typeof x === "string" + ? x // string + : ((b = x) // x is number | boolean + && typeof x === "number" + && x.toString()); // x is number } function foo11(x) { // Mixing typeguards // Assigning value to x deep inside another guard stops narrowing of type too var b; - return typeof x === "string" ? x // number | boolean | string - changed in the false branch - : ((b = x) // x is number | boolean | string - because the assignment changed it - && typeof x === "number" - && (x = 10) // assignment to x - && x); // x is number | boolean | string + return typeof x === "string" + ? x // number | boolean | string - changed in the false branch + : ((b = x) // x is number | boolean | string - because the assignment changed it + && typeof x === "number" + && (x = 10) // assignment to x + && x); // x is number | boolean | string } function foo12(x) { // Mixing typeguards // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression var b; - return typeof x === "string" ? (x = 10 && x.toString().length) // number | boolean | string - changed here - : ((b = x) // x is number | boolean | string - changed in true branch - && typeof x === "number" - && x); // x is number + return typeof x === "string" + ? (x = 10 && x.toString().length) // number | boolean | string - changed here + : ((b = x) // x is number | boolean | string - changed in true branch + && typeof x === "number" + && x); // x is number } diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js index 239eeb4bfe7..7cf19dac0ad 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js @@ -82,32 +82,44 @@ module m1 { //// [typeGuardsInFunctionAndModuleBlock.js] // typeguards are scoped in function/module block function foo(x) { - return typeof x === "string" ? x : function f() { - var b = x; // number | boolean - return typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number - }(); + return typeof x === "string" + ? x + : function f() { + var b = x; // number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + }(); } function foo2(x) { - return typeof x === "string" ? x : function f(a) { - var b = x; // new scope - number | boolean - return typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number - }(x); // x here is narrowed to number | boolean + return typeof x === "string" + ? x + : function f(a) { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + }(x); // x here is narrowed to number | boolean } function foo3(x) { - return typeof x === "string" ? x : (function () { - var b = x; // new scope - number | boolean - return typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number - })(); + return typeof x === "string" + ? x + : (function () { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + })(); } function foo4(x) { - return typeof x === "string" ? x : (function (a) { - var b = x; // new scope - number | boolean - return typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number - })(x); // x here is narrowed to number | boolean + return typeof x === "string" + ? x + : (function (a) { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + })(x); // x here is narrowed to number | boolean } // Type guards affect nested function expressions, but not nested function declarations function foo5(x) { @@ -129,8 +141,9 @@ var m; y = x; // string; } else { - y = typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number + y = typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number } })(m2 || (m2 = {})); })(m || (m = {})); @@ -147,8 +160,9 @@ var m1; y = x; // string; } else { - y = typeof x === "boolean" ? x.toString() // boolean - : x.toString(); // number + y = typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number } })(m3 = m2.m3 || (m2.m3 = {})); })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/typeGuardsInIfStatement.js b/tests/baselines/reference/typeGuardsInIfStatement.js index c228c038579..820d205bc65 100644 --- a/tests/baselines/reference/typeGuardsInIfStatement.js +++ b/tests/baselines/reference/typeGuardsInIfStatement.js @@ -258,8 +258,9 @@ function foo10(x) { else { var y; var b = x; // number | boolean - return typeof x === "number" ? x === 10 // number - : x; // x should be boolean + return typeof x === "number" + ? x === 10 // number + : x; // x should be boolean } } function foo11(x) { @@ -271,13 +272,15 @@ function foo11(x) { else { var y; var b = x; // number | boolean | string - because below we are changing value of x in if statement - return typeof x === "number" ? ( - // change value of x - x = 10 && x.toString() // number | boolean | string - ) : ( - // do not change value - y = x && x.toString() // number | boolean | string - ); + return typeof x === "number" + ? ( + // change value of x + x = 10 && x.toString() // number | boolean | string + ) + : ( + // do not change value + y = x && x.toString() // number | boolean | string + ); } } function foo12(x) { @@ -289,7 +292,8 @@ function foo12(x) { else { x = 10; var b = x; // number | boolean | string - return typeof x === "number" ? x.toString() // number - : x.toString(); // boolean | string + return typeof x === "number" + ? x.toString() // number + : x.toString(); // boolean | string } } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js index 23ee7b29f51..e3f1a8c72c2 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js @@ -86,8 +86,8 @@ function foo6(x) { // Mixing typeguard narrowing in if statement with conditional expression typeguard return typeof x !== "string" // string | number | boolean && (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + ? x // boolean + : x === 10); // number } function foo7(x) { var y; @@ -96,14 +96,16 @@ function foo7(x) { // Assigning value to x deep inside another guard stops narrowing of type too return typeof x !== "string" && ((z = x) // string | number | boolean - x changed deeper in conditional expression - && (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + && (typeof x === "number" + ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression return typeof x !== "string" && (x = 10) // change x - number| string - && (typeof x === "number" ? x // number - : x.length); // string + && (typeof x === "number" + ? x // number + : x.length); // string } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js index 13bb090ab8c..188d226da13 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js @@ -86,8 +86,8 @@ function foo6(x) { // Mixing typeguard return typeof x === "string" // string | number | boolean || (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + ? x // boolean + : x === 10); // number } function foo7(x) { var y; @@ -96,14 +96,16 @@ function foo7(x) { // Assigning value to x deep inside another guard stops narrowing of type too return typeof x === "string" || ((z = x) // string | number | boolean - x changed deeper in conditional expression - || (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + || (typeof x === "number" + ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression return typeof x === "string" || (x = 10) // change x - number| string - || (typeof x === "number" ? x // number - : x.length); // string + || (typeof x === "number" + ? x // number + : x.length); // string } diff --git a/tests/cases/compiler/conditionalExpressionNewLine1.ts b/tests/cases/compiler/conditionalExpressionNewLine1.ts new file mode 100644 index 00000000000..a21af7d1b0e --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine1.ts @@ -0,0 +1 @@ +var v = a ? b : c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine10.ts b/tests/cases/compiler/conditionalExpressionNewLine10.ts new file mode 100644 index 00000000000..c1da921a4d6 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine10.ts @@ -0,0 +1,7 @@ +var v = a + ? b + ? d + : e + : c + ? f + : g; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine2.ts b/tests/cases/compiler/conditionalExpressionNewLine2.ts new file mode 100644 index 00000000000..30c0c37beb6 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine2.ts @@ -0,0 +1,2 @@ +var v = a + ? b : c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine3.ts b/tests/cases/compiler/conditionalExpressionNewLine3.ts new file mode 100644 index 00000000000..ab31c226625 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine3.ts @@ -0,0 +1,2 @@ +var v = a ? + b : c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine4.ts b/tests/cases/compiler/conditionalExpressionNewLine4.ts new file mode 100644 index 00000000000..f17370ff046 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine4.ts @@ -0,0 +1,2 @@ +var v = a ? b : + c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine5.ts b/tests/cases/compiler/conditionalExpressionNewLine5.ts new file mode 100644 index 00000000000..695ce0a1005 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine5.ts @@ -0,0 +1,2 @@ +var v = a ? b + : c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine6.ts b/tests/cases/compiler/conditionalExpressionNewLine6.ts new file mode 100644 index 00000000000..189a3d67aa8 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine6.ts @@ -0,0 +1,3 @@ +var v = a + ? b + : c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine7.ts b/tests/cases/compiler/conditionalExpressionNewLine7.ts new file mode 100644 index 00000000000..5c5120c8022 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine7.ts @@ -0,0 +1,3 @@ +var v = a ? + b : + c; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine8.ts b/tests/cases/compiler/conditionalExpressionNewLine8.ts new file mode 100644 index 00000000000..ef8fcf2ed95 --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine8.ts @@ -0,0 +1,3 @@ +var v = a + ? b ? d : e + : c ? f : g; \ No newline at end of file diff --git a/tests/cases/compiler/conditionalExpressionNewLine9.ts b/tests/cases/compiler/conditionalExpressionNewLine9.ts new file mode 100644 index 00000000000..a59440f485c --- /dev/null +++ b/tests/cases/compiler/conditionalExpressionNewLine9.ts @@ -0,0 +1,5 @@ +var v = a + ? b + ? d : e + : c + ? f : g; \ No newline at end of file From 04d373ab9b72f33335867073f28b00d90ab189df Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 13:59:18 -0800 Subject: [PATCH 064/251] Update LKG --- bin/tsc.js | 2234 +++++++++++------ bin/tsserver.js | 3447 +++++++++++++++++--------- bin/typescript.d.ts | 129 +- bin/typescript.js | 3420 ++++++++++++++++--------- bin/typescriptServices.d.ts | 129 +- bin/typescriptServices.js | 3420 ++++++++++++++++--------- bin/typescriptServices_internal.d.ts | 31 +- bin/typescript_internal.d.ts | 31 +- 8 files changed, 8436 insertions(+), 4405 deletions(-) diff --git a/bin/tsc.js b/bin/tsc.js index 48eeb47befc..573d07360c9 100644 --- a/bin/tsc.js +++ b/bin/tsc.js @@ -396,7 +396,9 @@ var ts; normalized.pop(); } else { - normalized.push(part); + if (part) { + normalized.push(part); + } } } } @@ -539,7 +541,7 @@ var ts; } ts.removeFileExtension = removeFileExtension; var backslashOrDoubleQuote = /[\"\\]/g; - var escapedCharsRegExp = /[\0-\19\t\v\f\b\0\r\n\u2028\u2029\u0085]/g; + var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; var escapedCharsMap = { "\0": "\\0", "\t": "\\t", @@ -554,20 +556,6 @@ var ts; "\u2029": "\\u2029", "\u0085": "\\u0085" }; - function escapeString(s) { - s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s; - s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; - return s; - function getReplacement(c) { - return escapedCharsMap[c] || unicodeEscape(c); - } - function unicodeEscape(c) { - var hexCharCode = c.charCodeAt(0).toString(16); - var paddedHexCode = ("0000" + hexCharCode).slice(-4); - return "\\u" + paddedHexCode; - } - } - ts.escapeString = escapeString; function getDefaultLibFileName(options) { return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; } @@ -880,7 +868,6 @@ var ts; Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." }, Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." }, Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." }, - Catch_clause_parameter_cannot_have_a_type_annotation: { code: 1013, category: 1, key: "Catch clause parameter cannot have a type annotation." }, A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." }, Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." }, A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." }, @@ -988,7 +975,6 @@ var ts; const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" }, const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." }, let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." }, - Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1159, category: 1, key: "Tagged templates are only available when targeting ECMAScript 6 and higher." }, Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." }, Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." }, An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." }, @@ -1025,6 +1011,11 @@ var ts; External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." }, An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." }, Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." }, + Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." }, + Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." }, + Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." }, + An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." }, + Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." }, Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." }, Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." }, Static_members_cannot_reference_class_type_parameters: { code: 2302, category: 1, key: "Static members cannot reference class type parameters." }, @@ -1198,6 +1189,14 @@ var ts; for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." }, The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." }, Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" }, + The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." }, + Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." }, + The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." }, + The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." }, + The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." }, + Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" }, Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, @@ -1267,6 +1266,7 @@ var ts; Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." }, + Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." }, The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." }, Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" }, @@ -1342,25 +1342,24 @@ var ts; You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." }, yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." }, Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." }, - The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }, - for_of_statements_are_not_currently_supported: { code: 9003, category: 1, key: "'for...of' statements are not currently supported." } + The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." } }; })(ts || (ts = {})); var ts; (function (ts) { var textToToken = { - "any": 112, + "any": 111, "as": 101, - "boolean": 113, + "boolean": 112, "break": 65, "case": 66, "catch": 67, "class": 68, "continue": 70, "const": 69, - "constructor": 114, + "constructor": 113, "debugger": 71, - "declare": 115, + "declare": 114, "default": 72, "delete": 73, "do": 74, @@ -1371,43 +1370,43 @@ var ts; "false": 79, "finally": 80, "for": 81, - "from": 102, + "from": 123, "function": 82, - "get": 116, + "get": 115, "if": 83, - "implements": 103, + "implements": 102, "import": 84, "in": 85, "instanceof": 86, - "interface": 104, - "let": 105, - "module": 117, + "interface": 103, + "let": 104, + "module": 116, "new": 87, "null": 88, - "number": 119, - "package": 106, - "private": 107, - "protected": 108, - "public": 109, - "require": 118, + "number": 118, + "package": 105, + "private": 106, + "protected": 107, + "public": 108, + "require": 117, "return": 89, - "set": 120, - "static": 110, - "string": 121, + "set": 119, + "static": 109, + "string": 120, "super": 90, "switch": 91, - "symbol": 122, + "symbol": 121, "this": 92, "throw": 93, "true": 94, "try": 95, - "type": 123, + "type": 122, "typeof": 96, "var": 97, "void": 98, "while": 99, "with": 100, - "yield": 111, + "yield": 110, "of": 124, "{": 14, "}": 15, @@ -1780,6 +1779,7 @@ var ts; var token; var tokenValue; var precedingLineBreak; + var hasExtendedUnicodeEscape; var tokenIsUnterminated; function error(message, length) { if (onError) { @@ -1829,10 +1829,16 @@ var ts; } return +(text.substring(start, pos)); } - function scanHexDigits(count, mustMatchCount) { + function scanExactNumberOfHexDigits(count) { + return scanHexDigits(count, false); + } + function scanMinimumNumberOfHexDigits(count) { + return scanHexDigits(count, true); + } + function scanHexDigits(minCount, scanAsManyAsPossible) { var digits = 0; var value = 0; - while (digits < count || !mustMatchCount) { + while (digits < minCount || scanAsManyAsPossible) { var ch = text.charCodeAt(pos); if (ch >= 48 && ch <= 57) { value = value * 16 + ch - 48; @@ -1849,7 +1855,7 @@ var ts; pos++; digits++; } - if (digits < count) { + if (digits < minCount) { value = -1; } return value; @@ -1962,16 +1968,15 @@ var ts; return "\'"; case 34: return "\""; - case 120: case 117: - var ch = scanHexDigits(ch === 120 ? 2 : 4, true); - if (ch >= 0) { - return String.fromCharCode(ch); - } - else { - error(ts.Diagnostics.Hexadecimal_digit_expected); - return ""; + if (pos < len && text.charCodeAt(pos) === 123) { + hasExtendedUnicodeEscape = true; + pos++; + return scanExtendedUnicodeEscape(); } + return scanHexadecimalEscape(4); + case 120: + return scanHexadecimalEscape(2); case 13: if (pos < len && text.charCodeAt(pos) === 10) { pos++; @@ -1984,11 +1989,57 @@ var ts; return String.fromCharCode(ch); } } + function scanHexadecimalEscape(numDigits) { + var escapedValue = scanExactNumberOfHexDigits(numDigits); + if (escapedValue >= 0) { + return String.fromCharCode(escapedValue); + } + else { + error(ts.Diagnostics.Hexadecimal_digit_expected); + return ""; + } + } + function scanExtendedUnicodeEscape() { + var escapedValue = scanMinimumNumberOfHexDigits(1); + var isInvalidExtendedEscape = false; + if (escapedValue < 0) { + error(ts.Diagnostics.Hexadecimal_digit_expected); + isInvalidExtendedEscape = true; + } + else if (escapedValue > 0x10FFFF) { + error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive); + isInvalidExtendedEscape = true; + } + if (pos >= len) { + error(ts.Diagnostics.Unexpected_end_of_text); + isInvalidExtendedEscape = true; + } + else if (text.charCodeAt(pos) == 125) { + pos++; + } + else { + error(ts.Diagnostics.Unterminated_Unicode_escape_sequence); + isInvalidExtendedEscape = true; + } + if (isInvalidExtendedEscape) { + return ""; + } + return utf16EncodeAsString(escapedValue); + } + function utf16EncodeAsString(codePoint) { + ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF); + if (codePoint <= 65535) { + return String.fromCharCode(codePoint); + } + var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800; + var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00; + return String.fromCharCode(codeUnit1, codeUnit2); + } function peekUnicodeEscape() { if (pos + 5 < len && text.charCodeAt(pos + 1) === 117) { var start = pos; pos += 2; - var value = scanHexDigits(4, true); + var value = scanExactNumberOfHexDigits(4); pos = start; return value; } @@ -2050,6 +2101,7 @@ var ts; } function scan() { startPos = pos; + hasExtendedUnicodeEscape = false; precedingLineBreak = false; tokenIsUnterminated = false; while (true) { @@ -2201,7 +2253,7 @@ var ts; case 48: if (pos + 2 < len && (text.charCodeAt(pos + 1) === 88 || text.charCodeAt(pos + 1) === 120)) { pos += 2; - var value = scanHexDigits(1, false); + var value = scanMinimumNumberOfHexDigits(1); if (value < 0) { error(ts.Diagnostics.Hexadecimal_digit_expected); value = 0; @@ -2471,6 +2523,7 @@ var ts; getTokenPos: function () { return tokenPos; }, getTokenText: function () { return text.substring(tokenPos, pos); }, getTokenValue: function () { return tokenValue; }, + hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; }, hasPrecedingLineBreak: function () { return precedingLineBreak; }, isIdentifier: function () { return token === 64 || token > 100; }, isReservedWord: function () { return token >= 65 && token <= 100; }, @@ -2619,35 +2672,51 @@ var ts; return ts.getBaseFileName(moduleName).replace(/\W/g, "_"); } ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 12288) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + function isCatchClauseVariableDeclaration(declaration) { + return declaration && + declaration.kind === 193 && + declaration.parent && + declaration.parent.kind === 216; + } + ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; function declarationNameToString(name) { return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); } ts.declarationNameToString = declarationNameToString; function createDiagnosticForNode(node, message, arg0, arg1, arg2) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = getTokenPosOfNode(node, file); - var length = node.end - start; - return ts.createFileDiagnostic(file, start, length, message, arg0, arg1, arg2); + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); } ts.createDiagnosticForNode = createDiagnosticForNode; function createDiagnosticForNodeFromMessageChain(node, messageChain) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = ts.skipTrivia(file.text, node.pos); - var length = node.end - start; + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); return { - file: file, - start: start, - length: length, + file: sourceFile, + start: span.start, + length: span.length, code: messageChain.code, category: messageChain.category, messageText: messageChain.next ? messageChain : messageChain.messageText }; } ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; - function getErrorSpanForNode(node) { - var errorSpan; + function getSpanOfTokenAtPosition(sourceFile, pos) { + var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.text); + scanner.setTextPos(pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return createTextSpanFromBounds(start, scanner.getTextPos()); + } + ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; + function getErrorSpanForNode(sourceFile, node) { + var errorNode = node; switch (node.kind) { case 193: case 150: @@ -2656,10 +2725,16 @@ var ts; case 200: case 199: case 219: - errorSpan = node.name; + case 195: + case 160: + errorNode = node.name; break; } - return errorSpan && errorSpan.pos < errorSpan.end ? errorSpan : node; + if (errorNode === undefined) { + return getSpanOfTokenAtPosition(sourceFile, node.pos); + } + var pos = nodeIsMissing(errorNode) ? errorNode.pos : ts.skipTrivia(sourceFile.text, errorNode.pos); + return createTextSpanFromBounds(pos, errorNode.end); } ts.getErrorSpanForNode = getErrorSpanForNode; function isExternalModule(file) { @@ -2667,7 +2742,7 @@ var ts; } ts.isExternalModule = isExternalModule; function isDeclarationFile(file) { - return (file.flags & 1024) !== 0; + return (file.flags & 2048) !== 0; } ts.isDeclarationFile = isDeclarationFile; function isConstEnumDeclaration(node) { @@ -2697,11 +2772,11 @@ var ts; } ts.getCombinedNodeFlags = getCombinedNodeFlags; function isConst(node) { - return !!(getCombinedNodeFlags(node) & 4096); + return !!(getCombinedNodeFlags(node) & 8192); } ts.isConst = isConst; function isLet(node) { - return !!(getCombinedNodeFlags(node) & 2048); + return !!(getCombinedNodeFlags(node) & 4096); } ts.isLet = isLet; function isPrologueDirective(node) { @@ -2753,7 +2828,24 @@ var ts; } } ts.forEachReturnStatement = forEachReturnStatement; - function isAnyFunction(node) { + function isVariableLike(node) { + if (node) { + switch (node.kind) { + case 150: + case 219: + case 128: + case 217: + case 130: + case 129: + case 218: + case 193: + return true; + } + } + return false; + } + ts.isVariableLike = isVariableLike; + function isFunctionLike(node) { if (node) { switch (node.kind) { case 133: @@ -2777,9 +2869,9 @@ var ts; } return false; } - ts.isAnyFunction = isAnyFunction; + ts.isFunctionLike = isFunctionLike; function isFunctionBlock(node) { - return node && node.kind === 174 && isAnyFunction(node.parent); + return node && node.kind === 174 && isFunctionLike(node.parent); } ts.isFunctionBlock = isFunctionBlock; function isObjectLiteralMethod(node) { @@ -2789,7 +2881,7 @@ var ts; function getContainingFunction(node) { while (true) { node = node.parent; - if (!node || isAnyFunction(node)) { + if (!node || isFunctionLike(node)) { return node; } } @@ -3027,12 +3119,12 @@ var ts; } ts.isTemplateLiteralKind = isTemplateLiteralKind; function isBindingPattern(node) { - return node.kind === 149 || node.kind === 148; + return !!node && (node.kind === 149 || node.kind === 148); } ts.isBindingPattern = isBindingPattern; function isInAmbientContext(node) { while (node) { - if (node.flags & (2 | 1024)) { + if (node.flags & (2 | 2048)) { return true; } node = node.parent; @@ -3042,31 +3134,33 @@ var ts; ts.isInAmbientContext = isInAmbientContext; function isDeclaration(node) { switch (node.kind) { - case 127: - case 128: - case 193: + case 161: case 150: - case 130: - case 129: - case 217: - case 218: + case 196: + case 133: + case 199: case 219: + case 211: + case 195: + case 160: + case 134: + case 204: + case 202: + case 207: + case 197: case 132: case 131: - case 195: - case 134: - case 135: - case 133: - case 196: - case 197: - case 198: - case 199: case 200: - case 202: - case 204: - case 207: case 205: - case 211: + case 128: + case 217: + case 130: + case 129: + case 135: + case 218: + case 198: + case 127: + case 193: return true; } return false; @@ -3099,27 +3193,29 @@ var ts; } } ts.isStatement = isStatement; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name) { + function isDeclarationName(name) { if (name.kind !== 64 && name.kind !== 8 && name.kind !== 7) { return false; } var parent = name.parent; - if (isDeclaration(parent) || parent.kind === 160) { - return parent.name === name; + if (parent.kind === 207 || parent.kind === 211) { + if (parent.propertyName) { + return true; + } } - if (parent.kind === 216) { + if (isDeclaration(parent)) { return parent.name === name; } return false; } - ts.isDeclarationOrFunctionExpressionOrCatchVariableName = isDeclarationOrFunctionExpressionOrCatchVariableName; + ts.isDeclarationName = isDeclarationName; function getClassBaseTypeNode(node) { var heritageClause = getHeritageClause(node.heritageClauses, 78); return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; } ts.getClassBaseTypeNode = getClassBaseTypeNode; function getClassImplementedTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 103); + var heritageClause = getHeritageClause(node.heritageClauses, 102); return heritageClause ? heritageClause.types : undefined; } ts.getClassImplementedTypeNodes = getClassImplementedTypeNodes; @@ -3233,13 +3329,14 @@ var ts; ts.isESSymbolIdentifier = isESSymbolIdentifier; function isModifier(token) { switch (token) { - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: case 77: - case 115: + case 114: case 69: + case 72: return true; } return false; @@ -3354,6 +3451,42 @@ var ts; return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); } ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; + function nodeStartsNewLexicalEnvironment(n) { + return isFunctionLike(n) || n.kind === 200 || n.kind === 220; + } + ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; + function nodeIsSynthesized(node) { + return node.pos === -1 && node.end === -1; + } + ts.nodeIsSynthesized = nodeIsSynthesized; + function createSynthesizedNode(kind, startsOnNewLine) { + var node = ts.createNode(kind); + node.pos = -1; + node.end = -1; + node.startsOnNewLine = startsOnNewLine; + return node; + } + ts.createSynthesizedNode = createSynthesizedNode; + function generateUniqueName(baseName, isExistingName) { + if (baseName.charCodeAt(0) !== 95) { + var baseName = "_" + baseName; + if (!isExistingName(baseName)) { + return baseName; + } + } + if (baseName.charCodeAt(baseName.length - 1) !== 95) { + baseName += "_"; + } + var i = 1; + while (true) { + var name = baseName + i; + if (!isExistingName(name)) { + return name; + } + i++; + } + } + ts.generateUniqueName = generateUniqueName; function createDiagnosticCollection() { var nonFileDiagnostics = []; var fileDiagnostics = {}; @@ -3419,6 +3552,39 @@ var ts; } } ts.createDiagnosticCollection = createDiagnosticCollection; + var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; + var escapedCharsMap = { + "\0": "\\0", + "\t": "\\t", + "\v": "\\v", + "\f": "\\f", + "\b": "\\b", + "\r": "\\r", + "\n": "\\n", + "\\": "\\\\", + "\"": "\\\"", + "\u2028": "\\u2028", + "\u2029": "\\u2029", + "\u0085": "\\u0085" + }; + function escapeString(s) { + s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; + return s; + function getReplacement(c) { + return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); + } + } + ts.escapeString = escapeString; + function get16BitUnicodeEscapeSequence(charCode) { + var hexCharCode = charCode.toString(16).toUpperCase(); + var paddedHexCode = ("0000" + hexCharCode).slice(-4); + return "\\u" + paddedHexCode; + } + var nonAsciiCharacters = /[^\u0000-\u007F]/g; + function escapeNonAsciiCharacters(s) { + return nonAsciiCharacters.test(s) ? s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : s; + } + ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; })(ts || (ts = {})); var ts; (function (ts) { @@ -3529,6 +3695,7 @@ var ts; return visitNodes(cbNodes, node.properties); case 153: return visitNode(cbNode, node.expression) || + visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name); case 154: return visitNode(cbNode, node.expression) || @@ -3565,7 +3732,9 @@ var ts; visitNode(cbNode, node.right); case 168: return visitNode(cbNode, node.condition) || + visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || + visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse); case 171: return visitNode(cbNode, node.expression); @@ -3631,8 +3800,7 @@ var ts; visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock); case 216: - return visitNode(cbNode, node.name) || - visitNode(cbNode, node.type) || + return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block); case 196: return visitNodes(cbNodes, node.modifiers) || @@ -3687,7 +3855,7 @@ var ts; visitNode(cbNode, node.name); case 208: return visitNodes(cbNodes, node.modifiers) || - visitNode(cbNode, node.exportName); + visitNode(cbNode, node.expression); case 169: return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans); case 173: @@ -3729,13 +3897,14 @@ var ts; ; function modifierToFlag(token) { switch (token) { - case 110: return 128; - case 109: return 16; - case 108: return 64; - case 107: return 32; + case 109: return 128; + case 108: return 16; + case 107: return 64; + case 106: return 32; case 77: return 1; - case 115: return 2; - case 69: return 4096; + case 114: return 2; + case 69: return 8192; + case 72: return 256; } return 0; } @@ -4057,7 +4226,7 @@ var ts; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); - sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 1024 : 0; + sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 2048 : 0; var contextFlags = 0; var parseErrorBeforeNextFinishedNode = false; var scanner = ts.createScanner(languageVersion, true, sourceText, scanError); @@ -4204,10 +4373,10 @@ var ts; if (token === 64) { return true; } - if (token === 111 && inYieldContext()) { + if (token === 110 && inYieldContext()) { return false; } - return inStrictModeContext() ? token > 111 : token > 100; + return inStrictModeContext() ? token > 110 : token > 100; } function parseExpected(kind, diagnosticMessage) { if (token === kind) { @@ -4231,12 +4400,14 @@ var ts; } function parseOptionalToken(t) { if (token === t) { - var node = createNode(t); - nextToken(); - return finishNode(node); + return parseTokenNode(); } return undefined; } + function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) { + return parseOptionalToken(t) || + createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0); + } function parseTokenNode() { var node = createNode(token); nextToken(); @@ -4355,14 +4526,24 @@ var ts; } if (token === 77) { nextToken(); + if (token === 72) { + return lookAhead(nextTokenIsClassOrFunction); + } return token !== 35 && token !== 14 && canFollowModifier(); } + if (token === 72) { + return nextTokenIsClassOrFunction(); + } nextToken(); return canFollowModifier(); } function canFollowModifier() { return token === 18 || token === 14 || token === 35 || isLiteralPropertyName(); } + function nextTokenIsClassOrFunction() { + nextToken(); + return token === 68 || token === 82; + } function isListElement(parsingContext, inErrorRecovery) { var node = currentNode(parsingContext); if (node) { @@ -4415,7 +4596,7 @@ var ts; return isIdentifier(); } function isNotHeritageClauseTypeName() { - if (token === 103 || + if (token === 102 || token === 78) { return lookAhead(nextTokenIsIdentifier); } @@ -4439,11 +4620,11 @@ var ts; case 4: return token === 15 || token === 66 || token === 72; case 8: - return token === 14 || token === 78 || token === 103; + return token === 14 || token === 78 || token === 102; case 9: return isVariableDeclaratorListTerminator(); case 16: - return token === 25 || token === 16 || token === 14 || token === 78 || token === 103; + return token === 25 || token === 16 || token === 14 || token === 78 || token === 102; case 12: return token === 17 || token === 22; case 14: @@ -4779,7 +4960,7 @@ var ts; literal = parseLiteralNode(); } else { - literal = createMissingNode(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); + literal = parseExpectedToken(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); } span.literal = literal; return finishNode(span); @@ -4788,6 +4969,9 @@ var ts; var node = createNode(token); var text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; + if (scanner.hasExtendedUnicodeEscape()) { + node.hasExtendedUnicodeEscape = true; + } if (scanner.isUnterminated()) { node.isUnterminated = true; } @@ -4795,7 +4979,7 @@ var ts; nextToken(); finishNode(node); if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= 8192; + node.flags |= 16384; } return node; } @@ -5073,11 +5257,11 @@ var ts; } function parseNonArrayType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReference(); case 98: @@ -5096,11 +5280,11 @@ var ts; } function isStartOfType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 96: case 14: @@ -5221,7 +5405,7 @@ var ts; case 39: case 24: case 64: - case 111: + case 110: return true; default: if (isBinaryOperator()) { @@ -5268,7 +5452,7 @@ var ts; return parseConditionalExpressionRest(expr); } function isYieldExpression() { - if (token === 111) { + if (token === 110) { if (inYieldContext()) { return true; } @@ -5393,13 +5577,15 @@ var ts; return parseAssignmentExpressionOrHigher(); } function parseConditionalExpressionRest(leftOperand) { - if (!parseOptional(50)) { + var questionToken = parseOptionalToken(50); + if (!questionToken) { return leftOperand; } var node = createNode(168, leftOperand.pos); node.condition = leftOperand; + node.questionToken = questionToken; node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(51); + node.colonToken = parseExpectedToken(51, false, ts.Diagnostics._0_expected, ts.tokenToString(51)); node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } @@ -5548,7 +5734,7 @@ var ts; } var node = createNode(153, expression.pos); node.expression = expression; - parseExpected(20, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.dotToken = parseExpectedToken(20, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); node.name = parseRightSideOfDot(true); return finishNode(node); } @@ -5562,10 +5748,11 @@ var ts; } function parseMemberExpressionRest(expression) { while (true) { - var dotOrBracketStart = scanner.getTokenPos(); - if (parseOptional(20)) { + var dotToken = parseOptionalToken(20); + if (dotToken) { var propertyAccess = createNode(153, expression.pos); propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; propertyAccess.name = parseRightSideOfDot(true); expression = finishNode(propertyAccess); continue; @@ -5717,16 +5904,16 @@ var ts; var node = createNode(151); parseExpected(18); if (scanner.hasPrecedingLineBreak()) - node.flags |= 256; + node.flags |= 512; node.elements = parseDelimitedList(14, parseArgumentOrArrayLiteralElement); parseExpected(19); return finishNode(node); } function tryParseAccessorDeclaration(fullStart, modifiers) { - if (parseContextualModifier(116)) { + if (parseContextualModifier(115)) { return parseAccessorDeclaration(134, fullStart, modifiers); } - else if (parseContextualModifier(120)) { + else if (parseContextualModifier(119)) { return parseAccessorDeclaration(135, fullStart, modifiers); } return undefined; @@ -5765,7 +5952,7 @@ var ts; var node = createNode(152); parseExpected(14); if (scanner.hasPrecedingLineBreak()) { - node.flags |= 256; + node.flags |= 512; } node.properties = parseDelimitedList(13, parseObjectLiteralElement, true); parseExpected(15); @@ -5852,7 +6039,7 @@ var ts; parseExpected(16); var initializer = undefined; if (token !== 22) { - if (token === 97 || token === 105 || token === 69) { + if (token === 97 || token === 104 || token === 69) { initializer = parseVariableDeclarationList(true); } else { @@ -5968,9 +6155,9 @@ var ts; function parseCatchClause() { var result = createNode(216); parseExpected(67); - parseExpected(16); - result.name = parseIdentifier(); - result.type = parseTypeAnnotation(); + if (parseExpected(16)) { + result.variableDeclaration = parseVariableDeclaration(); + } parseExpected(17); result.block = parseBlock(false, false); return finishNode(result); @@ -6009,7 +6196,7 @@ var ts; return !inErrorRecovery; case 14: case 97: - case 105: + case 104: case 82: case 83: case 74: @@ -6029,18 +6216,18 @@ var ts; case 69: var isConstEnum = lookAhead(nextTokenIsEnumKeyword); return !isConstEnum; - case 104: + case 103: case 68: - case 117: + case 116: case 76: - case 123: + case 122: if (isDeclarationStart()) { return false; } - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: if (lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine)) { return false; } @@ -6093,7 +6280,7 @@ var ts; return parseTryStatement(); case 71: return parseDebuggerStatement(); - case 105: + case 104: if (isLetDeclaration()) { return parseVariableStatement(scanner.getStartPos(), undefined); } @@ -6117,7 +6304,7 @@ var ts; return undefined; } return parseVariableStatement(start, modifiers); - case 105: + case 104: if (!isLetDeclaration()) { return undefined; } @@ -6200,11 +6387,11 @@ var ts; switch (token) { case 97: break; - case 105: - node.flags |= 2048; + case 104: + node.flags |= 4096; break; case 69: - node.flags |= 4096; + node.flags |= 8192; break; default: ts.Debug.fail(); @@ -6236,7 +6423,7 @@ var ts; setModifiers(node, modifiers); parseExpected(82); node.asteriskToken = parseOptionalToken(35); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); fillSignature(51, !!node.asteriskToken, false, node); node.body = parseFunctionBlockOrSemicolon(!!node.asteriskToken, ts.Diagnostics.or_expected); return finishNode(node); @@ -6244,7 +6431,7 @@ var ts; function parseConstructorDeclaration(pos, modifiers) { var node = createNode(133, pos); setModifiers(node, modifiers); - parseExpected(114); + parseExpected(113); fillSignature(51, false, false, node); node.body = parseFunctionBlockOrSemicolon(false, ts.Diagnostics.or_expected); return finishNode(node); @@ -6305,7 +6492,7 @@ var ts; return true; } if (idToken !== undefined) { - if (!ts.isKeyword(idToken) || idToken === 120 || idToken === 116) { + if (!ts.isKeyword(idToken) || idToken === 119 || idToken === 115) { return true; } switch (token) { @@ -6350,7 +6537,7 @@ var ts; if (accessor) { return accessor; } - if (token === 114) { + if (token === 113) { return parseConstructorDeclaration(fullStart, modifiers); } if (isIndexSignature()) { @@ -6369,7 +6556,7 @@ var ts; var node = createNode(196, fullStart); setModifiers(node, modifiers); parseExpected(68); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(true); if (parseExpected(14)) { @@ -6391,7 +6578,7 @@ var ts; return parseList(19, false, parseHeritageClause); } function parseHeritageClause() { - if (token === 78 || token === 103) { + if (token === 78 || token === 102) { var node = createNode(215); node.token = token; nextToken(); @@ -6401,7 +6588,7 @@ var ts; return undefined; } function isHeritageClause() { - return token === 78 || token === 103; + return token === 78 || token === 102; } function parseClassMembers() { return parseList(6, false, parseClassElement); @@ -6409,7 +6596,7 @@ var ts; function parseInterfaceDeclaration(fullStart, modifiers) { var node = createNode(197, fullStart); setModifiers(node, modifiers); - parseExpected(104); + parseExpected(103); node.name = parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(false); @@ -6419,7 +6606,7 @@ var ts; function parseTypeAliasDeclaration(fullStart, modifiers) { var node = createNode(198, fullStart); setModifiers(node, modifiers); - parseExpected(123); + parseExpected(122); node.name = parseIdentifier(); parseExpected(52); node.type = parseType(); @@ -6473,11 +6660,11 @@ var ts; return finishNode(node); } function parseModuleDeclaration(fullStart, modifiers) { - parseExpected(117); + parseExpected(116); return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); } function isExternalModuleReference() { - return token === 118 && + return token === 117 && lookAhead(nextTokenIsOpenParen); } function nextTokenIsOpenParen() { @@ -6486,7 +6673,7 @@ var ts; function nextTokenIsCommaOrFromKeyword() { nextToken(); return token === 23 || - token === 102; + token === 123; } function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) { parseExpected(84); @@ -6494,7 +6681,7 @@ var ts; var identifier; if (isIdentifier()) { identifier = parseIdentifier(); - if (token !== 23 && token !== 102) { + if (token !== 23 && token !== 123) { var importEqualsDeclaration = createNode(202, fullStart); setModifiers(importEqualsDeclaration, modifiers); importEqualsDeclaration.name = identifier; @@ -6510,7 +6697,7 @@ var ts; token === 35 || token === 14) { importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(102); + parseExpected(123); } importDeclaration.moduleSpecifier = parseModuleSpecifier(); parseSemicolon(); @@ -6532,7 +6719,7 @@ var ts; } function parseExternalModuleReference() { var node = createNode(212); - parseExpected(118); + parseExpected(117); parseExpected(16); node.expression = parseModuleSpecifier(); parseExpected(17); @@ -6590,22 +6777,28 @@ var ts; var node = createNode(209, fullStart); setModifiers(node, modifiers); if (parseOptional(35)) { - parseExpected(102); + parseExpected(123); node.moduleSpecifier = parseModuleSpecifier(); } else { node.exportClause = parseNamedImportsOrExports(210); - if (parseOptional(102)) { + if (parseOptional(123)) { node.moduleSpecifier = parseModuleSpecifier(); } } parseSemicolon(); return finishNode(node); } - function parseExportAssignmentTail(fullStart, modifiers) { + function parseExportAssignment(fullStart, modifiers) { var node = createNode(208, fullStart); setModifiers(node, modifiers); - node.exportName = parseIdentifier(); + if (parseOptional(52)) { + node.isExportEquals = true; + } + else { + parseExpected(72); + } + node.expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); return finishNode(node); } @@ -6618,24 +6811,24 @@ var ts; case 69: case 82: return true; - case 105: + case 104: return isLetDeclaration(); case 68: - case 104: + case 103: case 76: - case 123: + case 122: return lookAhead(nextTokenIsIdentifierOrKeyword); case 84: return lookAhead(nextTokenCanFollowImportKeyword); - case 117: + case 116: return lookAhead(nextTokenIsIdentifierOrKeywordOrStringLiteral); case 77: return lookAhead(nextTokenCanFollowExportKeyword); - case 115: - case 109: - case 107: + case 114: case 108: - case 110: + case 106: + case 107: + case 109: return lookAhead(nextTokenIsDeclarationStart); } } @@ -6658,7 +6851,7 @@ var ts; function nextTokenCanFollowExportKeyword() { nextToken(); return token === 52 || token === 35 || - token === 14 || isDeclarationStart(); + token === 14 || token === 72 || isDeclarationStart(); } function nextTokenIsDeclarationStart() { nextToken(); @@ -6672,8 +6865,8 @@ var ts; var modifiers = parseModifiers(); if (token === 77) { nextToken(); - if (parseOptional(52)) { - return parseExportAssignmentTail(fullStart, modifiers); + if (token === 72 || token === 52) { + return parseExportAssignment(fullStart, modifiers); } if (token === 35 || token === 14) { return parseExportDeclaration(fullStart, modifiers); @@ -6681,20 +6874,20 @@ var ts; } switch (token) { case 97: - case 105: + case 104: case 69: return parseVariableStatement(fullStart, modifiers); case 82: return parseFunctionDeclaration(fullStart, modifiers); case 68: return parseClassDeclaration(fullStart, modifiers); - case 104: + case 103: return parseInterfaceDeclaration(fullStart, modifiers); - case 123: + case 122: return parseTypeAliasDeclaration(fullStart, modifiers); case 76: return parseEnumDeclaration(fullStart, modifiers); - case 117: + case 116: return parseModuleDeclaration(fullStart, modifiers); case 84: return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers); @@ -6860,7 +7053,8 @@ var ts; var Symbol = ts.objectAllocator.getSymbolConstructor(); if (!file.locals) { file.locals = {}; - container = blockScopeContainer = file; + container = file; + setBlockScopeContainer(file, false); bind(file); file.symbolCount = symbolCount; } @@ -6868,6 +7062,12 @@ var ts; symbolCount++; return new Symbol(flags, name); } + function setBlockScopeContainer(node, cleanLocals) { + blockScopeContainer = node; + if (cleanLocals) { + blockScopeContainer.locals = undefined; + } + } function addDeclarationToSymbol(symbol, node, symbolKind) { symbol.flags |= symbolKind; if (!symbol.declarations) @@ -6904,6 +7104,13 @@ var ts; return "__new"; case 138: return "__index"; + case 209: + return "__export"; + case 208: + return "default"; + case 195: + case 196: + return node.flags & 256 ? "default" : undefined; } } function getDisplayName(node) { @@ -6911,7 +7118,7 @@ var ts; } function declareSymbol(symbols, parent, node, includes, excludes) { ts.Debug.assert(!ts.hasDynamicName(node)); - var name = getDeclarationName(node); + var name = node.flags & 256 && parent ? "default" : getDeclarationName(node); if (name !== undefined) { var symbol = ts.hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { @@ -6920,9 +7127,9 @@ var ts; } var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name, message, getDisplayName(declaration))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name, message, getDisplayName(node))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); symbol = createSymbol(0, name); } } @@ -6992,7 +7199,7 @@ var ts; lastContainer = container; } if (isBlockScopeContainer) { - blockScopeContainer = node; + setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220); } ts.forEachChild(node, bind); container = saveContainer; @@ -7060,12 +7267,6 @@ var ts; } } } - function bindExportDeclaration(node) { - if (!node.exportClause) { - (container.exportStars || (container.exportStars = [])).push(node); - } - bindChildren(node, 0, false); - } function bindFunctionOrConstructorType(node) { var symbol = createSymbol(131072, getDeclarationName(node)); addDeclarationToSymbol(symbol, node, 131072); @@ -7081,14 +7282,7 @@ var ts; bindChildren(node, symbolKind, isBlockScopeContainer); } function bindCatchVariableDeclaration(node) { - var symbol = createSymbol(1, node.name.text || "__missing"); - addDeclarationToSymbol(symbol, node, 1); - var saveParent = parent; - var savedBlockScopeContainer = blockScopeContainer; - parent = blockScopeContainer = node; - ts.forEachChild(node, bind); - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; + bindChildren(node, 0, true); } function bindBlockScopedVariableDeclaration(node) { switch (blockScopeContainer.kind) { @@ -7125,7 +7319,7 @@ var ts; if (ts.isBindingPattern(node.name)) { bindChildren(node, 0, false); } - else if (ts.getCombinedNodeFlags(node) & 6144) { + else if (ts.isBlockOrCatchScoped(node)) { bindBlockScopedVariableDeclaration(node); } else { @@ -7207,9 +7401,6 @@ var ts; case 211: bindDeclaration(node, 8388608, 8388608, false); break; - case 209: - bindExportDeclaration(node); - break; case 204: if (node.name) { bindDeclaration(node, 8388608, 8388608, false); @@ -7218,13 +7409,28 @@ var ts; bindChildren(node, 0, false); } break; + case 209: + if (!node.exportClause) { + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); + } + bindChildren(node, 0, false); + break; + case 208: + if (node.expression.kind === 64) { + declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608); + } + else { + declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455); + } + bindChildren(node, 0, false); + break; case 220: if (ts.isExternalModule(node)) { bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true); break; } case 174: - bindChildren(node, 0, !ts.isAnyFunction(node.parent)); + bindChildren(node, 0, !ts.isFunctionLike(node.parent)); break; case 216: case 181: @@ -7312,8 +7518,9 @@ var ts; isValidPropertyAccess: isValidPropertyAccess, getSignatureFromDeclaration: getSignatureFromDeclaration, isImplementationOfOverload: isImplementationOfOverload, - getAliasedSymbol: resolveImport, - getEmitResolver: getEmitResolver + getAliasedSymbol: resolveAlias, + getEmitResolver: getEmitResolver, + getExportsOfExternalModule: getExportsOfExternalModule }; var undefinedSymbol = createSymbol(4 | 67108864, "undefined"); var argumentsSymbol = createSymbol(4 | 67108864, "arguments"); @@ -7347,6 +7554,7 @@ var ts; var globalRegExpType; var globalTemplateStringsArrayType; var globalESSymbolType; + var globalIterableType; var anyArrayType; var tupleTypes = {}; var unionTypes = {}; @@ -7500,13 +7708,6 @@ var ts; } } } - function extendSymbolTable(target, source) { - for (var id in source) { - if (!ts.hasProperty(target, id)) { - target[id] = source[id]; - } - } - } function getSymbolLinks(symbol) { if (symbol.flags & 67108864) return symbol; @@ -7533,7 +7734,7 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target === unknownSymbol || target.flags & meaning) { return symbol; } @@ -7569,7 +7770,7 @@ var ts; break; case 200: if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) { - if (!(result.flags & 8388608 && getDeclarationOfImportSymbol(result).kind === 211)) { + if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) { break loop; } result = undefined; @@ -7633,13 +7834,6 @@ var ts; break loop; } break; - case 216: - var id = location.name; - if (name === id.text) { - result = location.symbol; - break loop; - } - break; } lastLocation = location; location = location.parent; @@ -7660,7 +7854,7 @@ var ts; return undefined; } if (result.flags & 2) { - var declaration = ts.forEach(result.declarations, function (d) { return ts.getCombinedNodeFlags(d) & 6144 ? d : undefined; }); + var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; }); ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); if (!isDefinedBefore(declaration, errorLocation)) { error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name)); @@ -7669,15 +7863,16 @@ var ts; } return result; } - function isImportSymbolDeclaration(node) { + function isAliasSymbolDeclaration(node) { return node.kind === 202 || node.kind === 204 && !!node.name || node.kind === 205 || node.kind === 207 || - node.kind === 211; + node.kind === 211 || + node.kind === 208; } - function getDeclarationOfImportSymbol(symbol) { - return ts.forEach(symbol.declarations, function (d) { return isImportSymbolDeclaration(d) ? d : undefined; }); + function getDeclarationOfAliasSymbol(symbol) { + return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; }); } function getTargetOfImportEqualsDeclaration(node) { if (node.moduleReference.kind === 212) { @@ -7710,7 +7905,7 @@ var ts; error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name)); return; } - return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveImport(symbol); + return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveAlias(symbol); } } } @@ -7718,7 +7913,10 @@ var ts; return getExternalModuleMember(node.parent.parent.parent, node); } function getTargetOfExportSpecifier(node) { - return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node, node.propertyName || node.name, 107455 | 793056 | 1536); + return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); + } + function getTargetOfExportAssignment(node) { + return resolveEntityName(node.expression, 107455 | 793056 | 1536); } function getTargetOfImportDeclaration(node) { switch (node.kind) { @@ -7732,14 +7930,16 @@ var ts; return getTargetOfImportSpecifier(node); case 211: return getTargetOfExportSpecifier(node); + case 208: + return getTargetOfExportAssignment(node); } } - function resolveImport(symbol) { - ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Imports here."); + function resolveAlias(symbol) { + ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Alias here."); var links = getSymbolLinks(symbol); if (!links.target) { links.target = resolvingSymbol; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); var target = getTargetOfImportDeclaration(node); if (links.target === resolvingSymbol) { links.target = target || unknownSymbol; @@ -7753,6 +7953,29 @@ var ts; } return links.target; } + function markExportAsReferenced(node) { + var symbol = getSymbolOfNode(node); + var target = resolveAlias(symbol); + if (target && target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target)) { + markAliasSymbolAsReferenced(symbol); + } + } + function markAliasSymbolAsReferenced(symbol) { + var links = getSymbolLinks(symbol); + if (!links.referenced) { + links.referenced = true; + var node = getDeclarationOfAliasSymbol(symbol); + if (node.kind === 208) { + checkExpressionCached(node.expression); + } + else if (node.kind === 211) { + checkExpressionCached(node.propertyName || node.name); + } + else if (ts.isInternalModuleImportEqualsDeclaration(node)) { + checkExpressionCached(node.moduleReference); + } + } + } function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) { if (!importDeclaration) { importDeclaration = ts.getAncestor(entityName, 202); @@ -7762,38 +7985,40 @@ var ts; entityName = entityName.parent; } if (entityName.kind === 64 || entityName.parent.kind === 125) { - return resolveEntityName(importDeclaration, entityName, 1536); + return resolveEntityName(entityName, 1536); } else { ts.Debug.assert(entityName.parent.kind === 202); - return resolveEntityName(importDeclaration, entityName, 107455 | 793056 | 1536); + return resolveEntityName(entityName, 107455 | 793056 | 1536); } } function getFullyQualifiedName(symbol) { return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol); } - function resolveEntityName(location, name, meaning) { + function resolveEntityName(name, meaning) { if (ts.getFullWidth(name) === 0) { return undefined; } if (name.kind === 64) { - var symbol = resolveName(location, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); + var symbol = resolveName(name, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); if (!symbol) { - return; + return undefined; } } else if (name.kind === 125) { - var namespace = resolveEntityName(location, name.left, 1536); - if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) - return; - var symbol = getSymbol(getExportsOfSymbol(namespace), name.right.text, meaning); + var namespace = resolveEntityName(name.left, 1536); + if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) { + return undefined; + } + var right = name.right; + var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning); if (!symbol) { - error(location, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(name.right)); - return; + error(right, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right)); + return undefined; } } ts.Debug.assert((symbol.flags & 16777216) === 0, "Should never get an instantiated symbol here."); - return symbol.flags & meaning ? symbol : resolveImport(symbol); + return symbol.flags & meaning ? symbol : resolveAlias(symbol); } function isExternalModuleNameRelative(moduleName) { return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; @@ -7833,6 +8058,9 @@ var ts; } error(moduleReferenceLiteral, ts.Diagnostics.Cannot_find_external_module_0, moduleName); } + function getExportAssignmentSymbol(moduleSymbol) { + return moduleSymbol.exports["default"]; + } function getResolvedExportAssignmentSymbol(moduleSymbol) { var symbol = getExportAssignmentSymbol(moduleSymbol); if (symbol) { @@ -7840,82 +8068,52 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - return resolveImport(symbol); + return resolveAlias(symbol); } } } - function getExportAssignmentSymbol(symbol) { - checkTypeOfExportAssignmentSymbol(symbol); - return getSymbolLinks(symbol).exportAssignmentSymbol; - } - function checkTypeOfExportAssignmentSymbol(containerSymbol) { - var symbolLinks = getSymbolLinks(containerSymbol); - if (!symbolLinks.exportAssignmentChecked) { - var exportInformation = collectExportInformationForSourceFileOrModule(containerSymbol); - if (exportInformation.exportAssignments.length) { - if (exportInformation.exportAssignments.length > 1) { - ts.forEach(exportInformation.exportAssignments, function (node) { return error(node, ts.Diagnostics.A_module_cannot_have_more_than_one_export_assignment); }); - } - var node = exportInformation.exportAssignments[0]; - if (exportInformation.hasExportedMember) { - error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); - } - if (node.exportName.text) { - var meaning = 107455 | 793056 | 1536; - var exportSymbol = resolveName(node, node.exportName.text, meaning, ts.Diagnostics.Cannot_find_name_0, node.exportName); - } - symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; - } - symbolLinks.exportAssignmentChecked = true; - } - } - function collectExportInformationForSourceFileOrModule(symbol) { - var seenExportedMember = false; - var result = []; - ts.forEach(symbol.declarations, function (declaration) { - var block = (declaration.kind === 220 ? declaration : declaration.body); - ts.forEach(block.statements, function (node) { - if (node.kind === 208) { - result.push(node); - } - else { - seenExportedMember = seenExportedMember || (node.flags & 1) !== 0; - } - }); - }); - return { - hasExportedMember: seenExportedMember, - exportAssignments: result - }; - } function getExportsOfSymbol(symbol) { return symbol.flags & 1536 ? getExportsOfModule(symbol) : symbol.exports; } - function getExportsOfModule(symbol) { - var links = getSymbolLinks(symbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(symbol)); + function getExportsOfModule(moduleSymbol) { + var links = getSymbolLinks(moduleSymbol); + return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); } - function getExportsForModule(symbol) { + function extendExportSymbols(target, source) { + for (var id in source) { + if (id !== "default" && !ts.hasProperty(target, id)) { + target[id] = source[id]; + } + } + } + function getExportsForModule(moduleSymbol) { + if (compilerOptions.target < 2) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + return { + "default": defaultSymbol + }; + } + } var result; var visitedSymbols = []; - visit(symbol); - return result; + visit(moduleSymbol); + return result || moduleSymbol.exports; function visit(symbol) { if (!ts.contains(visitedSymbols, symbol)) { visitedSymbols.push(symbol); - if (!result) { - result = symbol.exports; - } - else { - extendSymbolTable(result, symbol.exports); - } - ts.forEach(symbol.declarations, function (node) { - if (node.kind === 220 || node.kind === 200) { - ts.forEach(node.exportStars, function (exportStar) { - visit(resolveExternalModuleName(exportStar, exportStar.moduleSpecifier)); - }); + if (symbol !== moduleSymbol) { + if (!result) { + result = cloneSymbolTable(moduleSymbol.exports); } - }); + extendExportSymbols(result, symbol.exports); + } + var exportStars = symbol.exports["__export"]; + if (exportStars) { + ts.forEach(exportStars.declarations, function (node) { + visit(resolveExternalModuleName(node, node.moduleSpecifier)); + }); + } } } } @@ -7940,7 +8138,7 @@ var ts; return true; } if (symbol.flags & 8388608) { - return (resolveImport(symbol).flags & 107455) !== 0; + return (resolveAlias(symbol).flags & 107455) !== 0; } return false; } @@ -8057,8 +8255,8 @@ var ts; if (symbolFromSymbolTable.flags & 8388608) { if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) { - var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); - if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); + if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) { return [symbolFromSymbolTable]; } var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined; @@ -8083,7 +8281,7 @@ var ts; if (symbolFromSymbolTable === symbol) { return true; } - symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -8374,7 +8572,7 @@ var ts; buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, 793056, 0, flags); } else { - writeKeyword(writer, 112); + writeKeyword(writer, 111); } } else { @@ -8465,7 +8663,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 0, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 121); + writeKeyword(writer, 120); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -8478,7 +8676,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 1, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 119); + writeKeyword(writer, 118); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -8643,7 +8841,7 @@ var ts; return true; } if (symbolOfNode.flags & 8388608) { - return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); } } function isSymbolUsedInExportAssignment(symbol) { @@ -8651,7 +8849,7 @@ var ts; return true; } if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & 8388608)) { - resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); if (resolvedExportSymbol === symbol) { return true; } @@ -8785,6 +8983,9 @@ var ts; if (declaration.parent.parent.kind === 182) { return anyType; } + if (declaration.parent.parent.kind === 183) { + return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent); + } if (ts.isBindingPattern(declaration.parent)) { return getTypeForBindingElement(declaration); } @@ -8873,9 +9074,12 @@ var ts; return links.type = getTypeOfPrototypeProperty(symbol); } var declaration = symbol.valueDeclaration; - if (declaration.kind === 216) { + if (declaration.parent.kind === 216) { return links.type = anyType; } + if (declaration.kind === 208) { + return links.type = checkExpression(declaration.expression); + } links.type = resolvingType; var type = getWidenedTypeForVariableLikeDeclaration(declaration, true); if (links.type === resolvingType) { @@ -8965,10 +9169,10 @@ var ts; } return links.type; } - function getTypeOfImport(symbol) { + function getTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.type) { - links.type = getTypeOfSymbol(resolveImport(symbol)); + links.type = getTypeOfSymbol(resolveAlias(symbol)); } return links.type; } @@ -8996,7 +9200,7 @@ var ts; return getTypeOfAccessors(symbol); } if (symbol.flags & 8388608) { - return getTypeOfImport(symbol); + return getTypeOfAlias(symbol); } return unknownType; } @@ -9150,10 +9354,10 @@ var ts; } return links.declaredType; } - function getDeclaredTypeOfImport(symbol) { + function getDeclaredTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.declaredType) { - links.declaredType = getDeclaredTypeOfSymbol(resolveImport(symbol)); + links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)); } return links.declaredType; } @@ -9175,7 +9379,7 @@ var ts; return getDeclaredTypeOfTypeParameter(symbol); } if (symbol.flags & 8388608) { - return getDeclaredTypeOfImport(symbol); + return getDeclaredTypeOfAlias(symbol); } return unknownType; } @@ -9546,6 +9750,16 @@ var ts; }); return result; } + function getExportsOfExternalModule(node) { + if (!node.moduleSpecifier) { + return emptyArray; + } + var module = resolveExternalModuleName(node, node.moduleSpecifier); + if (!module || !module.exports) { + return emptyArray; + } + return ts.mapToArray(getExportsOfModule(module)); + } function getSignatureFromDeclaration(declaration) { var links = getNodeLinks(declaration); if (!links.resolvedSignature) { @@ -9691,7 +9905,7 @@ var ts; return symbol.members["__index"]; } function getIndexDeclarationOfSymbol(symbol, kind) { - var syntaxKind = kind === 1 ? 119 : 121; + var syntaxKind = kind === 1 ? 118 : 120; var indexSymbol = getIndexSymbol(symbol); if (indexSymbol) { var len = indexSymbol.declarations.length; @@ -9794,7 +10008,7 @@ var ts; function getTypeFromTypeReferenceNode(node) { var links = getNodeLinks(node); if (!links.resolvedType) { - var symbol = resolveEntityName(node, node.typeName, 793056); + var symbol = resolveEntityName(node.typeName, 793056); if (symbol) { var type; if ((symbol.flags & 262144) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { @@ -9867,8 +10081,9 @@ var ts; function getGlobalSymbol(name, meaning, diagnostic) { return resolveName(undefined, name, meaning, diagnostic, name); } - function getGlobalType(name) { - return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), 0); + function getGlobalType(name, arity) { + if (arity === void 0) { arity = 0; } + return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity); } function getGlobalESSymbolConstructorSymbol() { return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol")); @@ -10012,15 +10227,15 @@ var ts; } function getTypeFromTypeNode(node) { switch (node.kind) { - case 112: + case 111: return anyType; - case 121: + case 120: return stringType; - case 119: + case 118: return numberType; - case 113: + case 112: return booleanType; - case 122: + case 121: return esSymbolType; case 98: return voidType; @@ -10201,7 +10416,7 @@ var ts; isContextSensitive(node.whenFalse); case 167: return node.operatorToken.kind === 49 && - (isContextSensitive(node.left) || isContextSensitive(node.right)); + (isContextSensitive(node.left) || isContextSensitive(node.right)); case 217: return isContextSensitive(node.initializer); case 132: @@ -11481,46 +11696,56 @@ var ts; return type; } } - function markLinkedImportsAsReferenced(node) { - if (node) { - var nodeLinks = getNodeLinks(node); - while (nodeLinks.importOnRightSide) { - var rightSide = nodeLinks.importOnRightSide; - nodeLinks.importOnRightSide = undefined; - getSymbolLinks(rightSide).referenced = true; - ts.Debug.assert((rightSide.flags & 8388608) !== 0); - nodeLinks = getNodeLinks(ts.getDeclarationOfKind(rightSide, 202)); - } - } - } function checkIdentifier(node) { var symbol = getResolvedSymbol(node); if (symbol === argumentsSymbol && ts.getContainingFunction(node).kind === 161) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & 8388608) { - var symbolLinks = getSymbolLinks(symbol); - if (!symbolLinks.referenced) { - var importOrExportAssignment = getLeftSideOfImportEqualsOrExportAssignment(node); - if (!importOrExportAssignment || - (importOrExportAssignment.flags & 1) || - (importOrExportAssignment.kind === 208)) { - symbolLinks.referenced = !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol)); - } - else { - var nodeLinks = getNodeLinks(importOrExportAssignment); - ts.Debug.assert(!nodeLinks.importOnRightSide); - nodeLinks.importOnRightSide = symbol; - } - } - if (symbolLinks.referenced) { - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) { + markAliasSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); + checkBlockScopedBindingCapturedInLoop(node, symbol); return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); } + function isInsideFunction(node, threshold) { + var current = node; + while (current && current !== threshold) { + if (ts.isFunctionLike(current)) { + return true; + } + current = current.parent; + } + return false; + } + function checkBlockScopedBindingCapturedInLoop(node, symbol) { + if (languageVersion >= 2 || + (symbol.flags & 2) === 0 || + symbol.valueDeclaration.parent.kind === 216) { + return; + } + var container = symbol.valueDeclaration; + while (container.kind !== 194) { + container = container.parent; + } + container = container.parent; + if (container.kind === 175) { + container = container.parent; + } + var inFunction = isInsideFunction(node.parent, container); + var current = container; + while (current && !ts.nodeStartsNewLexicalEnvironment(current)) { + if (isIterationStatement(current, false)) { + if (inFunction) { + grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node)); + } + getNodeLinks(symbol.valueDeclaration).flags |= 256; + break; + } + current = current.parent; + } + } function captureLexicalThis(node, container) { var classNode = container.parent && container.parent.kind === 196 ? container.parent : undefined; getNodeLinks(node).flags |= 2; @@ -11803,7 +12028,7 @@ var ts; var type = getContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); - return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1); + return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1) || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); } return undefined; } @@ -12680,9 +12905,6 @@ var ts; return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { - if (languageVersion < 2) { - grammarErrorOnFirstToken(node.template, ts.Diagnostics.Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher); - } return getReturnTypeOfSignature(getResolvedSignature(node)); } function checkTypeAssertion(node) { @@ -12841,7 +13063,7 @@ var ts; } return true; } - function checkReferenceExpression(n, invalidReferenceMessage, constantVarianleMessage) { + function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) { function findSymbol(n) { var symbol = getNodeLinks(n).resolvedSymbol; return symbol && getExportSymbolOfValueSymbolIfExported(symbol); @@ -12867,14 +13089,14 @@ var ts; case 64: case 153: var symbol = findSymbol(n); - return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 4096) !== 0; + return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 8192) !== 0; case 154: var index = n.argumentExpression; var symbol = findSymbol(n.expression); if (symbol && index && index.kind === 8) { var name = index.text; var prop = getPropertyOfType(getTypeOfSymbol(symbol), name); - return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 4096) !== 0; + return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 8192) !== 0; } return false; case 159: @@ -12888,7 +13110,7 @@ var ts; return false; } if (isConstVariableReference(n)) { - error(n, constantVarianleMessage); + error(n, constantVariableMessage); return false; } return true; @@ -13439,7 +13661,7 @@ var ts; var declaration = indexSymbol.declarations[i]; if (declaration.parameters.length === 1 && declaration.parameters[0].type) { switch (declaration.parameters[0].type.kind) { - case 121: + case 120: if (!seenStringIndexer) { seenStringIndexer = true; } @@ -13447,7 +13669,7 @@ var ts; error(declaration, ts.Diagnostics.Duplicate_string_index_signature); } break; - case 119: + case 118: if (!seenNumericIndexer) { seenNumericIndexer = true; } @@ -13842,7 +14064,7 @@ var ts; return 2097152 | 1048576; case 202: var result = 0; - var target = resolveImport(getSymbolOfNode(d)); + var target = resolveAlias(getSymbolOfNode(d)); ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); }); return result; default: @@ -13853,9 +14075,9 @@ var ts; function checkFunctionDeclaration(node) { if (produceDiagnostics) { checkFunctionLikeDeclaration(node) || - checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || - checkGrammarFunctionName(node.name) || - checkGrammarForGenerator(node); + checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || + checkGrammarFunctionName(node.name) || + checkGrammarForGenerator(node); checkCollisionWithCapturedSuperVariable(node, node.name); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); @@ -13863,7 +14085,7 @@ var ts; } function checkFunctionLikeDeclaration(node) { checkSignatureDeclaration(node); - if (node.name.kind === 126) { + if (node.name && node.name.kind === 126) { checkComputedPropertyName(node.name); } if (!ts.hasDynamicName(node)) { @@ -13979,24 +14201,24 @@ var ts; } } function checkVarDeclaredNamesNotShadowed(node) { - if (node.initializer && (ts.getCombinedNodeFlags(node) & 6144) === 0) { + if (node.initializer && (ts.getCombinedNodeFlags(node) & 12288) === 0) { var symbol = getSymbolOfNode(node); if (symbol.flags & 1) { var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined); if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) { - if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 6144) { + if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) { var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194); var container = varDeclList.parent.kind === 175 && varDeclList.parent.parent; var namesShareScope = container && - (container.kind === 174 && ts.isAnyFunction(container.parent) || - (container.kind === 201 && container.kind === 200) || + (container.kind === 174 && ts.isFunctionLike(container.parent) || + (container.kind === 201 && container.kind === 200) || container.kind === 220); if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); - error(ts.getErrorSpanForNode(node), ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); + error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); } } } @@ -14152,33 +14374,125 @@ var ts; checkSourceElement(node.statement); } function checkForOfStatement(node) { - checkGrammarForOfStatement(node); + if (languageVersion < 2) { + grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); + return; + } + checkGrammarForInOrForOfStatement(node); + if (node.initializer.kind === 194) { + checkForInOrForOfVariableDeclaration(node); + } + else { + var varExpr = node.initializer; + var rightType = checkExpression(node.expression); + var iteratedType = checkIteratedType(rightType, node.expression); + if (varExpr.kind === 151 || varExpr.kind === 152) { + checkDestructuringAssignment(varExpr, iteratedType || unknownType); + } + else { + var leftType = checkExpression(varExpr); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant); + if (iteratedType) { + checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined); + } + } + } + checkSourceElement(node.statement); } function checkForInStatement(node) { checkGrammarForInOrForOfStatement(node); if (node.initializer.kind === 194) { - var variableDeclarationList = node.initializer; - if (variableDeclarationList.declarations.length >= 1) { - var decl = variableDeclarationList.declarations[0]; - checkVariableDeclaration(decl); + var variable = node.initializer.declarations[0]; + if (variable && ts.isBindingPattern(variable.name)) { + error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); } + checkForInOrForOfVariableDeclaration(node); } else { var varExpr = node.initializer; - var exprType = checkExpression(varExpr); - if (!allConstituentTypesHaveKind(exprType, 1 | 258)) { + var leftType = checkExpression(varExpr); + if (varExpr.kind === 151 || varExpr.kind === 152) { + error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); + } + else if (!allConstituentTypesHaveKind(leftType, 1 | 258)) { error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any); } else { - checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant); } } - var exprType = checkExpression(node.expression); - if (!allConstituentTypesHaveKind(exprType, 1 | 48128 | 512)) { + var rightType = checkExpression(node.expression); + if (!allConstituentTypesHaveKind(rightType, 1 | 48128 | 512)) { error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter); } checkSourceElement(node.statement); } + function checkForInOrForOfVariableDeclaration(iterationStatement) { + var variableDeclarationList = iterationStatement.initializer; + if (variableDeclarationList.declarations.length >= 1) { + var decl = variableDeclarationList.declarations[0]; + checkVariableDeclaration(decl); + } + } + function getTypeForVariableDeclarationInForOfStatement(forOfStatement) { + if (languageVersion < 2) { + return anyType; + } + var expressionType = getTypeOfExpression(forOfStatement.expression); + return checkIteratedType(expressionType, forOfStatement.expression) || anyType; + } + function checkIteratedType(iterable, expressionForError) { + ts.Debug.assert(languageVersion >= 2); + var iteratedType = getIteratedType(iterable, expressionForError); + if (expressionForError && iteratedType) { + var completeIterableType = globalIterableType !== emptyObjectType ? createTypeReference(globalIterableType, [iteratedType]) : emptyObjectType; + checkTypeAssignableTo(iterable, completeIterableType, expressionForError); + } + return iteratedType; + function getIteratedType(iterable, expressionForError) { + if (allConstituentTypesHaveKind(iterable, 1)) { + return undefined; + } + var iteratorFunction = getTypeOfPropertyOfType(iterable, ts.getPropertyNameForKnownSymbolName("iterator")); + if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, 1)) { + return undefined; + } + var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, 0) : emptyArray; + if (iteratorFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator); + } + return undefined; + } + var iterator = getUnionType(ts.map(iteratorFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iterator, 1)) { + return undefined; + } + var iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next"); + if (iteratorNextFunction && allConstituentTypesHaveKind(iteratorNextFunction, 1)) { + return undefined; + } + var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, 0) : emptyArray; + if (iteratorNextFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method); + } + return undefined; + } + var iteratorNextResult = getUnionType(ts.map(iteratorNextFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iteratorNextResult, 1)) { + return undefined; + } + var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value"); + if (!iteratorNextValue) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property); + } + return undefined; + } + return iteratorNextValue; + } + } function checkBreakOrContinueStatement(node) { checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node); } @@ -14254,7 +14568,7 @@ var ts; if (!checkGrammarStatementInAmbientContext(node)) { var current = node.parent; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { break; } if (current.kind === 189 && current.label.text === node.label.text) { @@ -14282,16 +14596,33 @@ var ts; checkBlock(node.tryBlock); var catchClause = node.catchClause; if (catchClause) { - if (catchClause.type) { - var sourceFile = ts.getSourceFileOfNode(node); - var colonStart = ts.skipTrivia(sourceFile.text, catchClause.name.end); - grammarErrorAtPos(sourceFile, colonStart, ":".length, ts.Diagnostics.Catch_clause_parameter_cannot_have_a_type_annotation); + if (catchClause.variableDeclaration) { + if (catchClause.variableDeclaration.name.kind !== 64) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier); + } + else if (catchClause.variableDeclaration.type) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation); + } + else if (catchClause.variableDeclaration.initializer) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer); + } + else { + var identifierName = catchClause.variableDeclaration.name.text; + var locals = catchClause.block.locals; + if (locals && ts.hasProperty(locals, identifierName)) { + var localSymbol = locals[identifierName]; + if (localSymbol && (localSymbol.flags & 2) !== 0) { + grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); + } + } + checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.variableDeclaration.name); + } } - checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.name); checkBlock(catchClause.block); } - if (node.finallyBlock) + if (node.finallyBlock) { checkBlock(node.finallyBlock); + } } function checkIndexConstraints(type) { var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1); @@ -14379,10 +14710,12 @@ var ts; } function checkClassDeclaration(node) { checkGrammarClassDeclarationHeritageClauses(node); - checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + if (node.name) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + } checkTypeParameters(node.typeParameters); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); var type = getDeclaredTypeOfSymbol(symbol); @@ -14395,10 +14728,10 @@ var ts; if (type.baseTypes.length) { if (produceDiagnostics) { var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); + checkTypeAssignableTo(type, baseType, node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, baseTypeNode.typeName, 107455)) { + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); + if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, 107455)) { error(baseTypeNode, ts.Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); } checkKindsOfPropertyMemberOverrides(type, baseType); @@ -14414,7 +14747,7 @@ var ts; if (t !== unknownType) { var declaredType = (t.flags & 4096) ? t.target : t; if (declaredType.flags & (1024 | 2048)) { - checkTypeAssignableTo(type, t, node.name, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); + checkTypeAssignableTo(type, t, node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); } else { error(typeRefNode, ts.Diagnostics.A_class_may_only_implement_another_class_or_interface); @@ -14762,15 +15095,6 @@ var ts; if (!ts.isInAmbientContext(node) && node.name.kind === 8) { grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names); } - else if (node.name.kind === 64 && node.body.kind === 201) { - var statements = node.body.statements; - for (var i = 0, n = statements.length; i < n; i++) { - var statement = statements[i]; - if (statement.kind === 208) { - grammarErrorOnNode(statement, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); - } - } - } } checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); @@ -14821,9 +15145,9 @@ var ts; } return true; } - function checkImportSymbol(node) { + function checkAliasSymbol(node) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | (symbol.flags & 793056 ? 793056 : 0) | @@ -14837,10 +15161,10 @@ var ts; function checkImportBinding(node) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); - checkImportSymbol(node); + checkAliasSymbol(node); } function checkImportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers); } if (checkExternalImportOrExportDeclaration(node)) { @@ -14862,50 +15186,107 @@ var ts; } function checkImportEqualsDeclaration(node) { checkGrammarModifiers(node); - if (ts.isInternalModuleImportEqualsDeclaration(node)) { + if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); - if (target !== unknownSymbol) { - if (target.flags & 107455) { - var moduleName = getFirstIdentifier(node.moduleReference); - if (resolveEntityName(node, moduleName, 107455 | 1536).flags & 1536) { - checkExpressionOrQualifiedName(node.moduleReference); - } - else { - error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); - } - } - if (target.flags & 793056) { - checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); - } + if (node.flags & 1) { + markExportAsReferenced(node); } - } - else { - if (checkExternalImportOrExportDeclaration(node)) { - checkImportBinding(node); + if (ts.isInternalModuleImportEqualsDeclaration(node)) { + var target = resolveAlias(getSymbolOfNode(node)); + if (target !== unknownSymbol) { + if (target.flags & 107455) { + var moduleName = getFirstIdentifier(node.moduleReference); + if (!(resolveEntityName(moduleName, 107455 | 1536).flags & 1536)) { + error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); + } + } + if (target.flags & 793056) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); + } + } } } } function checkExportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers); } if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { if (node.exportClause) { - ts.forEach(node.exportClause.elements, checkImportSymbol); + ts.forEach(node.exportClause.elements, checkExportSpecifier); } } } + function checkExportSpecifier(node) { + checkAliasSymbol(node); + if (!node.parent.parent.moduleSpecifier) { + markExportAsReferenced(node); + } + } function checkExportAssignment(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + var container = node.parent.kind === 220 ? node.parent : node.parent.parent; + if (container.kind === 200 && container.name.kind === 64) { + error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); + return; + } + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; - if (container.kind !== 220) { - container = container.parent; + if (node.expression.kind === 64) { + markExportAsReferenced(node); + } + else { + checkExpressionCached(node.expression); + } + checkExternalModuleExports(container); + } + function getModuleStatements(node) { + if (node.kind === 220) { + return node.statements; + } + if (node.kind === 200 && node.body.kind === 201) { + return node.body.statements; + } + return emptyArray; + } + function hasExportedMembers(moduleSymbol) { + var declarations = moduleSymbol.declarations; + for (var i = 0; i < declarations.length; i++) { + var statements = getModuleStatements(declarations[i]); + for (var j = 0; j < statements.length; j++) { + var node = statements[j]; + if (node.kind === 209) { + var exportClause = node.exportClause; + if (!exportClause) { + return true; + } + var specifiers = exportClause.elements; + for (var k = 0; k < specifiers.length; k++) { + var specifier = specifiers[k]; + if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) { + return true; + } + } + } + else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) { + return true; + } + } + } + } + function checkExternalModuleExports(node) { + var moduleSymbol = getSymbolOfNode(node); + var links = getSymbolLinks(moduleSymbol); + if (!links.exportsChecked) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + if (hasExportedMembers(moduleSymbol)) { + var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; + error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); + } + } + links.exportsChecked = true; } - checkTypeOfExportAssignmentSymbol(getSymbolOfNode(container)); } function checkSourceElement(node) { if (!node) @@ -15087,6 +15468,7 @@ var ts; case 196: case 199: case 219: + case 208: case 220: ts.forEachChild(node, checkFunctionExpressionBodies); break; @@ -15106,11 +15488,7 @@ var ts; ts.forEach(node.statements, checkSourceElement); checkFunctionExpressionBodies(node); if (ts.isExternalModule(node)) { - var symbol = getExportAssignmentSymbol(node.symbol); - if (symbol && symbol.flags & 8388608) { - getSymbolLinks(symbol).referenced = true; - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + checkExternalModuleExports(node); } if (potentialThisCollisions.length) { ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope); @@ -15199,11 +15577,6 @@ var ts; copySymbol(location.symbol, meaning); } break; - case 216: - if (location.name.text) { - copySymbol(location.symbol, meaning); - } - break; } memberFlags = location.flags; location = location.parent; @@ -15237,11 +15610,11 @@ var ts; return true; } switch (node.kind) { + case 111: + case 118: + case 120: case 112: - case 119: case 121: - case 113: - case 122: return true; case 98: return node.parent.kind !== 164; @@ -15300,7 +15673,7 @@ var ts; return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent; } if (nodeOnRightSide.parent.kind === 208) { - return nodeOnRightSide.parent.exportName === nodeOnRightSide && nodeOnRightSide.parent; + return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent; } return undefined; } @@ -15312,11 +15685,11 @@ var ts; (node.parent.kind === 153 && node.parent.name === node); } function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) { - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(entityName)) { + if (ts.isDeclarationName(entityName)) { return getSymbolOfNode(entityName.parent); } if (entityName.parent.kind === 208) { - return resolveEntityName(entityName.parent.parent, entityName, 107455 | 793056 | 1536 | 8388608); + return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608); } if (entityName.kind !== 153) { if (isInRightSideOfImportOrExportAssignment(entityName)) { @@ -15332,7 +15705,7 @@ var ts; } if (entityName.kind === 64) { var meaning = 107455 | 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } else if (entityName.kind === 153) { var symbol = getNodeLinks(entityName).resolvedSymbol; @@ -15352,7 +15725,7 @@ var ts; else if (isTypeReferenceIdentifier(entityName)) { var meaning = entityName.parent.kind === 139 ? 793056 : 1536; meaning |= 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } return undefined; } @@ -15360,7 +15733,7 @@ var ts; if (isInsideWithStatementBody(node)) { return undefined; } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { return getSymbolOfNode(node.parent); } if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) { @@ -15375,18 +15748,19 @@ var ts; case 90: var type = checkExpression(node); return type.symbol; - case 114: + case 113: var constructorDeclaration = node.parent; if (constructorDeclaration && constructorDeclaration.kind === 133) { return constructorDeclaration.parent.symbol; } return undefined; case 8: - if (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && - ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) { - var importSymbol = getSymbolOfNode(node.parent.parent); - var moduleType = getTypeOfSymbol(importSymbol); - return moduleType ? moduleType.symbol : undefined; + var moduleName; + if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && + ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || + ((node.parent.kind === 203 || node.parent.kind === 209) && + node.parent.moduleSpecifier === node)) { + return resolveExternalModuleName(node, node); } case 7: if (node.parent.kind == 154 && node.parent.argumentExpression === node) { @@ -15404,7 +15778,7 @@ var ts; } function getShorthandAssignmentValueSymbol(location) { if (location && location.kind === 218) { - return resolveEntityName(location, location.name, 107455); + return resolveEntityName(location.name, 107455); } return undefined; } @@ -15430,7 +15804,7 @@ var ts; var symbol = getSymbolOfNode(node); return getTypeOfSymbol(symbol); } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { var symbol = getSymbolInfo(node); return symbol && getTypeOfSymbol(symbol); } @@ -15507,6 +15881,10 @@ var ts; return generatedNames; function generateNames(node) { switch (node.kind) { + case 195: + case 196: + generateNameForFunctionOrClassDeclaration(node); + break; case 200: generateNameForModuleOrEnum(node); generateNames(node.body); @@ -15520,6 +15898,9 @@ var ts; case 209: generateNameForExportDeclaration(node); break; + case 208: + generateNameForExportAssignment(node); + break; case 220: case 201: ts.forEach(node.statements, generateNames); @@ -15530,27 +15911,17 @@ var ts; return ts.hasProperty(globals, name) || ts.hasProperty(sourceFile.identifiers, name) || ts.hasProperty(generatedNames, name); } function makeUniqueName(baseName) { - if (baseName.charCodeAt(0) !== 95) { - var baseName = "_" + baseName; - if (!isExistingName(baseName)) { - return generatedNames[baseName] = baseName; - } - } - if (baseName.charCodeAt(baseName.length - 1) !== 95) { - baseName += "_"; - } - var i = 1; - while (true) { - name = baseName + i; - if (!isExistingName(name)) { - return generatedNames[name] = name; - } - i++; - } + var name = ts.generateUniqueName(baseName, isExistingName); + return generatedNames[name] = name; } function assignGeneratedName(node, name) { getNodeLinks(node).generatedName = ts.unescapeIdentifier(name); } + function generateNameForFunctionOrClassDeclaration(node) { + if (!node.name) { + assignGeneratedName(node, makeUniqueName("default")); + } + } function generateNameForModuleOrEnum(node) { if (node.name.kind === 64) { var name = node.name.text; @@ -15572,6 +15943,11 @@ var ts; generateNameForImportOrExportDeclaration(node); } } + function generateNameForExportAssignment(node) { + if (node.expression.kind !== 64) { + assignGeneratedName(node, makeUniqueName("default")); + } + } } function getGeneratedNameForNode(node) { var links = getNodeLinks(node); @@ -15586,8 +15962,8 @@ var ts; function getLocalNameForImportDeclaration(node) { return getGeneratedNameForNode(node); } - function getImportNameSubstitution(symbol) { - var declaration = getDeclarationOfImportSymbol(symbol); + function getAliasNameSubstitution(symbol) { + var declaration = getDeclarationOfAliasSymbol(symbol); if (declaration && declaration.kind === 207) { var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent); var propertyName = declaration.propertyName || declaration.name; @@ -15618,38 +15994,35 @@ var ts; return getExportNameSubstitution(exportSymbol, node.parent); } if (symbol.flags & 8388608) { - return getImportNameSubstitution(symbol); + return getAliasNameSubstitution(symbol); } } } - function getExportAssignmentName(node) { - var symbol = getExportAssignmentSymbol(getSymbolOfNode(node)); - return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol) ? symbolToString(symbol) : undefined; + function hasExportDefaultValue(node) { + var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node)); + return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol); } function isTopLevelValueImportEqualsWithEntityName(node) { if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) { return false; } - return isImportResolvedToValue(getSymbolOfNode(node)); + return isAliasResolvedToValue(getSymbolOfNode(node)); } - function isImportResolvedToValue(symbol) { - var target = resolveImport(symbol); + function isAliasResolvedToValue(symbol) { + var target = resolveAlias(symbol); return target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target); } function isConstEnumOrConstEnumOnlyModule(s) { return isConstEnumSymbol(s) || s.constEnumOnlyModule; } - function isReferencedImportDeclaration(node) { - if (isImportSymbolDeclaration(node)) { + function isReferencedAliasDeclaration(node) { + if (isAliasSymbolDeclaration(node)) { var symbol = getSymbolOfNode(node); if (getSymbolLinks(symbol).referenced) { return true; } - if (node.kind === 202 && node.flags & 1 && isImportResolvedToValue(symbol)) { - return true; - } } - return ts.forEachChild(node, isReferencedImportDeclaration); + return ts.forEachChild(node, isReferencedAliasDeclaration); } function isImplementationOfOverload(node) { if (ts.nodeIsPresent(node.body)) { @@ -15694,12 +16067,36 @@ var ts; return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name); } + function getBlockScopedVariableId(n) { + ts.Debug.assert(!ts.nodeIsSynthesized(n)); + if (n.parent.kind === 153 && + n.parent.name === n) { + return undefined; + } + if (n.parent.kind === 150 && + n.parent.propertyName === n) { + return undefined; + } + var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || + n.parent.kind === 150 ? getSymbolOfNode(n.parent) : undefined; + var symbol = declarationSymbol || + getNodeLinks(n).resolvedSymbol || + resolveName(n, n.text, 2 | 8388608, undefined, undefined); + var isLetOrConst = symbol && + (symbol.flags & 2) && + symbol.valueDeclaration.parent.kind !== 216; + if (isLetOrConst) { + getSymbolLinks(symbol); + return symbol.id; + } + return undefined; + } function createResolver() { return { getGeneratedNameForNode: getGeneratedNameForNode, getExpressionNameSubstitution: getExpressionNameSubstitution, - getExportAssignmentName: getExportAssignmentName, - isReferencedImportDeclaration: isReferencedImportDeclaration, + hasExportDefaultValue: hasExportDefaultValue, + isReferencedAliasDeclaration: isReferencedAliasDeclaration, getNodeCheckFlags: getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible: isDeclarationVisible, @@ -15709,7 +16106,8 @@ var ts; isSymbolAccessible: isSymbolAccessible, isEntityNameVisible: isEntityNameVisible, getConstantValue: getConstantValue, - isUnknownIdentifier: isUnknownIdentifier + isUnknownIdentifier: isUnknownIdentifier, + getBlockScopedVariableId: getBlockScopedVariableId }; } function initializeTypeChecker() { @@ -15737,6 +16135,7 @@ var ts; globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray"); globalESSymbolType = getGlobalType("Symbol"); globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"); + globalIterableType = getGlobalType("Iterable", 1); } else { globalTemplateStringsArrayType = unknownType; @@ -15779,14 +16178,14 @@ var ts; for (var i = 0, n = node.modifiers.length; i < n; i++) { var modifier = node.modifiers[i]; switch (modifier.kind) { - case 109: case 108: case 107: + case 106: var text; - if (modifier.kind === 109) { + if (modifier.kind === 108) { text = "public"; } - else if (modifier.kind === 108) { + else if (modifier.kind === 107) { text = "protected"; lastProtected = modifier; } @@ -15805,7 +16204,7 @@ var ts; } flags |= ts.modifierToFlag(modifier.kind); break; - case 110: + case 109: if (flags & 128) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static"); } @@ -15833,7 +16232,7 @@ var ts; } flags |= 1; break; - case 115: + case 114: if (flags & 2) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare"); } @@ -15939,7 +16338,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter); } - if (parameter.flags & 243) { + if (parameter.flags & 499) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier); } if (parameter.questionToken) { @@ -15951,7 +16350,7 @@ var ts; if (!parameter.type) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation); } - if (parameter.type.kind !== 121 && parameter.type.kind !== 119) { + if (parameter.type.kind !== 120 && parameter.type.kind !== 118) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number); } if (!node.type) { @@ -15959,7 +16358,7 @@ var ts; } } function checkGrammarForIndexSignatureModifier(node) { - if (node.flags & 243) { + if (node.flags & 499) { grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members); } } @@ -16024,7 +16423,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); if (seenImplementsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen); } @@ -16047,7 +16446,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause); } checkGrammarHeritageClause(heritageClause); @@ -16160,13 +16559,6 @@ var ts; } return false; } - function checkGrammarForOfStatement(forOfStatement) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_not_currently_supported); - if (languageVersion < 2) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); - } - return checkGrammarForInOrForOfStatement(forOfStatement); - } function checkGrammarAccessor(accessor) { var kind = accessor.kind; if (languageVersion < 1) { @@ -16196,7 +16588,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter); } - else if (parameter.flags & 243) { + else if (parameter.flags & 499) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } else if (parameter.questionToken) { @@ -16261,7 +16653,7 @@ var ts; function checkGrammarBreakOrContinueStatement(node) { var current = node; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary); } switch (current.kind) { @@ -16309,16 +16701,17 @@ var ts; return checkGrammarEvalOrArgumentsInStrictMode(node, node.name); } function checkGrammarVariableDeclaration(node) { - if (ts.isInAmbientContext(node)) { - if (ts.isBindingPattern(node.name)) { - return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + if (node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) { + if (ts.isInAmbientContext(node)) { + if (ts.isBindingPattern(node.name)) { + return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + } + if (node.initializer) { + var equalsTokenLength = "=".length; + return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength, equalsTokenLength, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); + } } - if (node.initializer) { - return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); - } - } - else { - if (!node.initializer) { + else if (!node.initializer) { if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) { return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer); } @@ -16352,14 +16745,6 @@ var ts; if (!declarationList.declarations.length) { return grammarErrorAtPos(ts.getSourceFileOfNode(declarationList), declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty); } - if (languageVersion < 2) { - if (ts.isLet(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - else if (ts.isConst(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - } } function allowLetAndConstDeclarations(parent) { switch (parent.kind) { @@ -16399,7 +16784,7 @@ var ts; return false; } function checkGrammarEnumDeclaration(enumDecl) { - var enumIsConst = (enumDecl.flags & 4096) !== 0; + var enumIsConst = (enumDecl.flags & 8192) !== 0; var hasError = false; if (!enumIsConst) { var inConstantEnumMemberSection = true; @@ -16427,18 +16812,11 @@ var ts; function hasParseDiagnostics(sourceFile) { return sourceFile.parseDiagnostics.length > 0; } - function scanToken(scanner, pos) { - scanner.setTextPos(pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return start; - } function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - var start = scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, scanner.getTextPos() - start, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2)); return true; } } @@ -16451,16 +16829,17 @@ var ts; function grammarErrorOnNode(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var span = ts.getErrorSpanForNode(node); - var start = span.end > span.pos ? ts.skipTrivia(sourceFile.text, span.pos) : span.pos; - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, span.end - start, message, arg0, arg1, arg2)); + diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2)); return true; } } - function checkGrammarEvalOrArgumentsInStrictMode(contextNode, identifier) { - if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { - var name = ts.declarationNameToString(identifier); - return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, name); + function checkGrammarEvalOrArgumentsInStrictMode(contextNode, name) { + if (name && name.kind === 64) { + var identifier = name; + if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { + var nameText = ts.declarationNameToString(identifier); + return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, nameText); + } } } function checkGrammarConstructorTypeParameters(node) { @@ -16524,7 +16903,7 @@ var ts; return getNodeLinks(node).hasReportedStatementInAmbientContext = true; } var links = getNodeLinks(node); - if (!links.hasReportedStatementInAmbientContext && ts.isAnyFunction(node.parent)) { + if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) { return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts); } if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) { @@ -16538,7 +16917,7 @@ var ts; } } function checkGrammarNumbericLiteral(node) { - if (node.flags & 8192) { + if (node.flags & 16384) { if (node.parserContextFlags & 1) { return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode); } @@ -16550,9 +16929,8 @@ var ts; function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, scanner.getTextPos(), 0, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), 0, message, arg0, arg1, arg2)); return true; } } @@ -16824,7 +17202,7 @@ var ts; var addedGlobalFileReference = false; ts.forEach(root.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, root, fileReference); - if (referencedFile && ((referencedFile.flags & 1024) || + if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) { writeReferencePath(referencedFile); @@ -16983,11 +17361,11 @@ var ts; } function emitType(type) { switch (type.kind) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 8: return writeTextOfNode(currentSourceFile, type); @@ -17077,8 +17455,8 @@ var ts; emitLines(node.statements); } function emitExportAssignment(node) { - write("export = "); - writeTextOfNode(currentSourceFile, node.exportName); + write(node.isExportEquals ? "export = " : "export default "); + writeTextOfNode(currentSourceFile, node.expression); write(";"); writeLine(); } @@ -17697,7 +18075,7 @@ var ts; } } function writeReferencePath(referencedFile) { - var declFileName = referencedFile.flags & 1024 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var declFileName = referencedFile.flags & 2048 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false); referencePathsOutput += "/// " + newLine; } @@ -17749,12 +18127,16 @@ var ts; var increaseIndent = writer.increaseIndent; var decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var lastFrame; + var currentScopeNames; + var generatedBlockScopeNames; var extendsEmitted = false; var tempCount = 0; var tempVariables; var tempParameters; var externalImports; var exportSpecifiers; + var exportDefault; var writeEmittedFiles = writeJavaScriptFile; var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments; var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments; @@ -17786,6 +18168,53 @@ var ts; writeLine(); writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); return; + function enterNameScope() { + var names = currentScopeNames; + currentScopeNames = undefined; + if (names) { + lastFrame = { names: names, previous: lastFrame }; + return true; + } + return false; + } + function exitNameScope(popFrame) { + if (popFrame) { + currentScopeNames = lastFrame.names; + lastFrame = lastFrame.previous; + } + else { + currentScopeNames = undefined; + } + } + function generateUniqueNameForLocation(location, baseName) { + var name; + if (!isExistingName(location, baseName)) { + name = baseName; + } + else { + name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); }); + } + if (!currentScopeNames) { + currentScopeNames = {}; + } + return currentScopeNames[name] = name; + } + function isExistingName(location, name) { + if (!resolver.isUnknownIdentifier(location, name)) { + return true; + } + if (currentScopeNames && ts.hasProperty(currentScopeNames, name)) { + return true; + } + var frame = lastFrame; + while (frame) { + if (ts.hasProperty(frame.names, name)) { + return true; + } + frame = frame.previous; + } + return false; + } function initializeEmitterWithSourceMaps() { var sourceMapDir; var sourceMapSourceIndex = -1; @@ -18045,13 +18474,13 @@ var ts; function createTempVariable(location, forLoopVariable) { var name = forLoopVariable ? "_i" : undefined; while (true) { - if (name && resolver.isUnknownIdentifier(location, name)) { + if (name && !isExistingName(location, name)) { break; } name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25); tempCount++; } - var result = ts.createNode(64); + var result = ts.createSynthesizedNode(64); result.text = name; return result; } @@ -18095,7 +18524,7 @@ var ts; emit(node); } } - function emitParenthesized(node, parenthesized) { + function emitParenthesizedIf(node, parenthesized) { if (parenthesized) { write("("); } @@ -18182,30 +18611,100 @@ var ts; emit(nodes[i]); } } - function isBinaryOrOctalIntegerLiteral(text) { - if (text.length <= 0) { - return false; - } - if (text.charCodeAt(1) === 66 || text.charCodeAt(1) === 98 || - text.charCodeAt(1) === 79 || text.charCodeAt(1) === 111) { - return true; + function isBinaryOrOctalIntegerLiteral(node, text) { + if (node.kind === 7 && text.length > 1) { + switch (text.charCodeAt(1)) { + case 98: + case 66: + case 111: + case 79: + return true; + } } return false; } function emitLiteral(node) { - var text = languageVersion < 2 && ts.isTemplateLiteralKind(node.kind) ? getTemplateLiteralAsStringLiteral(node) : node.parent ? ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node) : node.text; + var text = getLiteralText(node); if (compilerOptions.sourceMap && (node.kind === 8 || ts.isTemplateLiteralKind(node.kind))) { writer.writeLiteral(text); } - else if (languageVersion < 2 && node.kind === 7 && isBinaryOrOctalIntegerLiteral(text)) { + else if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) { write(node.text); } else { write(text); } } - function getTemplateLiteralAsStringLiteral(node) { - return '"' + ts.escapeString(node.text) + '"'; + function getLiteralText(node) { + if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) { + return getQuotedEscapedLiteralText('"', node.text, '"'); + } + if (node.parent) { + return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + } + switch (node.kind) { + case 8: + return getQuotedEscapedLiteralText('"', node.text, '"'); + case 10: + return getQuotedEscapedLiteralText('`', node.text, '`'); + case 11: + return getQuotedEscapedLiteralText('`', node.text, '${'); + case 12: + return getQuotedEscapedLiteralText('}', node.text, '${'); + case 13: + return getQuotedEscapedLiteralText('}', node.text, '`'); + case 7: + return node.text; + } + ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for."); + } + function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) { + return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; + } + function emitDownlevelRawTemplateLiteral(node) { + var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var isLast = node.kind === 10 || node.kind === 13; + text = text.substring(1, text.length - (isLast ? 1 : 2)); + text = text.replace(/\r\n?/g, "\n"); + text = ts.escapeString(text); + write('"' + text + '"'); + } + function emitDownlevelTaggedTemplateArray(node, literalEmitter) { + write("["); + if (node.template.kind === 10) { + literalEmitter(node.template); + } + else { + literalEmitter(node.template.head); + ts.forEach(node.template.templateSpans, function (child) { + write(", "); + literalEmitter(child.literal); + }); + } + write("]"); + } + function emitDownlevelTaggedTemplate(node) { + var tempVariable = createAndRecordTempVariable(node); + write("("); + emit(tempVariable); + write(" = "); + emitDownlevelTaggedTemplateArray(node, emit); + write(", "); + emit(tempVariable); + write(".raw = "); + emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral); + write(", "); + emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag)); + write("("); + emit(tempVariable); + if (node.template.kind === 169) { + ts.forEach(node.template.templateSpans, function (templateSpan) { + write(", "); + var needsParens = templateSpan.expression.kind === 167 && templateSpan.expression.operatorToken.kind === 23; + emitParenthesizedIf(templateSpan.expression, needsParens); + }); + } + write("))"); } function emitTemplateExpression(node) { if (languageVersion >= 2) { @@ -18227,7 +18726,7 @@ var ts; if (i > 0 || headEmitted) { write(" + "); } - emitParenthesized(templateSpan.expression, needsParens); + emitParenthesizedIf(templateSpan.expression, needsParens); if (templateSpan.literal.text.length !== 0) { write(" + "); emitLiteral(templateSpan.literal); @@ -18325,8 +18824,6 @@ var ts; return false; case 189: return node.parent.label === node; - case 216: - return node.parent.name === node; } } function emitExpressionIdentifier(node) { @@ -18338,7 +18835,18 @@ var ts; writeTextOfNode(currentSourceFile, node); } } + function getBlockScopedVariableId(node) { + return !ts.nodeIsSynthesized(node) && resolver.getBlockScopedVariableId(node); + } function emitIdentifier(node) { + var variableId = getBlockScopedVariableId(node); + if (variableId !== undefined && generatedBlockScopeNames) { + var text = generatedBlockScopeNames[variableId]; + if (text) { + write(text); + return; + } + } if (!node.parent) { write(node.text); } @@ -18401,7 +18909,7 @@ var ts; write("..."); emit(node.expression); } - function needsParenthesisForPropertyAccess(node) { + function needsParenthesisForPropertyAccessOrInvocation(node) { switch (node.kind) { case 64: case 151: @@ -18427,7 +18935,7 @@ var ts; var e = elements[pos]; if (e.kind === 171) { e = e.expression; - emitParenthesized(e, group === 0 && needsParenthesisForPropertyAccess(e)); + emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e)); pos++; } else { @@ -18466,24 +18974,18 @@ var ts; write("]"); } else { - emitListWithSpread(elements, (node.flags & 256) !== 0, elements.hasTrailingComma); + emitListWithSpread(elements, (node.flags & 512) !== 0, elements.hasTrailingComma); } } - function createSynthesizedNode(kind) { - var node = ts.createNode(kind); - node.pos = -1; - node.end = -1; - return node; - } function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) { var parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex); return emit(parenthesizedObjectLiteral); } function createDownlevelObjectLiteralWithComputedProperties(originalObjectLiteral, firstComputedPropertyIndex) { var tempVar = createAndRecordTempVariable(originalObjectLiteral); - var initialObjectLiteral = createSynthesizedNode(152); + var initialObjectLiteral = ts.createSynthesizedNode(152); initialObjectLiteral.properties = originalObjectLiteral.properties.slice(0, firstComputedPropertyIndex); - initialObjectLiteral.flags |= 256; + initialObjectLiteral.flags |= 512; var propertyPatches = createBinaryExpression(tempVar, 52, initialObjectLiteral); ts.forEach(originalObjectLiteral.properties, function (property) { var patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property); @@ -18491,7 +18993,7 @@ var ts; propertyPatches = createBinaryExpression(propertyPatches, 23, patchedProperty); } }); - propertyPatches = createBinaryExpression(propertyPatches, 23, tempVar); + propertyPatches = createBinaryExpression(propertyPatches, 23, createIdentifier(tempVar.text, true)); var result = createParenthesizedExpression(propertyPatches); return result; } @@ -18502,7 +19004,7 @@ var ts; function tryCreatePatchingPropertyAssignment(objectLiteral, tempVar, property) { var leftHandSide = createMemberAccessForPropertyName(tempVar, property.name); var maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property); - return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide); + return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide, true); } function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) { switch (property.kind) { @@ -18518,7 +19020,7 @@ var ts; if (firstAccessor !== property) { return undefined; } - var propertyDescriptor = createSynthesizedNode(152); + var propertyDescriptor = ts.createSynthesizedNode(152); var descriptorProperties = []; if (getAccessor) { var getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body)); @@ -18528,7 +19030,7 @@ var ts; var setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body)); descriptorProperties.push(setProperty); } - var trueExpr = createSynthesizedNode(94); + var trueExpr = ts.createSynthesizedNode(94); var enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr); descriptorProperties.push(enumerableTrue); var configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr); @@ -18541,7 +19043,7 @@ var ts; } } function createParenthesizedExpression(expression) { - var result = createSynthesizedNode(159); + var result = ts.createSynthesizedNode(159); result.expression = expression; return result; } @@ -18555,9 +19057,9 @@ var ts; result.end = -1; return result; } - function createBinaryExpression(left, operator, right) { - var result = createSynthesizedNode(167); - result.operatorToken = createSynthesizedNode(operator); + function createBinaryExpression(left, operator, right, startsOnNewLine) { + var result = ts.createSynthesizedNode(167, startsOnNewLine); + result.operatorToken = ts.createSynthesizedNode(operator); result.left = left; result.right = right; return result; @@ -18577,36 +19079,37 @@ var ts; } } function createPropertyAssignment(name, initializer) { - var result = createSynthesizedNode(217); + var result = ts.createSynthesizedNode(217); result.name = name; result.initializer = initializer; return result; } function createFunctionExpression(parameters, body) { - var result = createSynthesizedNode(160); + var result = ts.createSynthesizedNode(160); result.parameters = parameters; result.body = body; return result; } function createPropertyAccessExpression(expression, name) { - var result = createSynthesizedNode(153); + var result = ts.createSynthesizedNode(153); result.expression = expression; + result.dotToken = ts.createSynthesizedNode(20); result.name = name; return result; } function createElementAccessExpression(expression, argumentExpression) { - var result = createSynthesizedNode(154); + var result = ts.createSynthesizedNode(154); result.expression = expression; result.argumentExpression = argumentExpression; return result; } - function createIdentifier(name) { - var result = createSynthesizedNode(64); + function createIdentifier(name, startsOnNewLine) { + var result = ts.createSynthesizedNode(64, startsOnNewLine); result.text = name; return result; } function createCallExpression(invokedExpression, arguments) { - var result = createSynthesizedNode(155); + var result = ts.createSynthesizedNode(155); result.expression = invokedExpression; result.arguments = arguments; return result; @@ -18671,13 +19174,29 @@ var ts; } return false; } + function indentIfOnDifferentLines(parent, node1, node2) { + var isSynthesized = ts.nodeIsSynthesized(parent); + var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { + increaseIndent(); + writeLine(); + return true; + } + return false; + } function emitPropertyAccess(node) { if (tryEmitConstantValue(node)) { return; } emit(node.expression); + var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken); write("."); + indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name); emit(node.name); + if (indented) { + decreaseIndent(); + } } function emitQualifiedName(node) { emit(node.left); @@ -18791,26 +19310,33 @@ var ts; } } function emitTaggedTemplateExpression(node) { - emit(node.tag); - write(" "); - emit(node.template); + if (compilerOptions.target >= 2) { + emit(node.tag); + write(" "); + emit(node.template); + } + else { + emitDownlevelTaggedTemplate(node); + } } function emitParenExpression(node) { - if (node.expression.kind === 158) { - var operand = node.expression.expression; - while (operand.kind == 158) { - operand = operand.expression; - } - if (operand.kind !== 165 && - operand.kind !== 164 && - operand.kind !== 163 && - operand.kind !== 162 && - operand.kind !== 166 && - operand.kind !== 156 && - !(operand.kind === 155 && node.parent.kind === 156) && - !(operand.kind === 160 && node.parent.kind === 155)) { - emit(operand); - return; + if (!node.parent || node.parent.kind !== 161) { + if (node.expression.kind === 158) { + var operand = node.expression.expression; + while (operand.kind == 158) { + operand = operand.expression; + } + if (operand.kind !== 165 && + operand.kind !== 164 && + operand.kind !== 163 && + operand.kind !== 162 && + operand.kind !== 166 && + operand.kind !== 156 && + !(operand.kind === 155 && node.parent.kind === 156) && + !(operand.kind === 160 && node.parent.kind === 155)) { + emit(operand); + return; + } } } write("("); @@ -18856,48 +19382,58 @@ var ts; } else { emit(node.left); - if (node.operatorToken.kind !== 23) { + var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken); + if (!indented1 && node.operatorToken.kind !== 23) { write(" "); } write(ts.tokenToString(node.operatorToken.kind)); - var operatorEnd = ts.getLineAndCharacterOfPosition(currentSourceFile, node.operatorToken.end); - var rightStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.right.pos)); - var onDifferentLine = operatorEnd.line !== rightStart.line; - if (onDifferentLine) { - var exprStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); - var firstCharOfExpr = getFirstNonWhitespaceCharacterIndexOnLine(exprStart.line); - var shouldIndent = rightStart.character > firstCharOfExpr; - if (shouldIndent) { - increaseIndent(); - } - writeLine(); + if (!indented1) { + var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right); } - else { + if (!indented2) { write(" "); } emit(node.right); - if (shouldIndent) { + if (indented1 || indented2) { decreaseIndent(); } } } - function getFirstNonWhitespaceCharacterIndexOnLine(line) { - var lineStart = ts.getLineStarts(currentSourceFile)[line]; - var text = currentSourceFile.text; - for (var i = lineStart; i < text.length; i++) { - var ch = text.charCodeAt(i); - if (!ts.isWhiteSpace(text.charCodeAt(i)) || ts.isLineBreak(ch)) { - break; - } - } - return i - lineStart; + function synthesizedNodeStartsOnNewLine(node) { + return ts.nodeIsSynthesized(node) && node.startsOnNewLine; } function emitConditionalExpression(node) { emit(node.condition); - write(" ? "); + var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken); + if (!indent1) { + write(" "); + } + write("?"); + if (!indent1) { + var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue); + } + if (!indent2) { + write(" "); + } emit(node.whenTrue); - write(" : "); + if (indent1 || indent2) { + decreaseIndent(); + } + var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken); + if (!indent3) { + write(" "); + } + write(":"); + if (!indent3) { + var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse); + } + if (!indent4) { + write(" "); + } emit(node.whenFalse); + if (indent3 || indent4) { + decreaseIndent(); + } } function isSingleLineEmptyBlock(node) { if (node && node.kind === 174) { @@ -18941,7 +19477,7 @@ var ts; } } function emitExpressionStatement(node) { - emitParenthesized(node.expression, node.expression.kind === 161); + emitParenthesizedIf(node.expression, node.expression.kind === 161); write(";"); } function emitIfStatement(node) { @@ -18982,6 +19518,30 @@ var ts; write(")"); emitEmbeddedStatement(node.statement); } + function emitStartOfVariableDeclarationList(decl, startPos) { + var tokenKind = 97; + if (decl && languageVersion >= 2) { + if (ts.isLet(decl)) { + tokenKind = 104; + } + else if (ts.isConst(decl)) { + tokenKind = 69; + } + } + if (startPos !== undefined) { + emitToken(tokenKind, startPos); + } + else { + switch (tokenKind) { + case 97: + return write("var "); + case 104: + return write("let "); + case 69: + return write("const "); + } + } + } function emitForStatement(node) { var endPos = emitToken(81, node.pos); write(" "); @@ -18989,17 +19549,9 @@ var ts; if (node.initializer && node.initializer.kind === 194) { var variableDeclarationList = node.initializer; var declarations = variableDeclarationList.declarations; - if (declarations[0] && ts.isLet(declarations[0])) { - emitToken(105, endPos); - } - else if (declarations[0] && ts.isConst(declarations[0])) { - emitToken(69, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(declarations[0], endPos); write(" "); - emitCommaList(variableDeclarationList.declarations); + emitCommaList(declarations); } else if (node.initializer) { emit(node.initializer); @@ -19019,12 +19571,7 @@ var ts; var variableDeclarationList = node.initializer; if (variableDeclarationList.declarations.length >= 1) { var decl = variableDeclarationList.declarations[0]; - if (ts.isLet(decl)) { - emitToken(105, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(decl, endPos); write(" "); emit(decl); } @@ -19123,8 +19670,8 @@ var ts; var endPos = emitToken(67, node.pos); write(" "); emitToken(16, endPos); - emit(node.name); - emitToken(17, node.name.end); + emit(node.variableDeclaration); + emitToken(17, node.variableDeclaration ? node.variableDeclaration.end : endPos); write(" "); emitBlock(node.block); } @@ -19156,8 +19703,15 @@ var ts; emitNode(node.name); emitEnd(node.name); } + function createVoidZero() { + var zero = ts.createSynthesizedNode(7); + zero.text = "0"; + var result = ts.createSynthesizedNode(164); + result.expression = zero; + return result; + } function emitExportMemberAssignments(name) { - if (exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { + if (!exportDefault && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { ts.forEach(exportSpecifiers[name.text], function (specifier) { writeLine(); emitStart(specifier.name); @@ -19184,6 +19738,7 @@ var ts; if (emitCount++) { write(", "); } + renameNonTopLevelLetAndConst(name); if (name.parent && (name.parent.kind === 193 || name.parent.kind === 150)) { emitModuleMemberName(name.parent); } @@ -19204,27 +19759,25 @@ var ts; } return expr; } - function createVoidZero() { - var zero = ts.createNode(7); - zero.text = "0"; - var result = ts.createNode(164); - result.expression = zero; - return result; - } function createDefaultValueCheck(value, defaultValue) { value = ensureIdentifier(value); - var equals = ts.createNode(167); + var equals = ts.createSynthesizedNode(167); equals.left = value; - equals.operatorToken = ts.createNode(30); + equals.operatorToken = ts.createSynthesizedNode(30); equals.right = createVoidZero(); - var cond = ts.createNode(168); - cond.condition = equals; - cond.whenTrue = defaultValue; - cond.whenFalse = value; + return createConditionalExpression(equals, defaultValue, value); + } + function createConditionalExpression(condition, whenTrue, whenFalse) { + var cond = ts.createSynthesizedNode(168); + cond.condition = condition; + cond.questionToken = ts.createSynthesizedNode(50); + cond.whenTrue = whenTrue; + cond.colonToken = ts.createSynthesizedNode(51); + cond.whenFalse = whenFalse; return cond; } function createNumericLiteral(value) { - var node = ts.createNode(7); + var node = ts.createSynthesizedNode(7); node.text = "" + value; return node; } @@ -19232,7 +19785,7 @@ var ts; if (expr.kind === 64 || expr.kind === 153 || expr.kind === 154) { return expr; } - var node = ts.createNode(159); + var node = ts.createSynthesizedNode(159); node.expression = expr; return node; } @@ -19240,13 +19793,10 @@ var ts; if (propName.kind !== 64) { return createElementAccess(object, propName); } - var node = ts.createNode(153); - node.expression = parenthesizeForAccess(object); - node.name = propName; - return node; + return createPropertyAccessExpression(parenthesizeForAccess(object), propName); } function createElementAccess(object, index) { - var node = ts.createNode(154); + var node = ts.createSynthesizedNode(154); node.expression = parenthesizeForAccess(object); node.argumentExpression = index; return node; @@ -19368,8 +19918,19 @@ var ts; } } else { + var isLet = renameNonTopLevelLetAndConst(node.name); emitModuleMemberName(node); - emitOptional(" = ", node.initializer); + var initializer = node.initializer; + if (!initializer && languageVersion < 2) { + var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && + (getCombinedFlagsForIdentifier(node.name) & 4096); + if (isUninitializedLet && + node.parent.parent.kind !== 182 && + node.parent.parent.kind !== 183) { + initializer = createVoidZero(); + } + } + emitOptional(" = ", initializer); } } function emitExportVariableAssignments(node) { @@ -19381,17 +19942,62 @@ var ts; ts.forEach(name.elements, emitExportVariableAssignments); } } + function getEnclosingBlockScopeContainer(node) { + var current = node; + while (current) { + if (ts.isFunctionLike(current)) { + return current; + } + switch (current.kind) { + case 220: + case 91: + case 216: + case 200: + case 181: + case 182: + case 183: + return current; + case 174: + if (!ts.isFunctionLike(current.parent)) { + return current; + } + } + current = current.parent; + } + } + function getCombinedFlagsForIdentifier(node) { + if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return 0; + } + return ts.getCombinedNodeFlags(node.parent); + } + function renameNonTopLevelLetAndConst(node) { + if (languageVersion >= 2 || + ts.nodeIsSynthesized(node) || + node.kind !== 64 || + (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return; + } + var combinedFlags = getCombinedFlagsForIdentifier(node); + if (((combinedFlags & 12288) === 0) || combinedFlags & 1) { + return; + } + var list = ts.getAncestor(node, 194); + if (list.parent.kind === 175 && list.parent.parent.kind === 220) { + return; + } + var blockScopeContainer = getEnclosingBlockScopeContainer(node); + var parent = blockScopeContainer.kind === 220 ? blockScopeContainer : blockScopeContainer.parent; + var generatedName = generateUniqueNameForLocation(parent, node.text); + var variableId = resolver.getBlockScopedVariableId(node); + if (!generatedBlockScopeNames) { + generatedBlockScopeNames = []; + } + generatedBlockScopeNames[variableId] = generatedName; + } function emitVariableStatement(node) { if (!(node.flags & 1)) { - if (ts.isLet(node.declarationList)) { - write("let "); - } - else if (ts.isConst(node.declarationList)) { - write("const "); - } - else { - write("var "); - } + emitStartOfVariableDeclarationList(node.declarationList); } emitCommaList(node.declarationList.declarations); write(";"); @@ -19496,6 +20102,14 @@ var ts; function shouldEmitAsArrowFunction(node) { return node.kind === 161 && languageVersion >= 2; } + function emitDeclarationName(node) { + if (node.name) { + emitNode(node.name); + } + else { + write(resolver.getGeneratedNameForNode(node)); + } + } function emitFunctionDeclaration(node) { if (ts.nodeIsMissing(node.body)) { return emitPinnedOrTripleSlashComments(node); @@ -19507,10 +20121,10 @@ var ts; write("function "); } if (node.kind === 195 || (node.kind === 160 && node.name)) { - emit(node.name); + emitDeclarationName(node); } emitSignatureAndBody(node); - if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } if (node.kind !== 132 && node.kind !== 131) { @@ -19550,6 +20164,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); if (shouldEmitAsArrowFunction(node)) { emitSignatureParametersForArrow(node); write(" =>"); @@ -19566,15 +20181,16 @@ var ts; else { emitExpressionFunctionBody(node, node.body); } - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -19590,7 +20206,11 @@ var ts; return; } write(" "); - emit(body); + var current = body; + while (current.kind === 158) { + current = current.expression; + } + emitParenthesizedIf(body, current.kind === 152); } function emitDownLevelExpressionFunctionBody(node, body) { write(" {"); @@ -19629,45 +20249,15 @@ var ts; scopeEmitEnd(); } function emitBlockFunctionBody(node, body) { - if (body.statements.length === 0 && !anyParameterHasBindingPatternOrInitializer(node)) { - emitFunctionBodyWithNoStatements(node, body); - } - else { - emitFunctionBodyWithStatements(node, body); - } - } - function anyParameterHasBindingPatternOrInitializer(func) { - return ts.forEach(func.parameters, hasBindingPatternOrInitializer); - } - function hasBindingPatternOrInitializer(parameter) { - return parameter.initializer || ts.isBindingPattern(parameter.name); - } - function emitFunctionBodyWithNoStatements(node, body) { - var singleLine = isSingleLineEmptyBlock(node.body); - write(" {"); - if (singleLine) { - write(" "); - } - else { - increaseIndent(); - writeLine(); - } - emitLeadingCommentsOfPosition(body.statements.end); - if (!singleLine) { - decreaseIndent(); - } - emitToken(15, body.statements.end); - } - function emitFunctionBodyWithStatements(node, body) { write(" {"); scopeEmitStart(node); - var outPos = writer.getTextPos(); + var initialTextPos = writer.getTextPos(); increaseIndent(); emitDetachedComments(body.statements); var startIndex = emitDirectivePrologues(body.statements, true); emitFunctionBodyPreamble(node); decreaseIndent(); - var preambleEmitted = writer.getTextPos() !== outPos; + var preambleEmitted = writer.getTextPos() !== initialTextPos; if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { for (var i = 0, n = body.statements.length; i < n; i++) { write(" "); @@ -19740,7 +20330,7 @@ var ts; emitStart(member); emitStart(member.name); if (staticFlag) { - emitNode(node.name); + emitDeclarationName(node); } else { write("this"); @@ -19765,7 +20355,7 @@ var ts; emitLeadingComments(member); emitStart(member); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -19786,7 +20376,7 @@ var ts; emitStart(member); write("Object.defineProperty("); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -19831,7 +20421,7 @@ var ts; } function emitClassDeclaration(node) { write("var "); - emit(node.name); + emitDeclarationName(node); write(" = (function ("); var baseTypeNode = ts.getClassBaseTypeNode(node); if (baseTypeNode) { @@ -19844,7 +20434,7 @@ var ts; writeLine(); emitStart(baseTypeNode); write("__extends("); - emit(node.name); + emitDeclarationName(node); write(", _super);"); emitEnd(baseTypeNode); } @@ -19853,11 +20443,10 @@ var ts; emitMemberFunctions(node); emitMemberAssignments(node, 128); writeLine(); - function emitClassReturnStatement() { + emitToken(15, node.members.end, function () { write("return "); - emitNode(node.name); - } - emitToken(15, node.members.end, emitClassReturnStatement); + emitDeclarationName(node); + }); write(";"); decreaseIndent(); writeLine(); @@ -19870,16 +20459,16 @@ var ts; } write(");"); emitEnd(node); - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } - if (languageVersion < 2 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } function emitConstructorOfClass() { @@ -19889,6 +20478,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); ts.forEach(node.members, function (member) { if (member.kind === 133 && !member.body) { emitPinnedOrTripleSlashComments(member); @@ -19900,7 +20490,7 @@ var ts; } emitStart(ctor || node); write("function "); - emit(node.name); + emitDeclarationName(node); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); @@ -19948,6 +20538,7 @@ var ts; if (ctor) { emitTrailingComments(ctor); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20066,7 +20657,9 @@ var ts; var saveTempVariables = tempVariables; tempCount = 0; tempVariables = undefined; + var popFrame = enterNameScope(); emit(node.body); + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; } @@ -20155,7 +20748,7 @@ var ts; emitImportDeclaration(node); return; } - if (resolver.isReferencedImportDeclaration(node) || + if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); @@ -20251,17 +20844,29 @@ var ts; function createExternalModuleInfo(sourceFile) { externalImports = []; exportSpecifiers = {}; + exportDefault = undefined; ts.forEach(sourceFile.statements, function (node) { if (node.kind === 209 && !node.moduleSpecifier) { ts.forEach(node.exportClause.elements, function (specifier) { + if (specifier.name.text === "default") { + exportDefault = exportDefault || specifier; + } var name = (specifier.propertyName || specifier.name).text; (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier); }); } + else if (node.kind === 208) { + exportDefault = exportDefault || node; + } + else if (node.kind === 195 || node.kind === 196) { + if (node.flags & 1 && node.flags & 256) { + exportDefault = exportDefault || node; + } + } else { var info = createExternalImportInfo(node); if (info) { - if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedImportDeclaration(node)) { + if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) { externalImports.push(info); } } @@ -20342,18 +20947,7 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { - writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("return "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); - write(";"); - emitEnd(exportAssignment); - } + emitExportDefault(node, true); decreaseIndent(); writeLine(); write("});"); @@ -20362,17 +20956,24 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { + emitExportDefault(node, false); + } + function emitExportDefault(sourceFile, emitAsReturn) { + if (exportDefault && resolver.hasExportDefaultValue(sourceFile)) { writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("module.exports = "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emitStart(exportDefault); + write(emitAsReturn ? "return " : "module.exports = "); + if (exportDefault.kind === 208) { + emit(exportDefault.expression); + } + else if (exportDefault.kind === 211) { + emit(exportDefault.propertyName); + } + else { + emitDeclarationName(exportDefault); + } write(";"); - emitEnd(exportAssignment); + emitEnd(exportDefault); } } function emitDirectivePrologues(statements, startWithNewLine) { @@ -20423,6 +21024,7 @@ var ts; else { externalImports = undefined; exportSpecifiers = undefined; + exportDefault = undefined; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); @@ -20742,6 +21344,7 @@ var ts; var ts; (function (ts) { ts.emitTime = 0; + ts.ioReadTime = 0; function createCompilerHost(options) { var currentDirectory; var existingDirectories = {}; @@ -20751,7 +21354,9 @@ var ts; var unsupportedFileEncodingErrorCode = -2147024809; function getSourceFile(fileName, languageVersion, onError) { try { + var start = new Date().getTime(); var text = ts.sys.readFile(fileName, options.charset); + ts.ioReadTime += new Date().getTime() - start; } catch (e) { if (onError) { @@ -20888,8 +21493,9 @@ var ts; if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) { return { diagnostics: [], sourceMaps: undefined, emitSkipped: true }; } + var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile); var start = new Date().getTime(); - var emitResult = ts.emitFiles(getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile), getEmitHost(writeFileCallback), sourceFile); + var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile); ts.emitTime += new Date().getTime() - start; return emitResult; } @@ -21078,20 +21684,18 @@ var ts; } return; } - var firstExternalModule = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); - if (firstExternalModule && !options.module) { - var externalModuleErrorSpan = ts.getErrorSpanForNode(firstExternalModule.externalModuleIndicator); - var errorStart = ts.skipTrivia(firstExternalModule.text, externalModuleErrorSpan.pos); - var errorLength = externalModuleErrorSpan.end - errorStart; - diagnostics.add(ts.createFileDiagnostic(firstExternalModule, errorStart, errorLength, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); + var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); + if (firstExternalModuleSourceFile && !options.module) { + var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); } if (options.outDir || options.sourceRoot || (options.mapRoot && - (!options.out || firstExternalModule !== undefined))) { + (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents; ts.forEach(files, function (sourceFile) { - if (!(sourceFile.flags & 1024) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { + if (!(sourceFile.flags & 2048) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory()); sourcePathComponents.pop(); if (commonPathComponents) { @@ -21668,7 +22272,7 @@ var ts; compilerHost.getSourceFile = getSourceFile; } var compileResult = compile(rootFileNames, compilerOptions, compilerHost); - if (!commandLine.options.watch) { + if (!compilerOptions.watch) { return ts.sys.exit(compileResult.exitStatus); } setCachedProgram(compileResult.program); @@ -21682,7 +22286,7 @@ var ts; } } var sourceFile = hostGetSourceFile(fileName, languageVersion, onError); - if (sourceFile && commandLine.options.watch) { + if (sourceFile && compilerOptions.watch) { sourceFile.fileWatcher = ts.sys.watchFile(sourceFile.fileName, function () { return sourceFileChanged(sourceFile); }); } return sourceFile; @@ -21723,14 +22327,17 @@ var ts; } ts.executeCommandLine = executeCommandLine; function compile(fileNames, compilerOptions, compilerHost) { + ts.ioReadTime = 0; ts.parseTime = 0; ts.bindTime = 0; ts.checkTime = 0; ts.emitTime = 0; var start = new Date().getTime(); var program = ts.createProgram(fileNames, compilerOptions, compilerHost); + var programTime = new Date().getTime() - start; var exitStatus = compileProgram(); var end = new Date().getTime() - start; + var compileTime = end - programTime; if (compilerOptions.listFiles) { ts.forEach(program.getSourceFiles(), function (file) { ts.sys.write(file.fileName + ts.sys.newLine); @@ -21747,10 +22354,13 @@ var ts; if (memoryUsed >= 0) { reportStatisticalValue("Memory used", Math.round(memoryUsed / 1000) + "K"); } - reportTimeStatistic("Parse time", ts.parseTime); + reportTimeStatistic("Parse time", programTime); reportTimeStatistic("Bind time", ts.bindTime); reportTimeStatistic("Check time", ts.checkTime); reportTimeStatistic("Emit time", ts.emitTime); + reportTimeStatistic("Parse time w/o IO", ts.parseTime); + reportTimeStatistic("IO read", ts.ioReadTime); + reportTimeStatistic("Compile time", compileTime); reportTimeStatistic("Total time", end); } return { program: program, exitStatus: exitStatus }; diff --git a/bin/tsserver.js b/bin/tsserver.js index fa69f8cf5fa..3c4c266cb70 100644 --- a/bin/tsserver.js +++ b/bin/tsserver.js @@ -248,7 +248,9 @@ var ts; } ts.localizedDiagnosticMessages = undefined; function getLocaleSpecificMessage(message) { - return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message; + return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] + ? ts.localizedDiagnosticMessages[message] + : message; } ts.getLocaleSpecificMessage = getLocaleSpecificMessage; function createFileDiagnostic(file, start, length, message) { @@ -396,7 +398,9 @@ var ts; normalized.pop(); } else { - normalized.push(part); + if (part) { + normalized.push(part); + } } } } @@ -539,7 +543,7 @@ var ts; } ts.removeFileExtension = removeFileExtension; var backslashOrDoubleQuote = /[\"\\]/g; - var escapedCharsRegExp = /[\0-\19\t\v\f\b\0\r\n\u2028\u2029\u0085]/g; + var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; var escapedCharsMap = { "\0": "\\0", "\t": "\\t", @@ -554,20 +558,6 @@ var ts; "\u2029": "\\u2029", "\u0085": "\\u0085" }; - function escapeString(s) { - s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s; - s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; - return s; - function getReplacement(c) { - return escapedCharsMap[c] || unicodeEscape(c); - } - function unicodeEscape(c) { - var hexCharCode = c.charCodeAt(0).toString(16); - var paddedHexCode = ("0000" + hexCharCode).slice(-4); - return "\\u" + paddedHexCode; - } - } - ts.escapeString = escapeString; function getDefaultLibFileName(options) { return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; } @@ -880,7 +870,6 @@ var ts; Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." }, Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." }, Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." }, - Catch_clause_parameter_cannot_have_a_type_annotation: { code: 1013, category: 1, key: "Catch clause parameter cannot have a type annotation." }, A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." }, Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." }, A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." }, @@ -988,7 +977,6 @@ var ts; const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" }, const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." }, let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." }, - Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1159, category: 1, key: "Tagged templates are only available when targeting ECMAScript 6 and higher." }, Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." }, Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." }, An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." }, @@ -1025,6 +1013,11 @@ var ts; External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." }, An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." }, Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." }, + Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." }, + Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." }, + Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." }, + An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." }, + Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." }, Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." }, Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." }, Static_members_cannot_reference_class_type_parameters: { code: 2302, category: 1, key: "Static members cannot reference class type parameters." }, @@ -1198,6 +1191,14 @@ var ts; for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." }, The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." }, Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" }, + The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." }, + Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." }, + The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." }, + The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." }, + The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." }, + Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" }, Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, @@ -1267,6 +1268,7 @@ var ts; Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." }, + Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." }, The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." }, Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" }, @@ -1342,25 +1344,24 @@ var ts; You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." }, yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." }, Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." }, - The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }, - for_of_statements_are_not_currently_supported: { code: 9003, category: 1, key: "'for...of' statements are not currently supported." } + The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." } }; })(ts || (ts = {})); var ts; (function (ts) { var textToToken = { - "any": 112, + "any": 111, "as": 101, - "boolean": 113, + "boolean": 112, "break": 65, "case": 66, "catch": 67, "class": 68, "continue": 70, "const": 69, - "constructor": 114, + "constructor": 113, "debugger": 71, - "declare": 115, + "declare": 114, "default": 72, "delete": 73, "do": 74, @@ -1371,43 +1372,43 @@ var ts; "false": 79, "finally": 80, "for": 81, - "from": 102, + "from": 123, "function": 82, - "get": 116, + "get": 115, "if": 83, - "implements": 103, + "implements": 102, "import": 84, "in": 85, "instanceof": 86, - "interface": 104, - "let": 105, - "module": 117, + "interface": 103, + "let": 104, + "module": 116, "new": 87, "null": 88, - "number": 119, - "package": 106, - "private": 107, - "protected": 108, - "public": 109, - "require": 118, + "number": 118, + "package": 105, + "private": 106, + "protected": 107, + "public": 108, + "require": 117, "return": 89, - "set": 120, - "static": 110, - "string": 121, + "set": 119, + "static": 109, + "string": 120, "super": 90, "switch": 91, - "symbol": 122, + "symbol": 121, "this": 92, "throw": 93, "true": 94, "try": 95, - "type": 123, + "type": 122, "typeof": 96, "var": 97, "void": 98, "while": 99, "with": 100, - "yield": 111, + "yield": 110, "of": 124, "{": 14, "}": 15, @@ -1487,11 +1488,15 @@ var ts; return false; } function isUnicodeIdentifierStart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierStart) : + lookupInUnicodeMap(code, unicodeES3IdentifierStart); } ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart; function isUnicodeIdentifierPart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierPart) : + lookupInUnicodeMap(code, unicodeES3IdentifierPart); } function makeReverseMap(source) { var result = []; @@ -1780,6 +1785,7 @@ var ts; var token; var tokenValue; var precedingLineBreak; + var hasExtendedUnicodeEscape; var tokenIsUnterminated; function error(message, length) { if (onError) { @@ -1829,10 +1835,16 @@ var ts; } return +(text.substring(start, pos)); } - function scanHexDigits(count, mustMatchCount) { + function scanExactNumberOfHexDigits(count) { + return scanHexDigits(count, false); + } + function scanMinimumNumberOfHexDigits(count) { + return scanHexDigits(count, true); + } + function scanHexDigits(minCount, scanAsManyAsPossible) { var digits = 0; var value = 0; - while (digits < count || !mustMatchCount) { + while (digits < minCount || scanAsManyAsPossible) { var ch = text.charCodeAt(pos); if (ch >= 48 && ch <= 57) { value = value * 16 + ch - 48; @@ -1849,7 +1861,7 @@ var ts; pos++; digits++; } - if (digits < count) { + if (digits < minCount) { value = -1; } return value; @@ -1962,16 +1974,15 @@ var ts; return "\'"; case 34: return "\""; - case 120: case 117: - var ch = scanHexDigits(ch === 120 ? 2 : 4, true); - if (ch >= 0) { - return String.fromCharCode(ch); - } - else { - error(ts.Diagnostics.Hexadecimal_digit_expected); - return ""; + if (pos < len && text.charCodeAt(pos) === 123) { + hasExtendedUnicodeEscape = true; + pos++; + return scanExtendedUnicodeEscape(); } + return scanHexadecimalEscape(4); + case 120: + return scanHexadecimalEscape(2); case 13: if (pos < len && text.charCodeAt(pos) === 10) { pos++; @@ -1984,11 +1995,57 @@ var ts; return String.fromCharCode(ch); } } + function scanHexadecimalEscape(numDigits) { + var escapedValue = scanExactNumberOfHexDigits(numDigits); + if (escapedValue >= 0) { + return String.fromCharCode(escapedValue); + } + else { + error(ts.Diagnostics.Hexadecimal_digit_expected); + return ""; + } + } + function scanExtendedUnicodeEscape() { + var escapedValue = scanMinimumNumberOfHexDigits(1); + var isInvalidExtendedEscape = false; + if (escapedValue < 0) { + error(ts.Diagnostics.Hexadecimal_digit_expected); + isInvalidExtendedEscape = true; + } + else if (escapedValue > 0x10FFFF) { + error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive); + isInvalidExtendedEscape = true; + } + if (pos >= len) { + error(ts.Diagnostics.Unexpected_end_of_text); + isInvalidExtendedEscape = true; + } + else if (text.charCodeAt(pos) == 125) { + pos++; + } + else { + error(ts.Diagnostics.Unterminated_Unicode_escape_sequence); + isInvalidExtendedEscape = true; + } + if (isInvalidExtendedEscape) { + return ""; + } + return utf16EncodeAsString(escapedValue); + } + function utf16EncodeAsString(codePoint) { + ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF); + if (codePoint <= 65535) { + return String.fromCharCode(codePoint); + } + var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800; + var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00; + return String.fromCharCode(codeUnit1, codeUnit2); + } function peekUnicodeEscape() { if (pos + 5 < len && text.charCodeAt(pos + 1) === 117) { var start = pos; pos += 2; - var value = scanHexDigits(4, true); + var value = scanExactNumberOfHexDigits(4); pos = start; return value; } @@ -2050,6 +2107,7 @@ var ts; } function scan() { startPos = pos; + hasExtendedUnicodeEscape = false; precedingLineBreak = false; tokenIsUnterminated = false; while (true) { @@ -2201,7 +2259,7 @@ var ts; case 48: if (pos + 2 < len && (text.charCodeAt(pos + 1) === 88 || text.charCodeAt(pos + 1) === 120)) { pos += 2; - var value = scanHexDigits(1, false); + var value = scanMinimumNumberOfHexDigits(1); if (value < 0) { error(ts.Diagnostics.Hexadecimal_digit_expected); value = 0; @@ -2471,6 +2529,7 @@ var ts; getTokenPos: function () { return tokenPos; }, getTokenText: function () { return text.substring(tokenPos, pos); }, getTokenValue: function () { return tokenValue; }, + hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; }, hasPrecedingLineBreak: function () { return precedingLineBreak; }, isIdentifier: function () { return token === 64 || token > 100; }, isReservedWord: function () { return token >= 65 && token <= 100; }, @@ -2957,35 +3016,51 @@ var ts; return ts.getBaseFileName(moduleName).replace(/\W/g, "_"); } ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 12288) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + function isCatchClauseVariableDeclaration(declaration) { + return declaration && + declaration.kind === 193 && + declaration.parent && + declaration.parent.kind === 216; + } + ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; function declarationNameToString(name) { return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); } ts.declarationNameToString = declarationNameToString; function createDiagnosticForNode(node, message, arg0, arg1, arg2) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = getTokenPosOfNode(node, file); - var length = node.end - start; - return ts.createFileDiagnostic(file, start, length, message, arg0, arg1, arg2); + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); } ts.createDiagnosticForNode = createDiagnosticForNode; function createDiagnosticForNodeFromMessageChain(node, messageChain) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = ts.skipTrivia(file.text, node.pos); - var length = node.end - start; + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); return { - file: file, - start: start, - length: length, + file: sourceFile, + start: span.start, + length: span.length, code: messageChain.code, category: messageChain.category, messageText: messageChain.next ? messageChain : messageChain.messageText }; } ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; - function getErrorSpanForNode(node) { - var errorSpan; + function getSpanOfTokenAtPosition(sourceFile, pos) { + var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.text); + scanner.setTextPos(pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return createTextSpanFromBounds(start, scanner.getTextPos()); + } + ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; + function getErrorSpanForNode(sourceFile, node) { + var errorNode = node; switch (node.kind) { case 193: case 150: @@ -2994,10 +3069,18 @@ var ts; case 200: case 199: case 219: - errorSpan = node.name; + case 195: + case 160: + errorNode = node.name; break; } - return errorSpan && errorSpan.pos < errorSpan.end ? errorSpan : node; + if (errorNode === undefined) { + return getSpanOfTokenAtPosition(sourceFile, node.pos); + } + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : ts.skipTrivia(sourceFile.text, errorNode.pos); + return createTextSpanFromBounds(pos, errorNode.end); } ts.getErrorSpanForNode = getErrorSpanForNode; function isExternalModule(file) { @@ -3005,7 +3088,7 @@ var ts; } ts.isExternalModule = isExternalModule; function isDeclarationFile(file) { - return (file.flags & 1024) !== 0; + return (file.flags & 2048) !== 0; } ts.isDeclarationFile = isDeclarationFile; function isConstEnumDeclaration(node) { @@ -3035,11 +3118,11 @@ var ts; } ts.getCombinedNodeFlags = getCombinedNodeFlags; function isConst(node) { - return !!(getCombinedNodeFlags(node) & 4096); + return !!(getCombinedNodeFlags(node) & 8192); } ts.isConst = isConst; function isLet(node) { - return !!(getCombinedNodeFlags(node) & 2048); + return !!(getCombinedNodeFlags(node) & 4096); } ts.isLet = isLet; function isPrologueDirective(node) { @@ -3091,7 +3174,24 @@ var ts; } } ts.forEachReturnStatement = forEachReturnStatement; - function isAnyFunction(node) { + function isVariableLike(node) { + if (node) { + switch (node.kind) { + case 150: + case 219: + case 128: + case 217: + case 130: + case 129: + case 218: + case 193: + return true; + } + } + return false; + } + ts.isVariableLike = isVariableLike; + function isFunctionLike(node) { if (node) { switch (node.kind) { case 133: @@ -3115,9 +3215,9 @@ var ts; } return false; } - ts.isAnyFunction = isAnyFunction; + ts.isFunctionLike = isFunctionLike; function isFunctionBlock(node) { - return node && node.kind === 174 && isAnyFunction(node.parent); + return node && node.kind === 174 && isFunctionLike(node.parent); } ts.isFunctionBlock = isFunctionBlock; function isObjectLiteralMethod(node) { @@ -3127,7 +3227,7 @@ var ts; function getContainingFunction(node) { while (true) { node = node.parent; - if (!node || isAnyFunction(node)) { + if (!node || isFunctionLike(node)) { return node; } } @@ -3365,12 +3465,12 @@ var ts; } ts.isTemplateLiteralKind = isTemplateLiteralKind; function isBindingPattern(node) { - return node.kind === 149 || node.kind === 148; + return !!node && (node.kind === 149 || node.kind === 148); } ts.isBindingPattern = isBindingPattern; function isInAmbientContext(node) { while (node) { - if (node.flags & (2 | 1024)) { + if (node.flags & (2 | 2048)) { return true; } node = node.parent; @@ -3380,31 +3480,33 @@ var ts; ts.isInAmbientContext = isInAmbientContext; function isDeclaration(node) { switch (node.kind) { - case 127: - case 128: - case 193: + case 161: case 150: - case 130: - case 129: - case 217: - case 218: + case 196: + case 133: + case 199: case 219: + case 211: + case 195: + case 160: + case 134: + case 204: + case 202: + case 207: + case 197: case 132: case 131: - case 195: - case 134: - case 135: - case 133: - case 196: - case 197: - case 198: - case 199: case 200: - case 202: - case 204: - case 207: case 205: - case 211: + case 128: + case 217: + case 130: + case 129: + case 135: + case 218: + case 198: + case 127: + case 193: return true; } return false; @@ -3437,27 +3539,29 @@ var ts; } } ts.isStatement = isStatement; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name) { + function isDeclarationName(name) { if (name.kind !== 64 && name.kind !== 8 && name.kind !== 7) { return false; } var parent = name.parent; - if (isDeclaration(parent) || parent.kind === 160) { - return parent.name === name; + if (parent.kind === 207 || parent.kind === 211) { + if (parent.propertyName) { + return true; + } } - if (parent.kind === 216) { + if (isDeclaration(parent)) { return parent.name === name; } return false; } - ts.isDeclarationOrFunctionExpressionOrCatchVariableName = isDeclarationOrFunctionExpressionOrCatchVariableName; + ts.isDeclarationName = isDeclarationName; function getClassBaseTypeNode(node) { var heritageClause = getHeritageClause(node.heritageClauses, 78); return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; } ts.getClassBaseTypeNode = getClassBaseTypeNode; function getClassImplementedTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 103); + var heritageClause = getHeritageClause(node.heritageClauses, 102); return heritageClause ? heritageClause.types : undefined; } ts.getClassImplementedTypeNodes = getClassImplementedTypeNodes; @@ -3571,13 +3675,14 @@ var ts; ts.isESSymbolIdentifier = isESSymbolIdentifier; function isModifier(token) { switch (token) { - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: case 77: - case 115: + case 114: case 69: + case 72: return true; } return false; @@ -3692,6 +3797,42 @@ var ts; return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); } ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; + function nodeStartsNewLexicalEnvironment(n) { + return isFunctionLike(n) || n.kind === 200 || n.kind === 220; + } + ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; + function nodeIsSynthesized(node) { + return node.pos === -1 && node.end === -1; + } + ts.nodeIsSynthesized = nodeIsSynthesized; + function createSynthesizedNode(kind, startsOnNewLine) { + var node = ts.createNode(kind); + node.pos = -1; + node.end = -1; + node.startsOnNewLine = startsOnNewLine; + return node; + } + ts.createSynthesizedNode = createSynthesizedNode; + function generateUniqueName(baseName, isExistingName) { + if (baseName.charCodeAt(0) !== 95) { + var baseName = "_" + baseName; + if (!isExistingName(baseName)) { + return baseName; + } + } + if (baseName.charCodeAt(baseName.length - 1) !== 95) { + baseName += "_"; + } + var i = 1; + while (true) { + var name = baseName + i; + if (!isExistingName(name)) { + return name; + } + i++; + } + } + ts.generateUniqueName = generateUniqueName; function createDiagnosticCollection() { var nonFileDiagnostics = []; var fileDiagnostics = {}; @@ -3757,6 +3898,41 @@ var ts; } } ts.createDiagnosticCollection = createDiagnosticCollection; + var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; + var escapedCharsMap = { + "\0": "\\0", + "\t": "\\t", + "\v": "\\v", + "\f": "\\f", + "\b": "\\b", + "\r": "\\r", + "\n": "\\n", + "\\": "\\\\", + "\"": "\\\"", + "\u2028": "\\u2028", + "\u2029": "\\u2029", + "\u0085": "\\u0085" + }; + function escapeString(s) { + s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; + return s; + function getReplacement(c) { + return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); + } + } + ts.escapeString = escapeString; + function get16BitUnicodeEscapeSequence(charCode) { + var hexCharCode = charCode.toString(16).toUpperCase(); + var paddedHexCode = ("0000" + hexCharCode).slice(-4); + return "\\u" + paddedHexCode; + } + var nonAsciiCharacters = /[^\u0000-\u007F]/g; + function escapeNonAsciiCharacters(s) { + return nonAsciiCharacters.test(s) ? + s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : + s; + } + ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; })(ts || (ts = {})); var ts; (function (ts) { @@ -3867,6 +4043,7 @@ var ts; return visitNodes(cbNodes, node.properties); case 153: return visitNode(cbNode, node.expression) || + visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name); case 154: return visitNode(cbNode, node.expression) || @@ -3903,7 +4080,9 @@ var ts; visitNode(cbNode, node.right); case 168: return visitNode(cbNode, node.condition) || + visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || + visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse); case 171: return visitNode(cbNode, node.expression); @@ -3969,8 +4148,7 @@ var ts; visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock); case 216: - return visitNode(cbNode, node.name) || - visitNode(cbNode, node.type) || + return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block); case 196: return visitNodes(cbNodes, node.modifiers) || @@ -4025,7 +4203,7 @@ var ts; visitNode(cbNode, node.name); case 208: return visitNodes(cbNodes, node.modifiers) || - visitNode(cbNode, node.exportName); + visitNode(cbNode, node.expression); case 169: return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans); case 173: @@ -4067,13 +4245,14 @@ var ts; ; function modifierToFlag(token) { switch (token) { - case 110: return 128; - case 109: return 16; - case 108: return 64; - case 107: return 32; + case 109: return 128; + case 108: return 16; + case 107: return 64; + case 106: return 32; case 77: return 1; - case 115: return 2; - case 69: return 4096; + case 114: return 2; + case 69: return 8192; + case 72: return 256; } return 0; } @@ -4395,7 +4574,7 @@ var ts; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); - sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 1024 : 0; + sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 2048 : 0; var contextFlags = 0; var parseErrorBeforeNextFinishedNode = false; var scanner = ts.createScanner(languageVersion, true, sourceText, scanError); @@ -4523,7 +4702,9 @@ var ts; var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length; var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode; var saveContextFlags = contextFlags; - var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback); + var result = isLookAhead + ? scanner.lookAhead(callback) + : scanner.tryScan(callback); ts.Debug.assert(saveContextFlags === contextFlags); if (!result || isLookAhead) { token = saveToken; @@ -4542,10 +4723,10 @@ var ts; if (token === 64) { return true; } - if (token === 111 && inYieldContext()) { + if (token === 110 && inYieldContext()) { return false; } - return inStrictModeContext() ? token > 111 : token > 100; + return inStrictModeContext() ? token > 110 : token > 100; } function parseExpected(kind, diagnosticMessage) { if (token === kind) { @@ -4569,12 +4750,14 @@ var ts; } function parseOptionalToken(t) { if (token === t) { - var node = createNode(t); - nextToken(); - return finishNode(node); + return parseTokenNode(); } return undefined; } + function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) { + return parseOptionalToken(t) || + createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0); + } function parseTokenNode() { var node = createNode(token); nextToken(); @@ -4693,13 +4876,26 @@ var ts; } if (token === 77) { nextToken(); + if (token === 72) { + return lookAhead(nextTokenIsClassOrFunction); + } return token !== 35 && token !== 14 && canFollowModifier(); } + if (token === 72) { + return nextTokenIsClassOrFunction(); + } nextToken(); return canFollowModifier(); } function canFollowModifier() { - return token === 18 || token === 14 || token === 35 || isLiteralPropertyName(); + return token === 18 + || token === 14 + || token === 35 + || isLiteralPropertyName(); + } + function nextTokenIsClassOrFunction() { + nextToken(); + return token === 68 || token === 82; } function isListElement(parsingContext, inErrorRecovery) { var node = currentNode(parsingContext); @@ -4753,7 +4949,7 @@ var ts; return isIdentifier(); } function isNotHeritageClauseTypeName() { - if (token === 103 || + if (token === 102 || token === 78) { return lookAhead(nextTokenIsIdentifier); } @@ -4777,11 +4973,11 @@ var ts; case 4: return token === 15 || token === 66 || token === 72; case 8: - return token === 14 || token === 78 || token === 103; + return token === 14 || token === 78 || token === 102; case 9: return isVariableDeclaratorListTerminator(); case 16: - return token === 25 || token === 16 || token === 14 || token === 78 || token === 103; + return token === 25 || token === 16 || token === 14 || token === 78 || token === 102; case 12: return token === 17 || token === 22; case 14: @@ -5117,7 +5313,7 @@ var ts; literal = parseLiteralNode(); } else { - literal = createMissingNode(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); + literal = parseExpectedToken(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); } span.literal = literal; return finishNode(span); @@ -5126,14 +5322,19 @@ var ts; var node = createNode(token); var text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; + if (scanner.hasExtendedUnicodeEscape()) { + node.hasExtendedUnicodeEscape = true; + } if (scanner.isUnterminated()) { node.isUnterminated = true; } var tokenPos = scanner.getTokenPos(); nextToken(); finishNode(node); - if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= 8192; + if (node.kind === 7 + && sourceText.charCodeAt(tokenPos) === 48 + && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { + node.flags |= 16384; } return node; } @@ -5171,7 +5372,9 @@ var ts; } function parseParameterType() { if (parseOptional(51)) { - return token === 8 ? parseLiteralNode(true) : parseType(); + return token === 8 + ? parseLiteralNode(true) + : parseType(); } return undefined; } @@ -5341,7 +5544,9 @@ var ts; case 24: return parseSignatureMember(136); case 18: - return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature(); + return isIndexSignature() + ? parseIndexSignatureDeclaration(undefined) + : parsePropertyOrMethodSignature(); case 87: if (lookAhead(isStartOfConstructSignature)) { return parseSignatureMember(137); @@ -5363,7 +5568,9 @@ var ts; } function parseIndexSignatureWithModifiers() { var modifiers = parseModifiers(); - return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined; + return isIndexSignature() + ? parseIndexSignatureDeclaration(modifiers) + : undefined; } function isStartOfConstructSignature() { nextToken(); @@ -5411,11 +5618,11 @@ var ts; } function parseNonArrayType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReference(); case 98: @@ -5434,11 +5641,11 @@ var ts; } function isStartOfType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 96: case 14: @@ -5559,7 +5766,7 @@ var ts; case 39: case 24: case 64: - case 111: + case 110: return true; default: if (isBinaryOperator()) { @@ -5606,7 +5813,7 @@ var ts; return parseConditionalExpressionRest(expr); } function isYieldExpression() { - if (token === 111) { + if (token === 110) { if (inYieldContext()) { return true; } @@ -5652,7 +5859,9 @@ var ts; if (triState === 0) { return undefined; } - var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); + var arrowFunction = triState === 1 + ? parseParenthesizedArrowFunctionExpressionHead(true) + : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); if (!arrowFunction) { return undefined; } @@ -5731,13 +5940,15 @@ var ts; return parseAssignmentExpressionOrHigher(); } function parseConditionalExpressionRest(leftOperand) { - if (!parseOptional(50)) { + var questionToken = parseOptionalToken(50); + if (!questionToken) { return leftOperand; } var node = createNode(168, leftOperand.pos); node.condition = leftOperand; + node.questionToken = questionToken; node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(51); + node.colonToken = parseExpectedToken(51, false, ts.Diagnostics._0_expected, ts.tokenToString(51)); node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } @@ -5872,7 +6083,9 @@ var ts; return expression; } function parseLeftHandSideExpressionOrHigher() { - var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher(); + var expression = token === 90 + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); return parseCallExpressionRest(expression); } function parseMemberExpressionOrHigher() { @@ -5886,7 +6099,7 @@ var ts; } var node = createNode(153, expression.pos); node.expression = expression; - parseExpected(20, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.dotToken = parseExpectedToken(20, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); node.name = parseRightSideOfDot(true); return finishNode(node); } @@ -5900,10 +6113,11 @@ var ts; } function parseMemberExpressionRest(expression) { while (true) { - var dotOrBracketStart = scanner.getTokenPos(); - if (parseOptional(20)) { + var dotToken = parseOptionalToken(20); + if (dotToken) { var propertyAccess = createNode(153, expression.pos); propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; propertyAccess.name = parseRightSideOfDot(true); expression = finishNode(propertyAccess); continue; @@ -5925,7 +6139,9 @@ var ts; if (token === 10 || token === 11) { var tagExpression = createNode(157, expression.pos); tagExpression.tag = expression; - tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression(); + tagExpression.template = token === 10 + ? parseLiteralNode() + : parseTemplateExpression(); expression = finishNode(tagExpression); continue; } @@ -5971,7 +6187,9 @@ var ts; if (!parseExpected(25)) { return undefined; } - return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined; + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } function canFollowTypeArgumentsInExpression() { switch (token) { @@ -6046,7 +6264,9 @@ var ts; return finishNode(node); } function parseArgumentOrArrayLiteralElement() { - return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher(); + return token === 21 ? parseSpreadElement() : + token === 23 ? createNode(172) : + parseAssignmentExpressionOrHigher(); } function parseArgumentExpression() { return allowInAnd(parseArgumentOrArrayLiteralElement); @@ -6055,16 +6275,16 @@ var ts; var node = createNode(151); parseExpected(18); if (scanner.hasPrecedingLineBreak()) - node.flags |= 256; + node.flags |= 512; node.elements = parseDelimitedList(14, parseArgumentOrArrayLiteralElement); parseExpected(19); return finishNode(node); } function tryParseAccessorDeclaration(fullStart, modifiers) { - if (parseContextualModifier(116)) { + if (parseContextualModifier(115)) { return parseAccessorDeclaration(134, fullStart, modifiers); } - else if (parseContextualModifier(120)) { + else if (parseContextualModifier(119)) { return parseAccessorDeclaration(135, fullStart, modifiers); } return undefined; @@ -6103,7 +6323,7 @@ var ts; var node = createNode(152); parseExpected(14); if (scanner.hasPrecedingLineBreak()) { - node.flags |= 256; + node.flags |= 512; } node.properties = parseDelimitedList(13, parseObjectLiteralElement, true); parseExpected(15); @@ -6190,7 +6410,7 @@ var ts; parseExpected(16); var initializer = undefined; if (token !== 22) { - if (token === 97 || token === 105 || token === 69) { + if (token === 97 || token === 104 || token === 69) { initializer = parseVariableDeclarationList(true); } else { @@ -6306,9 +6526,9 @@ var ts; function parseCatchClause() { var result = createNode(216); parseExpected(67); - parseExpected(16); - result.name = parseIdentifier(); - result.type = parseTypeAnnotation(); + if (parseExpected(16)) { + result.variableDeclaration = parseVariableDeclaration(); + } parseExpected(17); result.block = parseBlock(false, false); return finishNode(result); @@ -6347,7 +6567,7 @@ var ts; return !inErrorRecovery; case 14: case 97: - case 105: + case 104: case 82: case 83: case 74: @@ -6367,18 +6587,18 @@ var ts; case 69: var isConstEnum = lookAhead(nextTokenIsEnumKeyword); return !isConstEnum; - case 104: + case 103: case 68: - case 117: + case 116: case 76: - case 123: + case 122: if (isDeclarationStart()) { return false; } - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: if (lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine)) { return false; } @@ -6431,7 +6651,7 @@ var ts; return parseTryStatement(); case 71: return parseDebuggerStatement(); - case 105: + case 104: if (isLetDeclaration()) { return parseVariableStatement(scanner.getStartPos(), undefined); } @@ -6455,7 +6675,7 @@ var ts; return undefined; } return parseVariableStatement(start, modifiers); - case 105: + case 104: if (!isLetDeclaration()) { return undefined; } @@ -6538,11 +6758,11 @@ var ts; switch (token) { case 97: break; - case 105: - node.flags |= 2048; + case 104: + node.flags |= 4096; break; case 69: - node.flags |= 4096; + node.flags |= 8192; break; default: ts.Debug.fail(); @@ -6574,7 +6794,7 @@ var ts; setModifiers(node, modifiers); parseExpected(82); node.asteriskToken = parseOptionalToken(35); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); fillSignature(51, !!node.asteriskToken, false, node); node.body = parseFunctionBlockOrSemicolon(!!node.asteriskToken, ts.Diagnostics.or_expected); return finishNode(node); @@ -6582,7 +6802,7 @@ var ts; function parseConstructorDeclaration(pos, modifiers) { var node = createNode(133, pos); setModifiers(node, modifiers); - parseExpected(114); + parseExpected(113); fillSignature(51, false, false, node); node.body = parseFunctionBlockOrSemicolon(false, ts.Diagnostics.or_expected); return finishNode(node); @@ -6643,7 +6863,7 @@ var ts; return true; } if (idToken !== undefined) { - if (!ts.isKeyword(idToken) || idToken === 120 || idToken === 116) { + if (!ts.isKeyword(idToken) || idToken === 119 || idToken === 115) { return true; } switch (token) { @@ -6688,7 +6908,7 @@ var ts; if (accessor) { return accessor; } - if (token === 114) { + if (token === 113) { return parseConstructorDeclaration(fullStart, modifiers); } if (isIndexSignature()) { @@ -6707,11 +6927,13 @@ var ts; var node = createNode(196, fullStart); setModifiers(node, modifiers); parseExpected(68); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(true); if (parseExpected(14)) { - node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers(); + node.members = inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseClassMembers) + : parseClassMembers(); parseExpected(15); } else { @@ -6721,7 +6943,9 @@ var ts; } function parseHeritageClauses(isClassHeritageClause) { if (isHeritageClause()) { - return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker(); + return isClassHeritageClause && inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseHeritageClausesWorker) + : parseHeritageClausesWorker(); } return undefined; } @@ -6729,7 +6953,7 @@ var ts; return parseList(19, false, parseHeritageClause); } function parseHeritageClause() { - if (token === 78 || token === 103) { + if (token === 78 || token === 102) { var node = createNode(215); node.token = token; nextToken(); @@ -6739,7 +6963,7 @@ var ts; return undefined; } function isHeritageClause() { - return token === 78 || token === 103; + return token === 78 || token === 102; } function parseClassMembers() { return parseList(6, false, parseClassElement); @@ -6747,7 +6971,7 @@ var ts; function parseInterfaceDeclaration(fullStart, modifiers) { var node = createNode(197, fullStart); setModifiers(node, modifiers); - parseExpected(104); + parseExpected(103); node.name = parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(false); @@ -6757,7 +6981,7 @@ var ts; function parseTypeAliasDeclaration(fullStart, modifiers) { var node = createNode(198, fullStart); setModifiers(node, modifiers); - parseExpected(123); + parseExpected(122); node.name = parseIdentifier(); parseExpected(52); node.type = parseType(); @@ -6800,7 +7024,9 @@ var ts; setModifiers(node, modifiers); node.flags |= flags; node.name = parseIdentifier(); - node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock(); + node.body = parseOptional(20) + ? parseInternalModuleTail(getNodePos(), undefined, 1) + : parseModuleBlock(); return finishNode(node); } function parseAmbientExternalModuleDeclaration(fullStart, modifiers) { @@ -6811,11 +7037,13 @@ var ts; return finishNode(node); } function parseModuleDeclaration(fullStart, modifiers) { - parseExpected(117); - return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); + parseExpected(116); + return token === 8 + ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) + : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); } function isExternalModuleReference() { - return token === 118 && + return token === 117 && lookAhead(nextTokenIsOpenParen); } function nextTokenIsOpenParen() { @@ -6824,7 +7052,7 @@ var ts; function nextTokenIsCommaOrFromKeyword() { nextToken(); return token === 23 || - token === 102; + token === 123; } function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) { parseExpected(84); @@ -6832,7 +7060,7 @@ var ts; var identifier; if (isIdentifier()) { identifier = parseIdentifier(); - if (token !== 23 && token !== 102) { + if (token !== 23 && token !== 123) { var importEqualsDeclaration = createNode(202, fullStart); setModifiers(importEqualsDeclaration, modifiers); importEqualsDeclaration.name = identifier; @@ -6848,7 +7076,7 @@ var ts; token === 35 || token === 14) { importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(102); + parseExpected(123); } importDeclaration.moduleSpecifier = parseModuleSpecifier(); parseSemicolon(); @@ -6866,11 +7094,13 @@ var ts; return finishNode(importClause); } function parseModuleReference() { - return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false); + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(false); } function parseExternalModuleReference() { var node = createNode(212); - parseExpected(118); + parseExpected(117); parseExpected(16); node.expression = parseModuleSpecifier(); parseExpected(17); @@ -6928,22 +7158,28 @@ var ts; var node = createNode(209, fullStart); setModifiers(node, modifiers); if (parseOptional(35)) { - parseExpected(102); + parseExpected(123); node.moduleSpecifier = parseModuleSpecifier(); } else { node.exportClause = parseNamedImportsOrExports(210); - if (parseOptional(102)) { + if (parseOptional(123)) { node.moduleSpecifier = parseModuleSpecifier(); } } parseSemicolon(); return finishNode(node); } - function parseExportAssignmentTail(fullStart, modifiers) { + function parseExportAssignment(fullStart, modifiers) { var node = createNode(208, fullStart); setModifiers(node, modifiers); - node.exportName = parseIdentifier(); + if (parseOptional(52)) { + node.isExportEquals = true; + } + else { + parseExpected(72); + } + node.expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); return finishNode(node); } @@ -6956,24 +7192,24 @@ var ts; case 69: case 82: return true; - case 105: + case 104: return isLetDeclaration(); case 68: - case 104: + case 103: case 76: - case 123: + case 122: return lookAhead(nextTokenIsIdentifierOrKeyword); case 84: return lookAhead(nextTokenCanFollowImportKeyword); - case 117: + case 116: return lookAhead(nextTokenIsIdentifierOrKeywordOrStringLiteral); case 77: return lookAhead(nextTokenCanFollowExportKeyword); - case 115: - case 109: - case 107: + case 114: case 108: - case 110: + case 106: + case 107: + case 109: return lookAhead(nextTokenIsDeclarationStart); } } @@ -6996,7 +7232,7 @@ var ts; function nextTokenCanFollowExportKeyword() { nextToken(); return token === 52 || token === 35 || - token === 14 || isDeclarationStart(); + token === 14 || token === 72 || isDeclarationStart(); } function nextTokenIsDeclarationStart() { nextToken(); @@ -7010,8 +7246,8 @@ var ts; var modifiers = parseModifiers(); if (token === 77) { nextToken(); - if (parseOptional(52)) { - return parseExportAssignmentTail(fullStart, modifiers); + if (token === 72 || token === 52) { + return parseExportAssignment(fullStart, modifiers); } if (token === 35 || token === 14) { return parseExportDeclaration(fullStart, modifiers); @@ -7019,20 +7255,20 @@ var ts; } switch (token) { case 97: - case 105: + case 104: case 69: return parseVariableStatement(fullStart, modifiers); case 82: return parseFunctionDeclaration(fullStart, modifiers); case 68: return parseClassDeclaration(fullStart, modifiers); - case 104: + case 103: return parseInterfaceDeclaration(fullStart, modifiers); - case 123: + case 122: return parseTypeAliasDeclaration(fullStart, modifiers); case 76: return parseEnumDeclaration(fullStart, modifiers); - case 117: + case 116: return parseModuleDeclaration(fullStart, modifiers); case 84: return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers); @@ -7050,7 +7286,9 @@ var ts; return parseSourceElementOrModuleElement(); } function parseSourceElementOrModuleElement() { - return isDeclarationStart() ? parseDeclaration() : parseStatement(); + return isDeclarationStart() + ? parseDeclaration() + : parseStatement(); } function processReferenceComments(sourceFile) { var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText); @@ -7108,7 +7346,13 @@ var ts; } function setExternalModuleIndicator(sourceFile) { sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) { - return node.flags & 1 || node.kind === 202 && node.moduleReference.kind === 212 || node.kind === 203 || node.kind === 208 || node.kind === 209 ? node : undefined; + return node.flags & 1 + || node.kind === 202 && node.moduleReference.kind === 212 + || node.kind === 203 + || node.kind === 208 + || node.kind === 209 + ? node + : undefined; }); } } @@ -7198,7 +7442,8 @@ var ts; var Symbol = ts.objectAllocator.getSymbolConstructor(); if (!file.locals) { file.locals = {}; - container = blockScopeContainer = file; + container = file; + setBlockScopeContainer(file, false); bind(file); file.symbolCount = symbolCount; } @@ -7206,6 +7451,12 @@ var ts; symbolCount++; return new Symbol(flags, name); } + function setBlockScopeContainer(node, cleanLocals) { + blockScopeContainer = node; + if (cleanLocals) { + blockScopeContainer.locals = undefined; + } + } function addDeclarationToSymbol(symbol, node, symbolKind) { symbol.flags |= symbolKind; if (!symbol.declarations) @@ -7242,6 +7493,13 @@ var ts; return "__new"; case 138: return "__index"; + case 209: + return "__export"; + case 208: + return "default"; + case 195: + case 196: + return node.flags & 256 ? "default" : undefined; } } function getDisplayName(node) { @@ -7249,18 +7507,20 @@ var ts; } function declareSymbol(symbols, parent, node, includes, excludes) { ts.Debug.assert(!ts.hasDynamicName(node)); - var name = getDeclarationName(node); + var name = node.flags & 256 && parent ? "default" : getDeclarationName(node); if (name !== undefined) { var symbol = ts.hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { if (node.name) { node.name.parent = node; } - var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = symbol.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 + : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name, message, getDisplayName(declaration))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name, message, getDisplayName(node))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); symbol = createSymbol(0, name); } } @@ -7330,7 +7590,7 @@ var ts; lastContainer = container; } if (isBlockScopeContainer) { - blockScopeContainer = node; + setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220); } ts.forEachChild(node, bind); container = saveContainer; @@ -7398,12 +7658,6 @@ var ts; } } } - function bindExportDeclaration(node) { - if (!node.exportClause) { - (container.exportStars || (container.exportStars = [])).push(node); - } - bindChildren(node, 0, false); - } function bindFunctionOrConstructorType(node) { var symbol = createSymbol(131072, getDeclarationName(node)); addDeclarationToSymbol(symbol, node, 131072); @@ -7419,14 +7673,7 @@ var ts; bindChildren(node, symbolKind, isBlockScopeContainer); } function bindCatchVariableDeclaration(node) { - var symbol = createSymbol(1, node.name.text || "__missing"); - addDeclarationToSymbol(symbol, node, 1); - var saveParent = parent; - var savedBlockScopeContainer = blockScopeContainer; - parent = blockScopeContainer = node; - ts.forEachChild(node, bind); - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; + bindChildren(node, 0, true); } function bindBlockScopedVariableDeclaration(node) { switch (blockScopeContainer.kind) { @@ -7463,7 +7710,7 @@ var ts; if (ts.isBindingPattern(node.name)) { bindChildren(node, 0, false); } - else if (ts.getCombinedNodeFlags(node) & 6144) { + else if (ts.isBlockOrCatchScoped(node)) { bindBlockScopedVariableDeclaration(node); } else { @@ -7545,9 +7792,6 @@ var ts; case 211: bindDeclaration(node, 8388608, 8388608, false); break; - case 209: - bindExportDeclaration(node); - break; case 204: if (node.name) { bindDeclaration(node, 8388608, 8388608, false); @@ -7556,13 +7800,28 @@ var ts; bindChildren(node, 0, false); } break; + case 209: + if (!node.exportClause) { + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); + } + bindChildren(node, 0, false); + break; + case 208: + if (node.expression.kind === 64) { + declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608); + } + else { + declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455); + } + bindChildren(node, 0, false); + break; case 220: if (ts.isExternalModule(node)) { bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true); break; } case 174: - bindChildren(node, 0, !ts.isAnyFunction(node.parent)); + bindChildren(node, 0, !ts.isFunctionLike(node.parent)); break; case 216: case 181: @@ -7650,8 +7909,9 @@ var ts; isValidPropertyAccess: isValidPropertyAccess, getSignatureFromDeclaration: getSignatureFromDeclaration, isImplementationOfOverload: isImplementationOfOverload, - getAliasedSymbol: resolveImport, - getEmitResolver: getEmitResolver + getAliasedSymbol: resolveAlias, + getEmitResolver: getEmitResolver, + getExportsOfExternalModule: getExportsOfExternalModule }; var undefinedSymbol = createSymbol(4 | 67108864, "undefined"); var argumentsSymbol = createSymbol(4 | 67108864, "arguments"); @@ -7685,6 +7945,7 @@ var ts; var globalRegExpType; var globalTemplateStringsArrayType; var globalESSymbolType; + var globalIterableType; var anyArrayType; var tupleTypes = {}; var unionTypes = {}; @@ -7718,7 +7979,9 @@ var ts; return emitResolver; } function error(location, message, arg0, arg1, arg2) { - var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); + var diagnostic = location + ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) + : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); diagnostics.add(diagnostic); } function createSymbol(flags, name) { @@ -7804,7 +8067,8 @@ var ts; recordMergedSymbol(target, source); } else { - var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = target.flags & 2 || source.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(source.declarations, function (node) { error(node.name ? node.name : node, message, symbolToString(source)); }); @@ -7838,13 +8102,6 @@ var ts; } } } - function extendSymbolTable(target, source) { - for (var id in source) { - if (!ts.hasProperty(target, id)) { - target[id] = source[id]; - } - } - } function getSymbolLinks(symbol) { if (symbol.flags & 67108864) return symbol; @@ -7871,7 +8128,7 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target === unknownSymbol || target.flags & meaning) { return symbol; } @@ -7907,7 +8164,7 @@ var ts; break; case 200: if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) { - if (!(result.flags & 8388608 && getDeclarationOfImportSymbol(result).kind === 211)) { + if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) { break loop; } result = undefined; @@ -7971,13 +8228,6 @@ var ts; break loop; } break; - case 216: - var id = location.name; - if (name === id.text) { - result = location.symbol; - break loop; - } - break; } lastLocation = location; location = location.parent; @@ -7998,7 +8248,7 @@ var ts; return undefined; } if (result.flags & 2) { - var declaration = ts.forEach(result.declarations, function (d) { return ts.getCombinedNodeFlags(d) & 6144 ? d : undefined; }); + var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; }); ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); if (!isDefinedBefore(declaration, errorLocation)) { error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name)); @@ -8007,15 +8257,16 @@ var ts; } return result; } - function isImportSymbolDeclaration(node) { + function isAliasSymbolDeclaration(node) { return node.kind === 202 || node.kind === 204 && !!node.name || node.kind === 205 || node.kind === 207 || - node.kind === 211; + node.kind === 211 || + node.kind === 208; } - function getDeclarationOfImportSymbol(symbol) { - return ts.forEach(symbol.declarations, function (d) { return isImportSymbolDeclaration(d) ? d : undefined; }); + function getDeclarationOfAliasSymbol(symbol) { + return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; }); } function getTargetOfImportEqualsDeclaration(node) { if (node.moduleReference.kind === 212) { @@ -8048,7 +8299,7 @@ var ts; error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name)); return; } - return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveImport(symbol); + return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveAlias(symbol); } } } @@ -8056,7 +8307,12 @@ var ts; return getExternalModuleMember(node.parent.parent.parent, node); } function getTargetOfExportSpecifier(node) { - return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node, node.propertyName || node.name, 107455 | 793056 | 1536); + return node.parent.parent.moduleSpecifier ? + getExternalModuleMember(node.parent.parent, node) : + resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); + } + function getTargetOfExportAssignment(node) { + return resolveEntityName(node.expression, 107455 | 793056 | 1536); } function getTargetOfImportDeclaration(node) { switch (node.kind) { @@ -8070,14 +8326,16 @@ var ts; return getTargetOfImportSpecifier(node); case 211: return getTargetOfExportSpecifier(node); + case 208: + return getTargetOfExportAssignment(node); } } - function resolveImport(symbol) { - ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Imports here."); + function resolveAlias(symbol) { + ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Alias here."); var links = getSymbolLinks(symbol); if (!links.target) { links.target = resolvingSymbol; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); var target = getTargetOfImportDeclaration(node); if (links.target === resolvingSymbol) { links.target = target || unknownSymbol; @@ -8091,6 +8349,29 @@ var ts; } return links.target; } + function markExportAsReferenced(node) { + var symbol = getSymbolOfNode(node); + var target = resolveAlias(symbol); + if (target && target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target)) { + markAliasSymbolAsReferenced(symbol); + } + } + function markAliasSymbolAsReferenced(symbol) { + var links = getSymbolLinks(symbol); + if (!links.referenced) { + links.referenced = true; + var node = getDeclarationOfAliasSymbol(symbol); + if (node.kind === 208) { + checkExpressionCached(node.expression); + } + else if (node.kind === 211) { + checkExpressionCached(node.propertyName || node.name); + } + else if (ts.isInternalModuleImportEqualsDeclaration(node)) { + checkExpressionCached(node.moduleReference); + } + } + } function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) { if (!importDeclaration) { importDeclaration = ts.getAncestor(entityName, 202); @@ -8100,38 +8381,40 @@ var ts; entityName = entityName.parent; } if (entityName.kind === 64 || entityName.parent.kind === 125) { - return resolveEntityName(importDeclaration, entityName, 1536); + return resolveEntityName(entityName, 1536); } else { ts.Debug.assert(entityName.parent.kind === 202); - return resolveEntityName(importDeclaration, entityName, 107455 | 793056 | 1536); + return resolveEntityName(entityName, 107455 | 793056 | 1536); } } function getFullyQualifiedName(symbol) { return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol); } - function resolveEntityName(location, name, meaning) { + function resolveEntityName(name, meaning) { if (ts.getFullWidth(name) === 0) { return undefined; } if (name.kind === 64) { - var symbol = resolveName(location, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); + var symbol = resolveName(name, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); if (!symbol) { - return; + return undefined; } } else if (name.kind === 125) { - var namespace = resolveEntityName(location, name.left, 1536); - if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) - return; - var symbol = getSymbol(getExportsOfSymbol(namespace), name.right.text, meaning); + var namespace = resolveEntityName(name.left, 1536); + if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) { + return undefined; + } + var right = name.right; + var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning); if (!symbol) { - error(location, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(name.right)); - return; + error(right, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right)); + return undefined; } } ts.Debug.assert((symbol.flags & 16777216) === 0, "Should never get an instantiated symbol here."); - return symbol.flags & meaning ? symbol : resolveImport(symbol); + return symbol.flags & meaning ? symbol : resolveAlias(symbol); } function isExternalModuleNameRelative(moduleName) { return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; @@ -8171,6 +8454,9 @@ var ts; } error(moduleReferenceLiteral, ts.Diagnostics.Cannot_find_external_module_0, moduleName); } + function getExportAssignmentSymbol(moduleSymbol) { + return moduleSymbol.exports["default"]; + } function getResolvedExportAssignmentSymbol(moduleSymbol) { var symbol = getExportAssignmentSymbol(moduleSymbol); if (symbol) { @@ -8178,82 +8464,52 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - return resolveImport(symbol); + return resolveAlias(symbol); } } } - function getExportAssignmentSymbol(symbol) { - checkTypeOfExportAssignmentSymbol(symbol); - return getSymbolLinks(symbol).exportAssignmentSymbol; - } - function checkTypeOfExportAssignmentSymbol(containerSymbol) { - var symbolLinks = getSymbolLinks(containerSymbol); - if (!symbolLinks.exportAssignmentChecked) { - var exportInformation = collectExportInformationForSourceFileOrModule(containerSymbol); - if (exportInformation.exportAssignments.length) { - if (exportInformation.exportAssignments.length > 1) { - ts.forEach(exportInformation.exportAssignments, function (node) { return error(node, ts.Diagnostics.A_module_cannot_have_more_than_one_export_assignment); }); - } - var node = exportInformation.exportAssignments[0]; - if (exportInformation.hasExportedMember) { - error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); - } - if (node.exportName.text) { - var meaning = 107455 | 793056 | 1536; - var exportSymbol = resolveName(node, node.exportName.text, meaning, ts.Diagnostics.Cannot_find_name_0, node.exportName); - } - symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; - } - symbolLinks.exportAssignmentChecked = true; - } - } - function collectExportInformationForSourceFileOrModule(symbol) { - var seenExportedMember = false; - var result = []; - ts.forEach(symbol.declarations, function (declaration) { - var block = (declaration.kind === 220 ? declaration : declaration.body); - ts.forEach(block.statements, function (node) { - if (node.kind === 208) { - result.push(node); - } - else { - seenExportedMember = seenExportedMember || (node.flags & 1) !== 0; - } - }); - }); - return { - hasExportedMember: seenExportedMember, - exportAssignments: result - }; - } function getExportsOfSymbol(symbol) { return symbol.flags & 1536 ? getExportsOfModule(symbol) : symbol.exports; } - function getExportsOfModule(symbol) { - var links = getSymbolLinks(symbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(symbol)); + function getExportsOfModule(moduleSymbol) { + var links = getSymbolLinks(moduleSymbol); + return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); } - function getExportsForModule(symbol) { + function extendExportSymbols(target, source) { + for (var id in source) { + if (id !== "default" && !ts.hasProperty(target, id)) { + target[id] = source[id]; + } + } + } + function getExportsForModule(moduleSymbol) { + if (compilerOptions.target < 2) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + return { + "default": defaultSymbol + }; + } + } var result; var visitedSymbols = []; - visit(symbol); - return result; + visit(moduleSymbol); + return result || moduleSymbol.exports; function visit(symbol) { if (!ts.contains(visitedSymbols, symbol)) { visitedSymbols.push(symbol); - if (!result) { - result = symbol.exports; - } - else { - extendSymbolTable(result, symbol.exports); - } - ts.forEach(symbol.declarations, function (node) { - if (node.kind === 220 || node.kind === 200) { - ts.forEach(node.exportStars, function (exportStar) { - visit(resolveExternalModuleName(exportStar, exportStar.moduleSpecifier)); - }); + if (symbol !== moduleSymbol) { + if (!result) { + result = cloneSymbolTable(moduleSymbol.exports); } - }); + extendExportSymbols(result, symbol.exports); + } + var exportStars = symbol.exports["__export"]; + if (exportStars) { + ts.forEach(exportStars.declarations, function (node) { + visit(resolveExternalModuleName(node, node.moduleSpecifier)); + }); + } } } } @@ -8268,7 +8524,9 @@ var ts; return getMergedSymbol(symbol.parent); } function getExportSymbolOfValueSymbolIfExported(symbol) { - return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol; + return symbol && (symbol.flags & 1048576) !== 0 + ? getMergedSymbol(symbol.exportSymbol) + : symbol; } function symbolIsValue(symbol) { if (symbol.flags & 16777216) { @@ -8278,7 +8536,7 @@ var ts; return true; } if (symbol.flags & 8388608) { - return (resolveImport(symbol).flags & 107455) !== 0; + return (resolveAlias(symbol).flags & 107455) !== 0; } return false; } @@ -8395,8 +8653,8 @@ var ts; if (symbolFromSymbolTable.flags & 8388608) { if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) { - var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); - if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); + if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) { return [symbolFromSymbolTable]; } var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined; @@ -8421,7 +8679,7 @@ var ts; if (symbolFromSymbolTable === symbol) { return true; } - symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -8712,7 +8970,7 @@ var ts; buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, 793056, 0, flags); } else { - writeKeyword(writer, 112); + writeKeyword(writer, 111); } } else { @@ -8803,7 +9061,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 0, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 121); + writeKeyword(writer, 120); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -8816,7 +9074,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 1, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 119); + writeKeyword(writer, 118); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -8981,7 +9239,7 @@ var ts; return true; } if (symbolOfNode.flags & 8388608) { - return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); } } function isSymbolUsedInExportAssignment(symbol) { @@ -8989,7 +9247,7 @@ var ts; return true; } if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & 8388608)) { - resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); if (resolvedExportSymbol === symbol) { return true; } @@ -9123,6 +9381,9 @@ var ts; if (declaration.parent.parent.kind === 182) { return anyType; } + if (declaration.parent.parent.kind === 183) { + return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent); + } if (ts.isBindingPattern(declaration.parent)) { return getTypeForBindingElement(declaration); } @@ -9182,7 +9443,9 @@ var ts; return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes); } function getTypeFromBindingPattern(pattern) { - return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern); + return pattern.kind === 148 + ? getTypeFromObjectBindingPattern(pattern) + : getTypeFromArrayBindingPattern(pattern); } function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) { var type = getTypeForVariableLikeDeclaration(declaration); @@ -9211,9 +9474,12 @@ var ts; return links.type = getTypeOfPrototypeProperty(symbol); } var declaration = symbol.valueDeclaration; - if (declaration.kind === 216) { + if (declaration.parent.kind === 216) { return links.type = anyType; } + if (declaration.kind === 208) { + return links.type = checkExpression(declaration.expression); + } links.type = resolvingType; var type = getWidenedTypeForVariableLikeDeclaration(declaration, true); if (links.type === resolvingType) { @@ -9223,7 +9489,9 @@ var ts; else if (links.type === resolvingType) { links.type = anyType; if (compilerOptions.noImplicitAny) { - var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; + var diagnostic = symbol.valueDeclaration.type ? + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; error(symbol.valueDeclaration, diagnostic, symbolToString(symbol)); } } @@ -9303,10 +9571,10 @@ var ts; } return links.type; } - function getTypeOfImport(symbol) { + function getTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.type) { - links.type = getTypeOfSymbol(resolveImport(symbol)); + links.type = getTypeOfSymbol(resolveAlias(symbol)); } return links.type; } @@ -9334,7 +9602,7 @@ var ts; return getTypeOfAccessors(symbol); } if (symbol.flags & 8388608) { - return getTypeOfImport(symbol); + return getTypeOfAlias(symbol); } return unknownType; } @@ -9488,10 +9756,10 @@ var ts; } return links.declaredType; } - function getDeclaredTypeOfImport(symbol) { + function getDeclaredTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.declaredType) { - links.declaredType = getDeclaredTypeOfSymbol(resolveImport(symbol)); + links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)); } return links.declaredType; } @@ -9513,7 +9781,7 @@ var ts; return getDeclaredTypeOfTypeParameter(symbol); } if (symbol.flags & 8388608) { - return getDeclaredTypeOfImport(symbol); + return getDeclaredTypeOfAlias(symbol); } return unknownType; } @@ -9603,7 +9871,8 @@ var ts; var baseType = classType.baseTypes[0]; var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1); return ts.map(baseSignatures, function (baseSignature) { - var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); + var signature = baseType.flags & 4096 ? + getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); signature.typeParameters = classType.typeParameters; signature.resolvedReturnType = classType; return signature; @@ -9884,11 +10153,22 @@ var ts; }); return result; } + function getExportsOfExternalModule(node) { + if (!node.moduleSpecifier) { + return emptyArray; + } + var module = resolveExternalModuleName(node, node.moduleSpecifier); + if (!module || !module.exports) { + return emptyArray; + } + return ts.mapToArray(getExportsOfModule(module)); + } function getSignatureFromDeclaration(declaration) { var links = getNodeLinks(declaration); if (!links.resolvedSignature) { var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined; - var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; + var typeParameters = classType ? classType.typeParameters : + declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; var parameters = []; var hasStringLiterals = false; var minArgumentCount = -1; @@ -10029,7 +10309,7 @@ var ts; return symbol.members["__index"]; } function getIndexDeclarationOfSymbol(symbol, kind) { - var syntaxKind = kind === 1 ? 119 : 121; + var syntaxKind = kind === 1 ? 118 : 120; var indexSymbol = getIndexSymbol(symbol); if (indexSymbol) { var len = indexSymbol.declarations.length; @@ -10047,7 +10327,9 @@ var ts; } function getIndexTypeOfSymbol(symbol, kind) { var declaration = getIndexDeclarationOfSymbol(symbol, kind); - return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined; + return declaration + ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType + : undefined; } function getConstraintOfTypeParameter(type) { if (!type.constraint) { @@ -10132,7 +10414,7 @@ var ts; function getTypeFromTypeReferenceNode(node) { var links = getNodeLinks(node); if (!links.resolvedType) { - var symbol = resolveEntityName(node, node.typeName, 793056); + var symbol = resolveEntityName(node.typeName, 793056); if (symbol) { var type; if ((symbol.flags & 262144) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { @@ -10205,8 +10487,9 @@ var ts; function getGlobalSymbol(name, meaning, diagnostic) { return resolveName(undefined, name, meaning, diagnostic, name); } - function getGlobalType(name) { - return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), 0); + function getGlobalType(name, arity) { + if (arity === void 0) { arity = 0; } + return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity); } function getGlobalESSymbolConstructorSymbol() { return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol")); @@ -10350,15 +10633,15 @@ var ts; } function getTypeFromTypeNode(node) { switch (node.kind) { - case 112: + case 111: return anyType; - case 121: + case 120: return stringType; - case 119: + case 118: return numberType; - case 113: + case 112: return booleanType; - case 122: + case 121: return esSymbolType; case 98: return voidType; @@ -10510,7 +10793,8 @@ var ts; return mapper(type); } if (type.flags & 32768) { - return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type; + return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? + instantiateAnonymousType(type, mapper) : type; } if (type.flags & 4096) { return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType)); @@ -10539,7 +10823,7 @@ var ts; isContextSensitive(node.whenFalse); case 167: return node.operatorToken.kind === 49 && - (isContextSensitive(node.left) || isContextSensitive(node.right)); + (isContextSensitive(node.left) || isContextSensitive(node.right)); case 217: return isContextSensitive(node.initializer); case 132: @@ -11309,7 +11593,9 @@ var ts; var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type; break; case 128: - var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; + var diagnostic = declaration.dotDotDotToken ? + ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : + ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; break; case 195: case 132: @@ -11410,7 +11696,9 @@ var ts; for (var i = 0; i < typeParameters.length; i++) { if (target === typeParameters[i]) { var inferences = context.inferences[i]; - var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []); + var candidates = inferiority ? + inferences.secondary || (inferences.secondary = []) : + inferences.primary || (inferences.primary = []); if (!ts.contains(candidates, source)) candidates.push(source); break; @@ -11819,46 +12107,56 @@ var ts; return type; } } - function markLinkedImportsAsReferenced(node) { - if (node) { - var nodeLinks = getNodeLinks(node); - while (nodeLinks.importOnRightSide) { - var rightSide = nodeLinks.importOnRightSide; - nodeLinks.importOnRightSide = undefined; - getSymbolLinks(rightSide).referenced = true; - ts.Debug.assert((rightSide.flags & 8388608) !== 0); - nodeLinks = getNodeLinks(ts.getDeclarationOfKind(rightSide, 202)); - } - } - } function checkIdentifier(node) { var symbol = getResolvedSymbol(node); if (symbol === argumentsSymbol && ts.getContainingFunction(node).kind === 161) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & 8388608) { - var symbolLinks = getSymbolLinks(symbol); - if (!symbolLinks.referenced) { - var importOrExportAssignment = getLeftSideOfImportEqualsOrExportAssignment(node); - if (!importOrExportAssignment || - (importOrExportAssignment.flags & 1) || - (importOrExportAssignment.kind === 208)) { - symbolLinks.referenced = !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol)); - } - else { - var nodeLinks = getNodeLinks(importOrExportAssignment); - ts.Debug.assert(!nodeLinks.importOnRightSide); - nodeLinks.importOnRightSide = symbol; - } - } - if (symbolLinks.referenced) { - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) { + markAliasSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); + checkBlockScopedBindingCapturedInLoop(node, symbol); return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); } + function isInsideFunction(node, threshold) { + var current = node; + while (current && current !== threshold) { + if (ts.isFunctionLike(current)) { + return true; + } + current = current.parent; + } + return false; + } + function checkBlockScopedBindingCapturedInLoop(node, symbol) { + if (languageVersion >= 2 || + (symbol.flags & 2) === 0 || + symbol.valueDeclaration.parent.kind === 216) { + return; + } + var container = symbol.valueDeclaration; + while (container.kind !== 194) { + container = container.parent; + } + container = container.parent; + if (container.kind === 175) { + container = container.parent; + } + var inFunction = isInsideFunction(node.parent, container); + var current = container; + while (current && !ts.nodeStartsNewLexicalEnvironment(current)) { + if (isIterationStatement(current, false)) { + if (inFunction) { + grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node)); + } + getNodeLinks(symbol.valueDeclaration).flags |= 256; + break; + } + current = current.parent; + } + } function captureLexicalThis(node, container) { var classNode = container.parent && container.parent.kind === 196 ? container.parent : undefined; getNodeLinks(node).flags |= 2; @@ -11944,19 +12242,19 @@ var ts; if (container.flags & 128) { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135; + container.kind === 131 || + container.kind === 134 || + container.kind === 135; } else { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135 || - container.kind === 130 || - container.kind === 129 || - container.kind === 133; + container.kind === 131 || + container.kind === 134 || + container.kind === 135 || + container.kind === 130 || + container.kind === 129 || + container.kind === 133; } } } @@ -12141,7 +12439,9 @@ var ts; var type = getContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); - return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1); + return getTypeOfPropertyOfContextualType(type, "" + index) + || getIndexTypeOfContextualType(type, 1) + || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); } return undefined; } @@ -12205,7 +12505,9 @@ var ts; } function getContextualSignature(node) { ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node)); - var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node); + var type = ts.isObjectLiteralMethod(node) + ? getContextualTypeForObjectLiteralMethod(node) + : getContextualType(node); if (!type) { return undefined; } @@ -12331,7 +12633,9 @@ var ts; } else { ts.Debug.assert(memberDecl.kind === 218); - var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper); + var type = memberDecl.name.kind === 126 + ? unknownType + : checkExpression(memberDecl.name, contextualMapper); } typeFlags |= type.flags; var prop = createSymbol(4 | 67108864 | member.flags, member.name); @@ -12447,7 +12751,9 @@ var ts; return anyType; } function isValidPropertyAccess(node, propertyName) { - var left = node.kind === 153 ? node.expression : node.left; + var left = node.kind === 153 + ? node.expression + : node.left; var type = checkExpressionOrQualifiedName(left); if (type !== unknownType && type !== anyType) { var prop = getPropertyOfType(getWidenedType(type), propertyName); @@ -12741,7 +13047,9 @@ var ts; var arg = args[i]; if (arg.kind !== 172) { var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i); - var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); + var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : + arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : + checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) { return false; } @@ -13018,9 +13326,6 @@ var ts; return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { - if (languageVersion < 2) { - grammarErrorOnFirstToken(node.template, ts.Diagnostics.Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher); - } return getReturnTypeOfSignature(getResolvedSignature(node)); } function checkTypeAssertion(node) { @@ -13036,9 +13341,13 @@ var ts; } function getTypeAtPosition(signature, pos) { if (pos >= 0) { - return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; + return signature.hasRestParameter ? + pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; } - return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType; + return signature.hasRestParameter ? + getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : + anyArrayType; } function assignContextualParameterTypes(signature, context, mapper) { var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0); @@ -13179,7 +13488,7 @@ var ts; } return true; } - function checkReferenceExpression(n, invalidReferenceMessage, constantVarianleMessage) { + function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) { function findSymbol(n) { var symbol = getNodeLinks(n).resolvedSymbol; return symbol && getExportSymbolOfValueSymbolIfExported(symbol); @@ -13205,14 +13514,14 @@ var ts; case 64: case 153: var symbol = findSymbol(n); - return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 4096) !== 0; + return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 8192) !== 0; case 154: var index = n.argumentExpression; var symbol = findSymbol(n.expression); if (symbol && index && index.kind === 8) { var name = index.text; var prop = getPropertyOfType(getTypeOfSymbol(symbol), name); - return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 4096) !== 0; + return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 8192) !== 0; } return false; case 159: @@ -13226,7 +13535,7 @@ var ts; return false; } if (isConstVariableReference(n)) { - error(n, constantVarianleMessage); + error(n, constantVariableMessage); return false; } return true; @@ -13340,9 +13649,10 @@ var ts; var p = properties[i]; if (p.kind === 217 || p.kind === 218) { var name = p.name; - var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || - getIndexTypeOfType(sourceType, 0); + var type = sourceType.flags & 1 ? sourceType : + getTypeOfPropertyOfType(sourceType, name.text) || + isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || + getIndexTypeOfType(sourceType, 0); if (type) { checkDestructuringAssignment(p.initializer || name, type); } @@ -13367,7 +13677,9 @@ var ts; if (e.kind !== 172) { if (e.kind !== 171) { var propName = "" + i; - var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1); + var type = sourceType.flags & 1 ? sourceType : + isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : + getIndexTypeOfType(sourceType, 1); if (type) { checkDestructuringAssignment(e, type, contextualMapper); } @@ -13515,7 +13827,9 @@ var ts; return rightType; } function checkForDisallowedESSymbolOperand(operator) { - var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined; + var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : + someConstituentTypeHasKind(rightType, 1048576) ? node.right : + undefined; if (offendingSymbolOperand) { error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator)); return false; @@ -13626,8 +13940,8 @@ var ts; } if (isConstEnumObjectType(type)) { var ok = (node.parent.kind === 153 && node.parent.expression === node) || - (node.parent.kind === 154 && node.parent.expression === node) || - ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); + (node.parent.kind === 154 && node.parent.expression === node) || + ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); if (!ok) { error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment); } @@ -13777,7 +14091,7 @@ var ts; var declaration = indexSymbol.declarations[i]; if (declaration.parameters.length === 1 && declaration.parameters[0].type) { switch (declaration.parameters[0].type.kind) { - case 121: + case 120: if (!seenStringIndexer) { seenStringIndexer = true; } @@ -13785,7 +14099,7 @@ var ts; error(declaration, ts.Diagnostics.Duplicate_string_index_signature); } break; - case 119: + case 118: if (!seenNumericIndexer) { seenNumericIndexer = true; } @@ -13852,7 +14166,7 @@ var ts; if (ts.getClassBaseTypeNode(node.parent)) { if (containsSuperCall(node.body)) { var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || - ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); + ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); if (superCallShouldBeFirst) { var statements = node.body.statements; if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) { @@ -14174,13 +14488,15 @@ var ts; case 197: return 2097152; case 200: - return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304; + return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 + ? 4194304 | 1048576 + : 4194304; case 196: case 199: return 2097152 | 1048576; case 202: var result = 0; - var target = resolveImport(getSymbolOfNode(d)); + var target = resolveAlias(getSymbolOfNode(d)); ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); }); return result; default: @@ -14201,7 +14517,7 @@ var ts; } function checkFunctionLikeDeclaration(node) { checkSignatureDeclaration(node); - if (node.name.kind === 126) { + if (node.name && node.name.kind === 126) { checkComputedPropertyName(node.name); } if (!ts.hasDynamicName(node)) { @@ -14317,24 +14633,24 @@ var ts; } } function checkVarDeclaredNamesNotShadowed(node) { - if (node.initializer && (ts.getCombinedNodeFlags(node) & 6144) === 0) { + if (node.initializer && (ts.getCombinedNodeFlags(node) & 12288) === 0) { var symbol = getSymbolOfNode(node); if (symbol.flags & 1) { var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined); if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) { - if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 6144) { + if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) { var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194); var container = varDeclList.parent.kind === 175 && - varDeclList.parent.parent; + varDeclList.parent.parent; var namesShareScope = container && - (container.kind === 174 && ts.isAnyFunction(container.parent) || - (container.kind === 201 && container.kind === 200) || - container.kind === 220); + (container.kind === 174 && ts.isFunctionLike(container.parent) || + (container.kind === 201 && container.kind === 200) || + container.kind === 220); if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); - error(ts.getErrorSpanForNode(node), ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); + error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); } } } @@ -14490,33 +14806,127 @@ var ts; checkSourceElement(node.statement); } function checkForOfStatement(node) { - checkGrammarForOfStatement(node); + if (languageVersion < 2) { + grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); + return; + } + checkGrammarForInOrForOfStatement(node); + if (node.initializer.kind === 194) { + checkForInOrForOfVariableDeclaration(node); + } + else { + var varExpr = node.initializer; + var rightType = checkExpression(node.expression); + var iteratedType = checkIteratedType(rightType, node.expression); + if (varExpr.kind === 151 || varExpr.kind === 152) { + checkDestructuringAssignment(varExpr, iteratedType || unknownType); + } + else { + var leftType = checkExpression(varExpr); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant); + if (iteratedType) { + checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined); + } + } + } + checkSourceElement(node.statement); } function checkForInStatement(node) { checkGrammarForInOrForOfStatement(node); if (node.initializer.kind === 194) { - var variableDeclarationList = node.initializer; - if (variableDeclarationList.declarations.length >= 1) { - var decl = variableDeclarationList.declarations[0]; - checkVariableDeclaration(decl); + var variable = node.initializer.declarations[0]; + if (variable && ts.isBindingPattern(variable.name)) { + error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); } + checkForInOrForOfVariableDeclaration(node); } else { var varExpr = node.initializer; - var exprType = checkExpression(varExpr); - if (!allConstituentTypesHaveKind(exprType, 1 | 258)) { + var leftType = checkExpression(varExpr); + if (varExpr.kind === 151 || varExpr.kind === 152) { + error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); + } + else if (!allConstituentTypesHaveKind(leftType, 1 | 258)) { error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any); } else { - checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant); } } - var exprType = checkExpression(node.expression); - if (!allConstituentTypesHaveKind(exprType, 1 | 48128 | 512)) { + var rightType = checkExpression(node.expression); + if (!allConstituentTypesHaveKind(rightType, 1 | 48128 | 512)) { error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter); } checkSourceElement(node.statement); } + function checkForInOrForOfVariableDeclaration(iterationStatement) { + var variableDeclarationList = iterationStatement.initializer; + if (variableDeclarationList.declarations.length >= 1) { + var decl = variableDeclarationList.declarations[0]; + checkVariableDeclaration(decl); + } + } + function getTypeForVariableDeclarationInForOfStatement(forOfStatement) { + if (languageVersion < 2) { + return anyType; + } + var expressionType = getTypeOfExpression(forOfStatement.expression); + return checkIteratedType(expressionType, forOfStatement.expression) || anyType; + } + function checkIteratedType(iterable, expressionForError) { + ts.Debug.assert(languageVersion >= 2); + var iteratedType = getIteratedType(iterable, expressionForError); + if (expressionForError && iteratedType) { + var completeIterableType = globalIterableType !== emptyObjectType + ? createTypeReference(globalIterableType, [iteratedType]) + : emptyObjectType; + checkTypeAssignableTo(iterable, completeIterableType, expressionForError); + } + return iteratedType; + function getIteratedType(iterable, expressionForError) { + if (allConstituentTypesHaveKind(iterable, 1)) { + return undefined; + } + var iteratorFunction = getTypeOfPropertyOfType(iterable, ts.getPropertyNameForKnownSymbolName("iterator")); + if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, 1)) { + return undefined; + } + var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, 0) : emptyArray; + if (iteratorFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator); + } + return undefined; + } + var iterator = getUnionType(ts.map(iteratorFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iterator, 1)) { + return undefined; + } + var iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next"); + if (iteratorNextFunction && allConstituentTypesHaveKind(iteratorNextFunction, 1)) { + return undefined; + } + var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, 0) : emptyArray; + if (iteratorNextFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method); + } + return undefined; + } + var iteratorNextResult = getUnionType(ts.map(iteratorNextFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iteratorNextResult, 1)) { + return undefined; + } + var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value"); + if (!iteratorNextValue) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property); + } + return undefined; + } + return iteratorNextValue; + } + } function checkBreakOrContinueStatement(node) { checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node); } @@ -14592,7 +15002,7 @@ var ts; if (!checkGrammarStatementInAmbientContext(node)) { var current = node.parent; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { break; } if (current.kind === 189 && current.label.text === node.label.text) { @@ -14620,16 +15030,33 @@ var ts; checkBlock(node.tryBlock); var catchClause = node.catchClause; if (catchClause) { - if (catchClause.type) { - var sourceFile = ts.getSourceFileOfNode(node); - var colonStart = ts.skipTrivia(sourceFile.text, catchClause.name.end); - grammarErrorAtPos(sourceFile, colonStart, ":".length, ts.Diagnostics.Catch_clause_parameter_cannot_have_a_type_annotation); + if (catchClause.variableDeclaration) { + if (catchClause.variableDeclaration.name.kind !== 64) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier); + } + else if (catchClause.variableDeclaration.type) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation); + } + else if (catchClause.variableDeclaration.initializer) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer); + } + else { + var identifierName = catchClause.variableDeclaration.name.text; + var locals = catchClause.block.locals; + if (locals && ts.hasProperty(locals, identifierName)) { + var localSymbol = locals[identifierName]; + if (localSymbol && (localSymbol.flags & 2) !== 0) { + grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); + } + } + checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.variableDeclaration.name); + } } - checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.name); checkBlock(catchClause.block); } - if (node.finallyBlock) + if (node.finallyBlock) { checkBlock(node.finallyBlock); + } } function checkIndexConstraints(type) { var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1); @@ -14684,7 +15111,9 @@ var ts; errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0]; } if (errorNode && !isTypeAssignableTo(propertyType, indexType)) { - var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; + var errorMessage = indexKind === 0 + ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 + : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType)); } } @@ -14717,10 +15146,12 @@ var ts; } function checkClassDeclaration(node) { checkGrammarClassDeclarationHeritageClauses(node); - checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + if (node.name) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + } checkTypeParameters(node.typeParameters); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); var type = getDeclaredTypeOfSymbol(symbol); @@ -14733,10 +15164,10 @@ var ts; if (type.baseTypes.length) { if (produceDiagnostics) { var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); + checkTypeAssignableTo(type, baseType, node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, baseTypeNode.typeName, 107455)) { + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); + if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, 107455)) { error(baseTypeNode, ts.Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); } checkKindsOfPropertyMemberOverrides(type, baseType); @@ -14752,7 +15183,7 @@ var ts; if (t !== unknownType) { var declaredType = (t.flags & 4096) ? t.target : t; if (declaredType.flags & (1024 | 2048)) { - checkTypeAssignableTo(type, t, node.name, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); + checkTypeAssignableTo(type, t, node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); } else { error(typeRefNode, ts.Diagnostics.A_class_may_only_implement_another_class_or_interface); @@ -15100,21 +15531,15 @@ var ts; if (!ts.isInAmbientContext(node) && node.name.kind === 8) { grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names); } - else if (node.name.kind === 64 && node.body.kind === 201) { - var statements = node.body.statements; - for (var i = 0, n = statements.length; i < n; i++) { - var statement = statements[i]; - if (statement.kind === 208) { - grammarErrorOnNode(statement, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); - } - } - } } checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); - if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { + if (symbol.flags & 512 + && symbol.declarations.length > 1 + && !ts.isInAmbientContext(node) + && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); if (classOrFunc) { if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) { @@ -15150,7 +15575,9 @@ var ts; } var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8; if (node.parent.kind !== 220 && !inAmbientExternalModule) { - error(moduleName, node.kind === 209 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); + error(moduleName, node.kind === 209 ? + ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : + ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); return false; } if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) { @@ -15159,15 +15586,17 @@ var ts; } return true; } - function checkImportSymbol(node) { + function checkAliasSymbol(node) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | - (symbol.flags & 793056 ? 793056 : 0) | - (symbol.flags & 1536 ? 1536 : 0); + (symbol.flags & 793056 ? 793056 : 0) | + (symbol.flags & 1536 ? 1536 : 0); if (target.flags & excludedMeanings) { - var message = node.kind === 211 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; + var message = node.kind === 211 ? + ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : + ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; error(node, message, symbolToString(symbol)); } } @@ -15175,10 +15604,10 @@ var ts; function checkImportBinding(node) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); - checkImportSymbol(node); + checkAliasSymbol(node); } function checkImportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers); } if (checkExternalImportOrExportDeclaration(node)) { @@ -15200,50 +15629,107 @@ var ts; } function checkImportEqualsDeclaration(node) { checkGrammarModifiers(node); - if (ts.isInternalModuleImportEqualsDeclaration(node)) { + if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); - if (target !== unknownSymbol) { - if (target.flags & 107455) { - var moduleName = getFirstIdentifier(node.moduleReference); - if (resolveEntityName(node, moduleName, 107455 | 1536).flags & 1536) { - checkExpressionOrQualifiedName(node.moduleReference); - } - else { - error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); - } - } - if (target.flags & 793056) { - checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); - } + if (node.flags & 1) { + markExportAsReferenced(node); } - } - else { - if (checkExternalImportOrExportDeclaration(node)) { - checkImportBinding(node); + if (ts.isInternalModuleImportEqualsDeclaration(node)) { + var target = resolveAlias(getSymbolOfNode(node)); + if (target !== unknownSymbol) { + if (target.flags & 107455) { + var moduleName = getFirstIdentifier(node.moduleReference); + if (!(resolveEntityName(moduleName, 107455 | 1536).flags & 1536)) { + error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); + } + } + if (target.flags & 793056) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); + } + } } } } function checkExportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers); } if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { if (node.exportClause) { - ts.forEach(node.exportClause.elements, checkImportSymbol); + ts.forEach(node.exportClause.elements, checkExportSpecifier); } } } + function checkExportSpecifier(node) { + checkAliasSymbol(node); + if (!node.parent.parent.moduleSpecifier) { + markExportAsReferenced(node); + } + } function checkExportAssignment(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + var container = node.parent.kind === 220 ? node.parent : node.parent.parent; + if (container.kind === 200 && container.name.kind === 64) { + error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); + return; + } + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; - if (container.kind !== 220) { - container = container.parent; + if (node.expression.kind === 64) { + markExportAsReferenced(node); + } + else { + checkExpressionCached(node.expression); + } + checkExternalModuleExports(container); + } + function getModuleStatements(node) { + if (node.kind === 220) { + return node.statements; + } + if (node.kind === 200 && node.body.kind === 201) { + return node.body.statements; + } + return emptyArray; + } + function hasExportedMembers(moduleSymbol) { + var declarations = moduleSymbol.declarations; + for (var i = 0; i < declarations.length; i++) { + var statements = getModuleStatements(declarations[i]); + for (var j = 0; j < statements.length; j++) { + var node = statements[j]; + if (node.kind === 209) { + var exportClause = node.exportClause; + if (!exportClause) { + return true; + } + var specifiers = exportClause.elements; + for (var k = 0; k < specifiers.length; k++) { + var specifier = specifiers[k]; + if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) { + return true; + } + } + } + else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) { + return true; + } + } + } + } + function checkExternalModuleExports(node) { + var moduleSymbol = getSymbolOfNode(node); + var links = getSymbolLinks(moduleSymbol); + if (!links.exportsChecked) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + if (hasExportedMembers(moduleSymbol)) { + var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; + error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); + } + } + links.exportsChecked = true; } - checkTypeOfExportAssignmentSymbol(getSymbolOfNode(container)); } function checkSourceElement(node) { if (!node) @@ -15425,6 +15911,7 @@ var ts; case 196: case 199: case 219: + case 208: case 220: ts.forEachChild(node, checkFunctionExpressionBodies); break; @@ -15444,11 +15931,7 @@ var ts; ts.forEach(node.statements, checkSourceElement); checkFunctionExpressionBodies(node); if (ts.isExternalModule(node)) { - var symbol = getExportAssignmentSymbol(node.symbol); - if (symbol && symbol.flags & 8388608) { - getSymbolLinks(symbol).referenced = true; - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + checkExternalModuleExports(node); } if (potentialThisCollisions.length) { ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope); @@ -15537,11 +16020,6 @@ var ts; copySymbol(location.symbol, meaning); } break; - case 216: - if (location.name.text) { - copySymbol(location.symbol, meaning); - } - break; } memberFlags = location.flags; location = location.parent; @@ -15575,11 +16053,11 @@ var ts; return true; } switch (node.kind) { + case 111: + case 118: + case 120: case 112: - case 119: case 121: - case 113: - case 122: return true; case 98: return node.parent.kind !== 164; @@ -15638,7 +16116,7 @@ var ts; return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent; } if (nodeOnRightSide.parent.kind === 208) { - return nodeOnRightSide.parent.exportName === nodeOnRightSide && nodeOnRightSide.parent; + return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent; } return undefined; } @@ -15650,11 +16128,11 @@ var ts; (node.parent.kind === 153 && node.parent.name === node); } function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) { - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(entityName)) { + if (ts.isDeclarationName(entityName)) { return getSymbolOfNode(entityName.parent); } if (entityName.parent.kind === 208) { - return resolveEntityName(entityName.parent.parent, entityName, 107455 | 793056 | 1536 | 8388608); + return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608); } if (entityName.kind !== 153) { if (isInRightSideOfImportOrExportAssignment(entityName)) { @@ -15670,7 +16148,7 @@ var ts; } if (entityName.kind === 64) { var meaning = 107455 | 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } else if (entityName.kind === 153) { var symbol = getNodeLinks(entityName).resolvedSymbol; @@ -15690,7 +16168,7 @@ var ts; else if (isTypeReferenceIdentifier(entityName)) { var meaning = entityName.parent.kind === 139 ? 793056 : 1536; meaning |= 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } return undefined; } @@ -15698,11 +16176,13 @@ var ts; if (isInsideWithStatementBody(node)) { return undefined; } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { return getSymbolOfNode(node.parent); } if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) { - return node.parent.kind === 208 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node); + return node.parent.kind === 208 + ? getSymbolOfEntityNameOrPropertyAccessExpression(node) + : getSymbolOfPartOfRightHandSideOfImportEquals(node); } switch (node.kind) { case 64: @@ -15713,18 +16193,19 @@ var ts; case 90: var type = checkExpression(node); return type.symbol; - case 114: + case 113: var constructorDeclaration = node.parent; if (constructorDeclaration && constructorDeclaration.kind === 133) { return constructorDeclaration.parent.symbol; } return undefined; case 8: - if (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && - ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) { - var importSymbol = getSymbolOfNode(node.parent.parent); - var moduleType = getTypeOfSymbol(importSymbol); - return moduleType ? moduleType.symbol : undefined; + var moduleName; + if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && + ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || + ((node.parent.kind === 203 || node.parent.kind === 209) && + node.parent.moduleSpecifier === node)) { + return resolveExternalModuleName(node, node); } case 7: if (node.parent.kind == 154 && node.parent.argumentExpression === node) { @@ -15742,7 +16223,7 @@ var ts; } function getShorthandAssignmentValueSymbol(location) { if (location && location.kind === 218) { - return resolveEntityName(location, location.name, 107455); + return resolveEntityName(location.name, 107455); } return undefined; } @@ -15768,7 +16249,7 @@ var ts; var symbol = getSymbolOfNode(node); return getTypeOfSymbol(symbol); } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { var symbol = getSymbolInfo(node); return symbol && getTypeOfSymbol(symbol); } @@ -15845,6 +16326,10 @@ var ts; return generatedNames; function generateNames(node) { switch (node.kind) { + case 195: + case 196: + generateNameForFunctionOrClassDeclaration(node); + break; case 200: generateNameForModuleOrEnum(node); generateNames(node.body); @@ -15858,6 +16343,9 @@ var ts; case 209: generateNameForExportDeclaration(node); break; + case 208: + generateNameForExportAssignment(node); + break; case 220: case 201: ts.forEach(node.statements, generateNames); @@ -15868,27 +16356,17 @@ var ts; return ts.hasProperty(globals, name) || ts.hasProperty(sourceFile.identifiers, name) || ts.hasProperty(generatedNames, name); } function makeUniqueName(baseName) { - if (baseName.charCodeAt(0) !== 95) { - var baseName = "_" + baseName; - if (!isExistingName(baseName)) { - return generatedNames[baseName] = baseName; - } - } - if (baseName.charCodeAt(baseName.length - 1) !== 95) { - baseName += "_"; - } - var i = 1; - while (true) { - name = baseName + i; - if (!isExistingName(name)) { - return generatedNames[name] = name; - } - i++; - } + var name = ts.generateUniqueName(baseName, isExistingName); + return generatedNames[name] = name; } function assignGeneratedName(node, name) { getNodeLinks(node).generatedName = ts.unescapeIdentifier(name); } + function generateNameForFunctionOrClassDeclaration(node) { + if (!node.name) { + assignGeneratedName(node, makeUniqueName("default")); + } + } function generateNameForModuleOrEnum(node) { if (node.name.kind === 64) { var name = node.name.text; @@ -15897,7 +16375,8 @@ var ts; } function generateNameForImportOrExportDeclaration(node) { var expr = ts.getExternalModuleName(node); - var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; + var baseName = expr.kind === 8 ? + ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; assignGeneratedName(node, makeUniqueName(baseName)); } function generateNameForImportDeclaration(node) { @@ -15910,6 +16389,11 @@ var ts; generateNameForImportOrExportDeclaration(node); } } + function generateNameForExportAssignment(node) { + if (node.expression.kind !== 64) { + assignGeneratedName(node, makeUniqueName("default")); + } + } } function getGeneratedNameForNode(node) { var links = getNodeLinks(node); @@ -15924,8 +16408,8 @@ var ts; function getLocalNameForImportDeclaration(node) { return getGeneratedNameForNode(node); } - function getImportNameSubstitution(symbol) { - var declaration = getDeclarationOfImportSymbol(symbol); + function getAliasNameSubstitution(symbol) { + var declaration = getDeclarationOfAliasSymbol(symbol); if (declaration && declaration.kind === 207) { var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent); var propertyName = declaration.propertyName || declaration.name; @@ -15956,38 +16440,35 @@ var ts; return getExportNameSubstitution(exportSymbol, node.parent); } if (symbol.flags & 8388608) { - return getImportNameSubstitution(symbol); + return getAliasNameSubstitution(symbol); } } } - function getExportAssignmentName(node) { - var symbol = getExportAssignmentSymbol(getSymbolOfNode(node)); - return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol) ? symbolToString(symbol) : undefined; + function hasExportDefaultValue(node) { + var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node)); + return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol); } function isTopLevelValueImportEqualsWithEntityName(node) { if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) { return false; } - return isImportResolvedToValue(getSymbolOfNode(node)); + return isAliasResolvedToValue(getSymbolOfNode(node)); } - function isImportResolvedToValue(symbol) { - var target = resolveImport(symbol); + function isAliasResolvedToValue(symbol) { + var target = resolveAlias(symbol); return target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target); } function isConstEnumOrConstEnumOnlyModule(s) { return isConstEnumSymbol(s) || s.constEnumOnlyModule; } - function isReferencedImportDeclaration(node) { - if (isImportSymbolDeclaration(node)) { + function isReferencedAliasDeclaration(node) { + if (isAliasSymbolDeclaration(node)) { var symbol = getSymbolOfNode(node); if (getSymbolLinks(symbol).referenced) { return true; } - if (node.kind === 202 && node.flags & 1 && isImportResolvedToValue(symbol)) { - return true; - } } - return ts.forEachChild(node, isReferencedImportDeclaration); + return ts.forEachChild(node, isReferencedAliasDeclaration); } function isImplementationOfOverload(node) { if (ts.nodeIsPresent(node.body)) { @@ -16021,7 +16502,9 @@ var ts; } function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) { var symbol = getSymbolOfNode(declaration); - var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType; + var type = symbol && !(symbol.flags & (2048 | 131072)) + ? getTypeOfSymbol(symbol) + : unknownType; getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) { @@ -16032,12 +16515,38 @@ var ts; return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name); } + function getBlockScopedVariableId(n) { + ts.Debug.assert(!ts.nodeIsSynthesized(n)); + if (n.parent.kind === 153 && + n.parent.name === n) { + return undefined; + } + if (n.parent.kind === 150 && + n.parent.propertyName === n) { + return undefined; + } + var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || + n.parent.kind === 150 + ? getSymbolOfNode(n.parent) + : undefined; + var symbol = declarationSymbol || + getNodeLinks(n).resolvedSymbol || + resolveName(n, n.text, 2 | 8388608, undefined, undefined); + var isLetOrConst = symbol && + (symbol.flags & 2) && + symbol.valueDeclaration.parent.kind !== 216; + if (isLetOrConst) { + getSymbolLinks(symbol); + return symbol.id; + } + return undefined; + } function createResolver() { return { getGeneratedNameForNode: getGeneratedNameForNode, getExpressionNameSubstitution: getExpressionNameSubstitution, - getExportAssignmentName: getExportAssignmentName, - isReferencedImportDeclaration: isReferencedImportDeclaration, + hasExportDefaultValue: hasExportDefaultValue, + isReferencedAliasDeclaration: isReferencedAliasDeclaration, getNodeCheckFlags: getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible: isDeclarationVisible, @@ -16047,7 +16556,8 @@ var ts; isSymbolAccessible: isSymbolAccessible, isEntityNameVisible: isEntityNameVisible, getConstantValue: getConstantValue, - isUnknownIdentifier: isUnknownIdentifier + isUnknownIdentifier: isUnknownIdentifier, + getBlockScopedVariableId: getBlockScopedVariableId }; } function initializeTypeChecker() { @@ -16075,6 +16585,7 @@ var ts; globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray"); globalESSymbolType = getGlobalType("Symbol"); globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"); + globalIterableType = getGlobalType("Iterable", 1); } else { globalTemplateStringsArrayType = unknownType; @@ -16117,14 +16628,14 @@ var ts; for (var i = 0, n = node.modifiers.length; i < n; i++) { var modifier = node.modifiers[i]; switch (modifier.kind) { - case 109: case 108: case 107: + case 106: var text; - if (modifier.kind === 109) { + if (modifier.kind === 108) { text = "public"; } - else if (modifier.kind === 108) { + else if (modifier.kind === 107) { text = "protected"; lastProtected = modifier; } @@ -16143,7 +16654,7 @@ var ts; } flags |= ts.modifierToFlag(modifier.kind); break; - case 110: + case 109: if (flags & 128) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static"); } @@ -16171,7 +16682,7 @@ var ts; } flags |= 1; break; - case 115: + case 114: if (flags & 2) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare"); } @@ -16277,7 +16788,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter); } - if (parameter.flags & 243) { + if (parameter.flags & 499) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier); } if (parameter.questionToken) { @@ -16289,7 +16800,7 @@ var ts; if (!parameter.type) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation); } - if (parameter.type.kind !== 121 && parameter.type.kind !== 119) { + if (parameter.type.kind !== 120 && parameter.type.kind !== 118) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number); } if (!node.type) { @@ -16297,7 +16808,7 @@ var ts; } } function checkGrammarForIndexSignatureModifier(node) { - if (node.flags & 243) { + if (node.flags & 499) { grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members); } } @@ -16362,7 +16873,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); if (seenImplementsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen); } @@ -16385,7 +16896,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause); } checkGrammarHeritageClause(heritageClause); @@ -16482,29 +16993,28 @@ var ts; var variableList = forInOrOfStatement.initializer; if (!checkGrammarVariableDeclarationList(variableList)) { if (variableList.declarations.length > 1) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement + : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic); } var firstDeclaration = variableList.declarations[0]; if (firstDeclaration.initializer) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer + : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; return grammarErrorOnNode(firstDeclaration.name, diagnostic); } if (firstDeclaration.type) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation + : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; return grammarErrorOnNode(firstDeclaration, diagnostic); } } } return false; } - function checkGrammarForOfStatement(forOfStatement) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_not_currently_supported); - if (languageVersion < 2) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); - } - return checkGrammarForInOrForOfStatement(forOfStatement); - } function checkGrammarAccessor(accessor) { var kind = accessor.kind; if (languageVersion < 1) { @@ -16534,7 +17044,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter); } - else if (parameter.flags & 243) { + else if (parameter.flags & 499) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } else if (parameter.questionToken) { @@ -16599,13 +17109,14 @@ var ts; function checkGrammarBreakOrContinueStatement(node) { var current = node; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary); } switch (current.kind) { case 189: if (node.label && current.label.text === node.label.text) { - var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true); + var isMisplacedContinueLabel = node.kind === 184 + && !isIterationStatement(current.statement, true); if (isMisplacedContinueLabel) { return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement); } @@ -16626,11 +17137,15 @@ var ts; current = current.parent; } if (node.label) { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement + : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } else { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement + : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } } @@ -16647,16 +17162,17 @@ var ts; return checkGrammarEvalOrArgumentsInStrictMode(node, node.name); } function checkGrammarVariableDeclaration(node) { - if (ts.isInAmbientContext(node)) { - if (ts.isBindingPattern(node.name)) { - return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + if (node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) { + if (ts.isInAmbientContext(node)) { + if (ts.isBindingPattern(node.name)) { + return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + } + if (node.initializer) { + var equalsTokenLength = "=".length; + return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength, equalsTokenLength, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); + } } - if (node.initializer) { - return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); - } - } - else { - if (!node.initializer) { + else if (!node.initializer) { if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) { return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer); } @@ -16690,14 +17206,6 @@ var ts; if (!declarationList.declarations.length) { return grammarErrorAtPos(ts.getSourceFileOfNode(declarationList), declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty); } - if (languageVersion < 2) { - if (ts.isLet(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - else if (ts.isConst(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - } } function allowLetAndConstDeclarations(parent) { switch (parent.kind) { @@ -16737,7 +17245,7 @@ var ts; return false; } function checkGrammarEnumDeclaration(enumDecl) { - var enumIsConst = (enumDecl.flags & 4096) !== 0; + var enumIsConst = (enumDecl.flags & 8192) !== 0; var hasError = false; if (!enumIsConst) { var inConstantEnumMemberSection = true; @@ -16765,18 +17273,11 @@ var ts; function hasParseDiagnostics(sourceFile) { return sourceFile.parseDiagnostics.length > 0; } - function scanToken(scanner, pos) { - scanner.setTextPos(pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return start; - } function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - var start = scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, scanner.getTextPos() - start, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2)); return true; } } @@ -16789,16 +17290,17 @@ var ts; function grammarErrorOnNode(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var span = ts.getErrorSpanForNode(node); - var start = span.end > span.pos ? ts.skipTrivia(sourceFile.text, span.pos) : span.pos; - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, span.end - start, message, arg0, arg1, arg2)); + diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2)); return true; } } - function checkGrammarEvalOrArgumentsInStrictMode(contextNode, identifier) { - if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { - var name = ts.declarationNameToString(identifier); - return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, name); + function checkGrammarEvalOrArgumentsInStrictMode(contextNode, name) { + if (name && name.kind === 64) { + var identifier = name; + if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { + var nameText = ts.declarationNameToString(identifier); + return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, nameText); + } } } function checkGrammarConstructorTypeParameters(node) { @@ -16862,7 +17364,7 @@ var ts; return getNodeLinks(node).hasReportedStatementInAmbientContext = true; } var links = getNodeLinks(node); - if (!links.hasReportedStatementInAmbientContext && ts.isAnyFunction(node.parent)) { + if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) { return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts); } if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) { @@ -16876,7 +17378,7 @@ var ts; } } function checkGrammarNumbericLiteral(node) { - if (node.flags & 8192) { + if (node.flags & 16384) { if (node.parserContextFlags & 1) { return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode); } @@ -16888,9 +17390,8 @@ var ts; function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, scanner.getTextPos(), 0, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), 0, message, arg0, arg1, arg2)); return true; } } @@ -17019,7 +17520,9 @@ var ts; var lineCount = ts.getLineStarts(currentSourceFile).length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { - var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); + var nextLineStart = (currentLine + 1) === lineCount + ? currentSourceFile.text.length + 1 + : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); if (pos !== comment.pos) { if (firstCommentLineIndent === undefined) { firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); @@ -17097,7 +17600,8 @@ var ts; } else { ts.forEach(declarations, function (member) { - if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) { + if ((member.kind === 134 || member.kind === 135) + && (member.flags & 128) === (accessor.flags & 128)) { var memberName = ts.getPropertyNameForPropertyNameNode(member.name); var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name); if (memberName === accessorName) { @@ -17162,7 +17666,7 @@ var ts; var addedGlobalFileReference = false; ts.forEach(root.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, root, fileReference); - if (referencedFile && ((referencedFile.flags & 1024) || + if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) { writeReferencePath(referencedFile); @@ -17321,11 +17825,11 @@ var ts; } function emitType(type) { switch (type.kind) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 8: return writeTextOfNode(currentSourceFile, type); @@ -17415,8 +17919,8 @@ var ts; emitLines(node.statements); } function emitExportAssignment(node) { - write("export = "); - writeTextOfNode(currentSourceFile, node.exportName); + write(node.isExportEquals ? "export = " : "export default "); + writeTextOfNode(currentSourceFile, node.expression); write(";"); writeLine(); } @@ -17632,7 +18136,9 @@ var ts; function getHeritageClauseVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.parent.parent.kind === 196) { - diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; + diagnosticMessage = isImplementsList ? + ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : + ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; } else { diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; @@ -17725,17 +18231,31 @@ var ts; function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.kind === 193) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; } else if (node.kind === 130 || node.kind === 129) { if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; } } return diagnosticMessage !== undefined ? { @@ -17797,17 +18317,25 @@ var ts; } function getTypeAnnotationFromAccessor(accessor) { if (accessor) { - return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined; + return accessor.kind === 134 + ? accessor.type + : accessor.parameters.length > 0 + ? accessor.parameters[0].type + : undefined; } } function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (accessorWithTypeAnnotation.kind === 135) { if (accessorWithTypeAnnotation.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; } return { diagnosticMessage: diagnosticMessage, @@ -17817,10 +18345,18 @@ var ts; } else { if (accessorWithTypeAnnotation.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; } return { diagnosticMessage: diagnosticMessage, @@ -17902,28 +18438,48 @@ var ts; var diagnosticMessage; switch (node.kind) { case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 138: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 132: case 131: if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; break; default: ts.Debug.fail("This is unknown kind for signature: " + node.kind); @@ -17962,28 +18518,50 @@ var ts; var diagnosticMessage; switch (node.parent.kind) { case 133: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; break; case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 132: case 131: if (node.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } else if (node.parent.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; break; default: ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind); @@ -18035,7 +18613,11 @@ var ts; } } function writeReferencePath(referencedFile) { - var declFileName = referencedFile.flags & 1024 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var declFileName = referencedFile.flags & 2048 + ? referencedFile.fileName + : shouldEmitToOwnFile(referencedFile, compilerOptions) + ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") + : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false); referencePathsOutput += "/// " + newLine; } @@ -18087,12 +18669,16 @@ var ts; var increaseIndent = writer.increaseIndent; var decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var lastFrame; + var currentScopeNames; + var generatedBlockScopeNames; var extendsEmitted = false; var tempCount = 0; var tempVariables; var tempParameters; var externalImports; var exportSpecifiers; + var exportDefault; var writeEmittedFiles = writeJavaScriptFile; var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments; var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments; @@ -18124,6 +18710,53 @@ var ts; writeLine(); writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); return; + function enterNameScope() { + var names = currentScopeNames; + currentScopeNames = undefined; + if (names) { + lastFrame = { names: names, previous: lastFrame }; + return true; + } + return false; + } + function exitNameScope(popFrame) { + if (popFrame) { + currentScopeNames = lastFrame.names; + lastFrame = lastFrame.previous; + } + else { + currentScopeNames = undefined; + } + } + function generateUniqueNameForLocation(location, baseName) { + var name; + if (!isExistingName(location, baseName)) { + name = baseName; + } + else { + name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); }); + } + if (!currentScopeNames) { + currentScopeNames = {}; + } + return currentScopeNames[name] = name; + } + function isExistingName(location, name) { + if (!resolver.isUnknownIdentifier(location, name)) { + return true; + } + if (currentScopeNames && ts.hasProperty(currentScopeNames, name)) { + return true; + } + var frame = lastFrame; + while (frame) { + if (ts.hasProperty(frame.names, name)) { + return true; + } + frame = frame.previous; + } + return false; + } function initializeEmitterWithSourceMaps() { var sourceMapDir; var sourceMapSourceIndex = -1; @@ -18277,7 +18910,9 @@ var ts; node.kind === 199) { if (node.name) { var name = node.name; - scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text; + scopeName = name.kind === 126 + ? ts.getTextOfNode(name) + : node.name.text; } recordScopeNameStart(scopeName); } @@ -18383,13 +19018,13 @@ var ts; function createTempVariable(location, forLoopVariable) { var name = forLoopVariable ? "_i" : undefined; while (true) { - if (name && resolver.isUnknownIdentifier(location, name)) { + if (name && !isExistingName(location, name)) { break; } name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25); tempCount++; } - var result = ts.createNode(64); + var result = ts.createSynthesizedNode(64); result.text = name; return result; } @@ -18433,7 +19068,7 @@ var ts; emit(node); } } - function emitParenthesized(node, parenthesized) { + function emitParenthesizedIf(node, parenthesized) { if (parenthesized) { write("("); } @@ -18520,37 +19155,109 @@ var ts; emit(nodes[i]); } } - function isBinaryOrOctalIntegerLiteral(text) { - if (text.length <= 0) { - return false; - } - if (text.charCodeAt(1) === 66 || text.charCodeAt(1) === 98 || - text.charCodeAt(1) === 79 || text.charCodeAt(1) === 111) { - return true; + function isBinaryOrOctalIntegerLiteral(node, text) { + if (node.kind === 7 && text.length > 1) { + switch (text.charCodeAt(1)) { + case 98: + case 66: + case 111: + case 79: + return true; + } } return false; } function emitLiteral(node) { - var text = languageVersion < 2 && ts.isTemplateLiteralKind(node.kind) ? getTemplateLiteralAsStringLiteral(node) : node.parent ? ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node) : node.text; + var text = getLiteralText(node); if (compilerOptions.sourceMap && (node.kind === 8 || ts.isTemplateLiteralKind(node.kind))) { writer.writeLiteral(text); } - else if (languageVersion < 2 && node.kind === 7 && isBinaryOrOctalIntegerLiteral(text)) { + else if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) { write(node.text); } else { write(text); } } - function getTemplateLiteralAsStringLiteral(node) { - return '"' + ts.escapeString(node.text) + '"'; + function getLiteralText(node) { + if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) { + return getQuotedEscapedLiteralText('"', node.text, '"'); + } + if (node.parent) { + return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + } + switch (node.kind) { + case 8: + return getQuotedEscapedLiteralText('"', node.text, '"'); + case 10: + return getQuotedEscapedLiteralText('`', node.text, '`'); + case 11: + return getQuotedEscapedLiteralText('`', node.text, '${'); + case 12: + return getQuotedEscapedLiteralText('}', node.text, '${'); + case 13: + return getQuotedEscapedLiteralText('}', node.text, '`'); + case 7: + return node.text; + } + ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for."); + } + function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) { + return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; + } + function emitDownlevelRawTemplateLiteral(node) { + var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var isLast = node.kind === 10 || node.kind === 13; + text = text.substring(1, text.length - (isLast ? 1 : 2)); + text = text.replace(/\r\n?/g, "\n"); + text = ts.escapeString(text); + write('"' + text + '"'); + } + function emitDownlevelTaggedTemplateArray(node, literalEmitter) { + write("["); + if (node.template.kind === 10) { + literalEmitter(node.template); + } + else { + literalEmitter(node.template.head); + ts.forEach(node.template.templateSpans, function (child) { + write(", "); + literalEmitter(child.literal); + }); + } + write("]"); + } + function emitDownlevelTaggedTemplate(node) { + var tempVariable = createAndRecordTempVariable(node); + write("("); + emit(tempVariable); + write(" = "); + emitDownlevelTaggedTemplateArray(node, emit); + write(", "); + emit(tempVariable); + write(".raw = "); + emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral); + write(", "); + emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag)); + write("("); + emit(tempVariable); + if (node.template.kind === 169) { + ts.forEach(node.template.templateSpans, function (templateSpan) { + write(", "); + var needsParens = templateSpan.expression.kind === 167 + && templateSpan.expression.operatorToken.kind === 23; + emitParenthesizedIf(templateSpan.expression, needsParens); + }); + } + write("))"); } function emitTemplateExpression(node) { if (languageVersion >= 2) { ts.forEachChild(node, emit); return; } - var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent); + var emitOuterParens = ts.isExpression(node.parent) + && templateNeedsParens(node, node.parent); if (emitOuterParens) { write("("); } @@ -18561,11 +19268,12 @@ var ts; } for (var i = 0; i < node.templateSpans.length; i++) { var templateSpan = node.templateSpans[i]; - var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; + var needsParens = templateSpan.expression.kind !== 159 + && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; if (i > 0 || headEmitted) { write(" + "); } - emitParenthesized(templateSpan.expression, needsParens); + emitParenthesizedIf(templateSpan.expression, needsParens); if (templateSpan.literal.text.length !== 0) { write(" + "); emitLiteral(templateSpan.literal); @@ -18663,8 +19371,6 @@ var ts; return false; case 189: return node.parent.label === node; - case 216: - return node.parent.name === node; } } function emitExpressionIdentifier(node) { @@ -18676,7 +19382,18 @@ var ts; writeTextOfNode(currentSourceFile, node); } } + function getBlockScopedVariableId(node) { + return !ts.nodeIsSynthesized(node) && resolver.getBlockScopedVariableId(node); + } function emitIdentifier(node) { + var variableId = getBlockScopedVariableId(node); + if (variableId !== undefined && generatedBlockScopeNames) { + var text = generatedBlockScopeNames[variableId]; + if (text) { + write(text); + return; + } + } if (!node.parent) { write(node.text); } @@ -18739,7 +19456,7 @@ var ts; write("..."); emit(node.expression); } - function needsParenthesisForPropertyAccess(node) { + function needsParenthesisForPropertyAccessOrInvocation(node) { switch (node.kind) { case 64: case 151: @@ -18765,7 +19482,7 @@ var ts; var e = elements[pos]; if (e.kind === 171) { e = e.expression; - emitParenthesized(e, group === 0 && needsParenthesisForPropertyAccess(e)); + emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e)); pos++; } else { @@ -18804,24 +19521,18 @@ var ts; write("]"); } else { - emitListWithSpread(elements, (node.flags & 256) !== 0, elements.hasTrailingComma); + emitListWithSpread(elements, (node.flags & 512) !== 0, elements.hasTrailingComma); } } - function createSynthesizedNode(kind) { - var node = ts.createNode(kind); - node.pos = -1; - node.end = -1; - return node; - } function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) { var parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex); return emit(parenthesizedObjectLiteral); } function createDownlevelObjectLiteralWithComputedProperties(originalObjectLiteral, firstComputedPropertyIndex) { var tempVar = createAndRecordTempVariable(originalObjectLiteral); - var initialObjectLiteral = createSynthesizedNode(152); + var initialObjectLiteral = ts.createSynthesizedNode(152); initialObjectLiteral.properties = originalObjectLiteral.properties.slice(0, firstComputedPropertyIndex); - initialObjectLiteral.flags |= 256; + initialObjectLiteral.flags |= 512; var propertyPatches = createBinaryExpression(tempVar, 52, initialObjectLiteral); ts.forEach(originalObjectLiteral.properties, function (property) { var patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property); @@ -18829,7 +19540,7 @@ var ts; propertyPatches = createBinaryExpression(propertyPatches, 23, patchedProperty); } }); - propertyPatches = createBinaryExpression(propertyPatches, 23, tempVar); + propertyPatches = createBinaryExpression(propertyPatches, 23, createIdentifier(tempVar.text, true)); var result = createParenthesizedExpression(propertyPatches); return result; } @@ -18840,7 +19551,7 @@ var ts; function tryCreatePatchingPropertyAssignment(objectLiteral, tempVar, property) { var leftHandSide = createMemberAccessForPropertyName(tempVar, property.name); var maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property); - return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide); + return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide, true); } function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) { switch (property.kind) { @@ -18856,7 +19567,7 @@ var ts; if (firstAccessor !== property) { return undefined; } - var propertyDescriptor = createSynthesizedNode(152); + var propertyDescriptor = ts.createSynthesizedNode(152); var descriptorProperties = []; if (getAccessor) { var getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body)); @@ -18866,7 +19577,7 @@ var ts; var setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body)); descriptorProperties.push(setProperty); } - var trueExpr = createSynthesizedNode(94); + var trueExpr = ts.createSynthesizedNode(94); var enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr); descriptorProperties.push(enumerableTrue); var configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr); @@ -18879,7 +19590,7 @@ var ts; } } function createParenthesizedExpression(expression) { - var result = createSynthesizedNode(159); + var result = ts.createSynthesizedNode(159); result.expression = expression; return result; } @@ -18893,9 +19604,9 @@ var ts; result.end = -1; return result; } - function createBinaryExpression(left, operator, right) { - var result = createSynthesizedNode(167); - result.operatorToken = createSynthesizedNode(operator); + function createBinaryExpression(left, operator, right, startsOnNewLine) { + var result = ts.createSynthesizedNode(167, startsOnNewLine); + result.operatorToken = ts.createSynthesizedNode(operator); result.left = left; result.right = right; return result; @@ -18915,36 +19626,37 @@ var ts; } } function createPropertyAssignment(name, initializer) { - var result = createSynthesizedNode(217); + var result = ts.createSynthesizedNode(217); result.name = name; result.initializer = initializer; return result; } function createFunctionExpression(parameters, body) { - var result = createSynthesizedNode(160); + var result = ts.createSynthesizedNode(160); result.parameters = parameters; result.body = body; return result; } function createPropertyAccessExpression(expression, name) { - var result = createSynthesizedNode(153); + var result = ts.createSynthesizedNode(153); result.expression = expression; + result.dotToken = ts.createSynthesizedNode(20); result.name = name; return result; } function createElementAccessExpression(expression, argumentExpression) { - var result = createSynthesizedNode(154); + var result = ts.createSynthesizedNode(154); result.expression = expression; result.argumentExpression = argumentExpression; return result; } - function createIdentifier(name) { - var result = createSynthesizedNode(64); + function createIdentifier(name, startsOnNewLine) { + var result = ts.createSynthesizedNode(64, startsOnNewLine); result.text = name; return result; } function createCallExpression(invokedExpression, arguments) { - var result = createSynthesizedNode(155); + var result = ts.createSynthesizedNode(155); result.expression = invokedExpression; result.arguments = arguments; return result; @@ -19009,13 +19721,29 @@ var ts; } return false; } + function indentIfOnDifferentLines(parent, node1, node2) { + var isSynthesized = ts.nodeIsSynthesized(parent); + var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { + increaseIndent(); + writeLine(); + return true; + } + return false; + } function emitPropertyAccess(node) { if (tryEmitConstantValue(node)) { return; } emit(node.expression); + var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken); write("."); + indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name); emit(node.name); + if (indented) { + decreaseIndent(); + } } function emitQualifiedName(node) { emit(node.left); @@ -19129,26 +19857,33 @@ var ts; } } function emitTaggedTemplateExpression(node) { - emit(node.tag); - write(" "); - emit(node.template); + if (compilerOptions.target >= 2) { + emit(node.tag); + write(" "); + emit(node.template); + } + else { + emitDownlevelTaggedTemplate(node); + } } function emitParenExpression(node) { - if (node.expression.kind === 158) { - var operand = node.expression.expression; - while (operand.kind == 158) { - operand = operand.expression; - } - if (operand.kind !== 165 && - operand.kind !== 164 && - operand.kind !== 163 && - operand.kind !== 162 && - operand.kind !== 166 && - operand.kind !== 156 && - !(operand.kind === 155 && node.parent.kind === 156) && - !(operand.kind === 160 && node.parent.kind === 155)) { - emit(operand); - return; + if (!node.parent || node.parent.kind !== 161) { + if (node.expression.kind === 158) { + var operand = node.expression.expression; + while (operand.kind == 158) { + operand = operand.expression; + } + if (operand.kind !== 165 && + operand.kind !== 164 && + operand.kind !== 163 && + operand.kind !== 162 && + operand.kind !== 166 && + operand.kind !== 156 && + !(operand.kind === 155 && node.parent.kind === 156) && + !(operand.kind === 160 && node.parent.kind === 155)) { + emit(operand); + return; + } } } write("("); @@ -19194,48 +19929,58 @@ var ts; } else { emit(node.left); - if (node.operatorToken.kind !== 23) { + var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken); + if (!indented1 && node.operatorToken.kind !== 23) { write(" "); } write(ts.tokenToString(node.operatorToken.kind)); - var operatorEnd = ts.getLineAndCharacterOfPosition(currentSourceFile, node.operatorToken.end); - var rightStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.right.pos)); - var onDifferentLine = operatorEnd.line !== rightStart.line; - if (onDifferentLine) { - var exprStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); - var firstCharOfExpr = getFirstNonWhitespaceCharacterIndexOnLine(exprStart.line); - var shouldIndent = rightStart.character > firstCharOfExpr; - if (shouldIndent) { - increaseIndent(); - } - writeLine(); + if (!indented1) { + var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right); } - else { + if (!indented2) { write(" "); } emit(node.right); - if (shouldIndent) { + if (indented1 || indented2) { decreaseIndent(); } } } - function getFirstNonWhitespaceCharacterIndexOnLine(line) { - var lineStart = ts.getLineStarts(currentSourceFile)[line]; - var text = currentSourceFile.text; - for (var i = lineStart; i < text.length; i++) { - var ch = text.charCodeAt(i); - if (!ts.isWhiteSpace(text.charCodeAt(i)) || ts.isLineBreak(ch)) { - break; - } - } - return i - lineStart; + function synthesizedNodeStartsOnNewLine(node) { + return ts.nodeIsSynthesized(node) && node.startsOnNewLine; } function emitConditionalExpression(node) { emit(node.condition); - write(" ? "); + var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken); + if (!indent1) { + write(" "); + } + write("?"); + if (!indent1) { + var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue); + } + if (!indent2) { + write(" "); + } emit(node.whenTrue); - write(" : "); + if (indent1 || indent2) { + decreaseIndent(); + } + var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken); + if (!indent3) { + write(" "); + } + write(":"); + if (!indent3) { + var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse); + } + if (!indent4) { + write(" "); + } emit(node.whenFalse); + if (indent3 || indent4) { + decreaseIndent(); + } } function isSingleLineEmptyBlock(node) { if (node && node.kind === 174) { @@ -19279,7 +20024,7 @@ var ts; } } function emitExpressionStatement(node) { - emitParenthesized(node.expression, node.expression.kind === 161); + emitParenthesizedIf(node.expression, node.expression.kind === 161); write(";"); } function emitIfStatement(node) { @@ -19320,6 +20065,30 @@ var ts; write(")"); emitEmbeddedStatement(node.statement); } + function emitStartOfVariableDeclarationList(decl, startPos) { + var tokenKind = 97; + if (decl && languageVersion >= 2) { + if (ts.isLet(decl)) { + tokenKind = 104; + } + else if (ts.isConst(decl)) { + tokenKind = 69; + } + } + if (startPos !== undefined) { + emitToken(tokenKind, startPos); + } + else { + switch (tokenKind) { + case 97: + return write("var "); + case 104: + return write("let "); + case 69: + return write("const "); + } + } + } function emitForStatement(node) { var endPos = emitToken(81, node.pos); write(" "); @@ -19327,17 +20096,9 @@ var ts; if (node.initializer && node.initializer.kind === 194) { var variableDeclarationList = node.initializer; var declarations = variableDeclarationList.declarations; - if (declarations[0] && ts.isLet(declarations[0])) { - emitToken(105, endPos); - } - else if (declarations[0] && ts.isConst(declarations[0])) { - emitToken(69, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(declarations[0], endPos); write(" "); - emitCommaList(variableDeclarationList.declarations); + emitCommaList(declarations); } else if (node.initializer) { emit(node.initializer); @@ -19357,12 +20118,7 @@ var ts; var variableDeclarationList = node.initializer; if (variableDeclarationList.declarations.length >= 1) { var decl = variableDeclarationList.declarations[0]; - if (ts.isLet(decl)) { - emitToken(105, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(decl, endPos); write(" "); emit(decl); } @@ -19461,8 +20217,8 @@ var ts; var endPos = emitToken(67, node.pos); write(" "); emitToken(16, endPos); - emit(node.name); - emitToken(17, node.name.end); + emit(node.variableDeclaration); + emitToken(17, node.variableDeclaration ? node.variableDeclaration.end : endPos); write(" "); emitBlock(node.block); } @@ -19494,8 +20250,15 @@ var ts; emitNode(node.name); emitEnd(node.name); } + function createVoidZero() { + var zero = ts.createSynthesizedNode(7); + zero.text = "0"; + var result = ts.createSynthesizedNode(164); + result.expression = zero; + return result; + } function emitExportMemberAssignments(name) { - if (exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { + if (!exportDefault && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { ts.forEach(exportSpecifiers[name.text], function (specifier) { writeLine(); emitStart(specifier.name); @@ -19522,6 +20285,7 @@ var ts; if (emitCount++) { write(", "); } + renameNonTopLevelLetAndConst(name); if (name.parent && (name.parent.kind === 193 || name.parent.kind === 150)) { emitModuleMemberName(name.parent); } @@ -19542,27 +20306,25 @@ var ts; } return expr; } - function createVoidZero() { - var zero = ts.createNode(7); - zero.text = "0"; - var result = ts.createNode(164); - result.expression = zero; - return result; - } function createDefaultValueCheck(value, defaultValue) { value = ensureIdentifier(value); - var equals = ts.createNode(167); + var equals = ts.createSynthesizedNode(167); equals.left = value; - equals.operatorToken = ts.createNode(30); + equals.operatorToken = ts.createSynthesizedNode(30); equals.right = createVoidZero(); - var cond = ts.createNode(168); - cond.condition = equals; - cond.whenTrue = defaultValue; - cond.whenFalse = value; + return createConditionalExpression(equals, defaultValue, value); + } + function createConditionalExpression(condition, whenTrue, whenFalse) { + var cond = ts.createSynthesizedNode(168); + cond.condition = condition; + cond.questionToken = ts.createSynthesizedNode(50); + cond.whenTrue = whenTrue; + cond.colonToken = ts.createSynthesizedNode(51); + cond.whenFalse = whenFalse; return cond; } function createNumericLiteral(value) { - var node = ts.createNode(7); + var node = ts.createSynthesizedNode(7); node.text = "" + value; return node; } @@ -19570,7 +20332,7 @@ var ts; if (expr.kind === 64 || expr.kind === 153 || expr.kind === 154) { return expr; } - var node = ts.createNode(159); + var node = ts.createSynthesizedNode(159); node.expression = expr; return node; } @@ -19578,13 +20340,10 @@ var ts; if (propName.kind !== 64) { return createElementAccess(object, propName); } - var node = ts.createNode(153); - node.expression = parenthesizeForAccess(object); - node.name = propName; - return node; + return createPropertyAccessExpression(parenthesizeForAccess(object), propName); } function createElementAccess(object, index) { - var node = ts.createNode(154); + var node = ts.createSynthesizedNode(154); node.expression = parenthesizeForAccess(object); node.argumentExpression = index; return node; @@ -19706,8 +20465,19 @@ var ts; } } else { + var isLet = renameNonTopLevelLetAndConst(node.name); emitModuleMemberName(node); - emitOptional(" = ", node.initializer); + var initializer = node.initializer; + if (!initializer && languageVersion < 2) { + var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && + (getCombinedFlagsForIdentifier(node.name) & 4096); + if (isUninitializedLet && + node.parent.parent.kind !== 182 && + node.parent.parent.kind !== 183) { + initializer = createVoidZero(); + } + } + emitOptional(" = ", initializer); } } function emitExportVariableAssignments(node) { @@ -19719,17 +20489,64 @@ var ts; ts.forEach(name.elements, emitExportVariableAssignments); } } + function getEnclosingBlockScopeContainer(node) { + var current = node; + while (current) { + if (ts.isFunctionLike(current)) { + return current; + } + switch (current.kind) { + case 220: + case 91: + case 216: + case 200: + case 181: + case 182: + case 183: + return current; + case 174: + if (!ts.isFunctionLike(current.parent)) { + return current; + } + } + current = current.parent; + } + } + function getCombinedFlagsForIdentifier(node) { + if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return 0; + } + return ts.getCombinedNodeFlags(node.parent); + } + function renameNonTopLevelLetAndConst(node) { + if (languageVersion >= 2 || + ts.nodeIsSynthesized(node) || + node.kind !== 64 || + (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return; + } + var combinedFlags = getCombinedFlagsForIdentifier(node); + if (((combinedFlags & 12288) === 0) || combinedFlags & 1) { + return; + } + var list = ts.getAncestor(node, 194); + if (list.parent.kind === 175 && list.parent.parent.kind === 220) { + return; + } + var blockScopeContainer = getEnclosingBlockScopeContainer(node); + var parent = blockScopeContainer.kind === 220 + ? blockScopeContainer + : blockScopeContainer.parent; + var generatedName = generateUniqueNameForLocation(parent, node.text); + var variableId = resolver.getBlockScopedVariableId(node); + if (!generatedBlockScopeNames) { + generatedBlockScopeNames = []; + } + generatedBlockScopeNames[variableId] = generatedName; + } function emitVariableStatement(node) { if (!(node.flags & 1)) { - if (ts.isLet(node.declarationList)) { - write("let "); - } - else if (ts.isConst(node.declarationList)) { - write("const "); - } - else { - write("var "); - } + emitStartOfVariableDeclarationList(node.declarationList); } emitCommaList(node.declarationList.declarations); write(";"); @@ -19834,6 +20651,14 @@ var ts; function shouldEmitAsArrowFunction(node) { return node.kind === 161 && languageVersion >= 2; } + function emitDeclarationName(node) { + if (node.name) { + emitNode(node.name); + } + else { + write(resolver.getGeneratedNameForNode(node)); + } + } function emitFunctionDeclaration(node) { if (ts.nodeIsMissing(node.body)) { return emitPinnedOrTripleSlashComments(node); @@ -19845,10 +20670,10 @@ var ts; write("function "); } if (node.kind === 195 || (node.kind === 160 && node.name)) { - emit(node.name); + emitDeclarationName(node); } emitSignatureAndBody(node); - if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } if (node.kind !== 132 && node.kind !== 131) { @@ -19888,6 +20713,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); if (shouldEmitAsArrowFunction(node)) { emitSignatureParametersForArrow(node); write(" =>"); @@ -19904,15 +20730,16 @@ var ts; else { emitExpressionFunctionBody(node, node.body); } - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -19928,7 +20755,11 @@ var ts; return; } write(" "); - emit(body); + var current = body; + while (current.kind === 158) { + current = current.expression; + } + emitParenthesizedIf(body, current.kind === 152); } function emitDownLevelExpressionFunctionBody(node, body) { write(" {"); @@ -19967,45 +20798,15 @@ var ts; scopeEmitEnd(); } function emitBlockFunctionBody(node, body) { - if (body.statements.length === 0 && !anyParameterHasBindingPatternOrInitializer(node)) { - emitFunctionBodyWithNoStatements(node, body); - } - else { - emitFunctionBodyWithStatements(node, body); - } - } - function anyParameterHasBindingPatternOrInitializer(func) { - return ts.forEach(func.parameters, hasBindingPatternOrInitializer); - } - function hasBindingPatternOrInitializer(parameter) { - return parameter.initializer || ts.isBindingPattern(parameter.name); - } - function emitFunctionBodyWithNoStatements(node, body) { - var singleLine = isSingleLineEmptyBlock(node.body); - write(" {"); - if (singleLine) { - write(" "); - } - else { - increaseIndent(); - writeLine(); - } - emitLeadingCommentsOfPosition(body.statements.end); - if (!singleLine) { - decreaseIndent(); - } - emitToken(15, body.statements.end); - } - function emitFunctionBodyWithStatements(node, body) { write(" {"); scopeEmitStart(node); - var outPos = writer.getTextPos(); + var initialTextPos = writer.getTextPos(); increaseIndent(); emitDetachedComments(body.statements); var startIndex = emitDirectivePrologues(body.statements, true); emitFunctionBodyPreamble(node); decreaseIndent(); - var preambleEmitted = writer.getTextPos() !== outPos; + var preambleEmitted = writer.getTextPos() !== initialTextPos; if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { for (var i = 0, n = body.statements.length; i < n; i++) { write(" "); @@ -20078,7 +20879,7 @@ var ts; emitStart(member); emitStart(member.name); if (staticFlag) { - emitNode(node.name); + emitDeclarationName(node); } else { write("this"); @@ -20103,7 +20904,7 @@ var ts; emitLeadingComments(member); emitStart(member); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20124,7 +20925,7 @@ var ts; emitStart(member); write("Object.defineProperty("); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20169,7 +20970,7 @@ var ts; } function emitClassDeclaration(node) { write("var "); - emit(node.name); + emitDeclarationName(node); write(" = (function ("); var baseTypeNode = ts.getClassBaseTypeNode(node); if (baseTypeNode) { @@ -20182,7 +20983,7 @@ var ts; writeLine(); emitStart(baseTypeNode); write("__extends("); - emit(node.name); + emitDeclarationName(node); write(", _super);"); emitEnd(baseTypeNode); } @@ -20191,11 +20992,10 @@ var ts; emitMemberFunctions(node); emitMemberAssignments(node, 128); writeLine(); - function emitClassReturnStatement() { + emitToken(15, node.members.end, function () { write("return "); - emitNode(node.name); - } - emitToken(15, node.members.end, emitClassReturnStatement); + emitDeclarationName(node); + }); write(";"); decreaseIndent(); writeLine(); @@ -20208,16 +21008,16 @@ var ts; } write(");"); emitEnd(node); - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } - if (languageVersion < 2 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } function emitConstructorOfClass() { @@ -20227,6 +21027,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); ts.forEach(node.members, function (member) { if (member.kind === 133 && !member.body) { emitPinnedOrTripleSlashComments(member); @@ -20238,7 +21039,7 @@ var ts; } emitStart(ctor || node); write("function "); - emit(node.name); + emitDeclarationName(node); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); @@ -20286,6 +21087,7 @@ var ts; if (ctor) { emitTrailingComments(ctor); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20404,7 +21206,9 @@ var ts; var saveTempVariables = tempVariables; tempCount = 0; tempVariables = undefined; + var popFrame = enterNameScope(); emit(node.body); + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; } @@ -20493,7 +21297,7 @@ var ts; emitImportDeclaration(node); return; } - if (resolver.isReferencedImportDeclaration(node) || + if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); @@ -20589,17 +21393,29 @@ var ts; function createExternalModuleInfo(sourceFile) { externalImports = []; exportSpecifiers = {}; + exportDefault = undefined; ts.forEach(sourceFile.statements, function (node) { if (node.kind === 209 && !node.moduleSpecifier) { ts.forEach(node.exportClause.elements, function (specifier) { + if (specifier.name.text === "default") { + exportDefault = exportDefault || specifier; + } var name = (specifier.propertyName || specifier.name).text; (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier); }); } + else if (node.kind === 208) { + exportDefault = exportDefault || node; + } + else if (node.kind === 195 || node.kind === 196) { + if (node.flags & 1 && node.flags & 256) { + exportDefault = exportDefault || node; + } + } else { var info = createExternalImportInfo(node); if (info) { - if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedImportDeclaration(node)) { + if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) { externalImports.push(info); } } @@ -20680,18 +21496,7 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { - writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("return "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); - write(";"); - emitEnd(exportAssignment); - } + emitExportDefault(node, true); decreaseIndent(); writeLine(); write("});"); @@ -20700,17 +21505,24 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { + emitExportDefault(node, false); + } + function emitExportDefault(sourceFile, emitAsReturn) { + if (exportDefault && resolver.hasExportDefaultValue(sourceFile)) { writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("module.exports = "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emitStart(exportDefault); + write(emitAsReturn ? "return " : "module.exports = "); + if (exportDefault.kind === 208) { + emit(exportDefault.expression); + } + else if (exportDefault.kind === 211) { + emit(exportDefault.propertyName); + } + else { + emitDeclarationName(exportDefault); + } write(";"); - emitEnd(exportAssignment); + emitEnd(exportDefault); } } function emitDirectivePrologues(statements, startWithNewLine) { @@ -20761,6 +21573,7 @@ var ts; else { externalImports = undefined; exportSpecifiers = undefined; + exportDefault = undefined; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); @@ -21080,6 +21893,7 @@ var ts; var ts; (function (ts) { ts.emitTime = 0; + ts.ioReadTime = 0; function createCompilerHost(options) { var currentDirectory; var existingDirectories = {}; @@ -21089,11 +21903,15 @@ var ts; var unsupportedFileEncodingErrorCode = -2147024809; function getSourceFile(fileName, languageVersion, onError) { try { + var start = new Date().getTime(); var text = ts.sys.readFile(fileName, options.charset); + ts.ioReadTime += new Date().getTime() - start; } catch (e) { if (onError) { - onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message); + onError(e.number === unsupportedFileEncodingErrorCode + ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText + : e.message); } text = ""; } @@ -21226,8 +22044,9 @@ var ts; if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) { return { diagnostics: [], sourceMaps: undefined, emitSkipped: true }; } + var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile); var start = new Date().getTime(); - var emitResult = ts.emitFiles(getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile), getEmitHost(writeFileCallback), sourceFile); + var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile); ts.emitTime += new Date().getTime() - start; return emitResult; } @@ -21416,20 +22235,19 @@ var ts; } return; } - var firstExternalModule = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); - if (firstExternalModule && !options.module) { - var externalModuleErrorSpan = ts.getErrorSpanForNode(firstExternalModule.externalModuleIndicator); - var errorStart = ts.skipTrivia(firstExternalModule.text, externalModuleErrorSpan.pos); - var errorLength = externalModuleErrorSpan.end - errorStart; - diagnostics.add(ts.createFileDiagnostic(firstExternalModule, errorStart, errorLength, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); + var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); + if (firstExternalModuleSourceFile && !options.module) { + var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); } if (options.outDir || options.sourceRoot || (options.mapRoot && - (!options.out || firstExternalModule !== undefined))) { + (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents; ts.forEach(files, function (sourceFile) { - if (!(sourceFile.flags & 1024) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { + if (!(sourceFile.flags & 2048) + && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory()); sourcePathComponents.pop(); if (commonPathComponents) { @@ -21474,7 +22292,7 @@ var ts; var BreakpointResolver; (function (BreakpointResolver) { function spanInSourceFileAtLocation(sourceFile, position) { - if (sourceFile.flags & 1024) { + if (sourceFile.flags & 2048) { return undefined; } var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position); @@ -21578,9 +22396,13 @@ var ts; case 190: return textSpan(node, node.expression); case 208: - return textSpan(node, node.exportName); + return textSpan(node, node.expression); case 202: return textSpan(node, node.moduleReference); + case 203: + return textSpan(node, node.moduleSpecifier); + case 209: + return textSpan(node, node.moduleSpecifier); case 200: if (ts.getModuleInstanceState(node) !== 1) { return undefined; @@ -21627,7 +22449,7 @@ var ts; if (node.parent.kind === 158 && node.parent.type === node) { return spanInNode(node.parent.expression); } - if (ts.isAnyFunction(node.parent) && node.parent.type === node) { + if (ts.isFunctionLike(node.parent) && node.parent.type === node) { return spanInPreviousNode(node); } return spanInNode(node.parent); @@ -21640,7 +22462,11 @@ var ts; } var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175; var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration); - var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined; + var declarations = isParentVariableStatement + ? variableDeclaration.parent.parent.declarationList.declarations + : isDeclarationOfForStatement + ? variableDeclaration.parent.parent.initializer.declarations + : undefined; if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) { if (declarations && declarations[0] === variableDeclaration) { if (isParentVariableStatement) { @@ -21800,7 +22626,7 @@ var ts; return spanInNode(node.parent); } function spanInColonToken(node) { - if (ts.isAnyFunction(node.parent) || node.parent.kind === 217) { + if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) { return spanInPreviousNode(node); } return spanInNode(node.parent); @@ -22111,6 +22937,27 @@ var ts; case 149: ts.forEach(node.elements, visit); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + childNodes.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + childNodes.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; case 150: case 193: if (ts.isBindingPattern(node.name)) { @@ -22122,7 +22969,11 @@ var ts; case 197: case 200: case 195: + case 202: + case 207: + case 211: childNodes.push(node); + break; } } ts.forEach(nodes, visit); @@ -22235,7 +23086,7 @@ var ts; if (ts.isBindingPattern(node.name)) { break; } - if ((node.flags & 243) === 0) { + if ((node.flags & 499) === 0) { return undefined; } return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement); @@ -22287,6 +23138,12 @@ var ts; } case 133: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); + case 211: + case 207: + case 202: + case 204: + case 205: + return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias); } return undefined; function createItem(node, name, scriptElementKind) { @@ -22359,10 +23216,15 @@ var ts; return undefined; } hasGlobalNode = true; - var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : ""; + var rootName = ts.isExternalModule(node) + ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" + : ""; return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems); } function createClassItem(node) { + if (!node.name) { + return undefined; + } var childItems; if (node.members) { var constructor = ts.forEach(node.members, function (member) { @@ -22398,7 +23260,9 @@ var ts; return node; } function getNodeSpan(node) { - return node.kind === 220 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); + return node.kind === 220 + ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) + : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); } function getTextOfNode(node) { return ts.getTextOfNodeFromSourceText(sourceFile.text, node); @@ -22852,7 +23716,9 @@ var ts; function transitionFromLowerToUpper(identifier, word, index) { var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1)); var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index)); - var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper; + var transition = word + ? (currentIsUpper && !lastIsUpper) + : currentIsUpper; return transition; } })(ts || (ts = {})); @@ -22900,12 +23766,14 @@ var ts; var list = listItemInfo.list; var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos; var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1; + var argumentCount = getCommaBasedArgCount(list); + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: isTypeArgList ? 0 : 1, invocation: callExpression, argumentsSpan: getApplicableSpanForArguments(list), argumentIndex: argumentIndex, - argumentCount: getCommaBasedArgCount(list) + argumentCount: argumentCount }; } } @@ -22936,7 +23804,9 @@ var ts; return undefined; } function getCommaBasedArgCount(argumentsList) { - return argumentsList.getChildCount() === 0 ? 0 : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); + return argumentsList.getChildCount() === 0 + ? 0 + : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); } function getArgumentIndexForTemplatePiece(spanIndex, node) { ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node."); @@ -22949,7 +23819,10 @@ var ts; return spanIndex + 1; } function getArgumentListInfoForTemplate(tagExpression, argumentIndex) { - var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1; + var argumentCount = tagExpression.template.kind === 10 + ? 1 + : tagExpression.template.templateSpans.length + 1; + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: 2, invocation: tagExpression, @@ -23064,6 +23937,7 @@ var ts; if (selectedItemIndex < 0) { selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); } + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { items: items, applicableSpan: applicableSpan, @@ -23233,7 +24107,7 @@ var ts; for (var i = 0, len = children.length; i < len; ++i) { var child = children[i]; var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || - (child.pos === previousToken.end); + (child.pos === previousToken.end); if (shouldDiveInChildNode && nodeHasTokens(child)) { return find(child); } @@ -23311,7 +24185,7 @@ var ts; if (node.kind === 139 || node.kind === 155) { return node.typeArguments; } - if (ts.isAnyFunction(node) || node.kind === 196 || node.kind === 197) { + if (ts.isFunctionLike(node) || node.kind === 196 || node.kind === 197) { return node.typeParameters; } return undefined; @@ -23336,7 +24210,8 @@ var ts; } ts.isPunctuation = isPunctuation; function isInsideTemplateLiteral(node, position) { - return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); + return ts.isTemplateLiteralKind(node.kind) + && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); } ts.isInsideTemplateLiteral = isInsideTemplateLiteral; function compareDataObjects(dst, src) { @@ -23610,7 +24485,13 @@ var ts; token: undefined }; } - var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0; + var expectedScanAction = shouldRescanGreaterThanToken(n) + ? 1 + : shouldRescanSlashToken(n) + ? 2 + : shouldRescanTemplateToken(n) + ? 3 + : 0; if (lastTokenInfo && expectedScanAction === lastScanAction) { return fixTokenKind(lastTokenInfo, n); } @@ -23923,7 +24804,7 @@ var ts; this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([105, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); + this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8)); this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8)); @@ -23931,13 +24812,13 @@ var ts; this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2)); this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 120]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); + this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); - this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(114, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([117, 118]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 115, 76, 77, 78, 116, 103, 84, 104, 117, 107, 109, 120, 110]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 103])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2)); this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); @@ -23949,52 +24830,52 @@ var ts; this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8)); this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8)); this.HighPriorityCommonRules = - [ - this.IgnoreBeforeComment, this.IgnoreAfterLineComment, - this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, - this.NoSpaceAfterQuestionMark, - this.NoSpaceBeforeDot, this.NoSpaceAfterDot, - this.NoSpaceAfterUnaryPrefixOperator, - this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, - this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, - this.SpaceAfterPostincrementWhenFollowedByAdd, - this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, - this.SpaceAfterPostdecrementWhenFollowedBySubtract, - this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, - this.NoSpaceAfterCloseBrace, - this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, - this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, - this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, - this.NoSpaceBetweenReturnAndSemicolon, - this.SpaceAfterCertainKeywords, - this.SpaceAfterLetConstInVariableDeclaration, - this.NoSpaceBeforeOpenParenInFuncCall, - this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, - this.SpaceAfterVoidOperator, - this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, - this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, - this.SpaceAfterModuleName, - this.SpaceAfterArrow, - this.NoSpaceAfterEllipsis, - this.NoSpaceAfterOptionalParameters, - this.NoSpaceBetweenEmptyInterfaceBraceBrackets, - this.NoSpaceBeforeOpenAngularBracket, - this.NoSpaceBetweenCloseParenAndAngularBracket, - this.NoSpaceAfterOpenAngularBracket, - this.NoSpaceBeforeCloseAngularBracket, - this.NoSpaceAfterCloseAngularBracket - ]; + [ + this.IgnoreBeforeComment, this.IgnoreAfterLineComment, + this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, + this.NoSpaceAfterQuestionMark, + this.NoSpaceBeforeDot, this.NoSpaceAfterDot, + this.NoSpaceAfterUnaryPrefixOperator, + this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, + this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, + this.SpaceAfterPostincrementWhenFollowedByAdd, + this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, + this.SpaceAfterPostdecrementWhenFollowedBySubtract, + this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, + this.NoSpaceAfterCloseBrace, + this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, + this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, + this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, + this.NoSpaceBetweenReturnAndSemicolon, + this.SpaceAfterCertainKeywords, + this.SpaceAfterLetConstInVariableDeclaration, + this.NoSpaceBeforeOpenParenInFuncCall, + this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, + this.SpaceAfterVoidOperator, + this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, + this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, + this.SpaceAfterModuleName, + this.SpaceAfterArrow, + this.NoSpaceAfterEllipsis, + this.NoSpaceAfterOptionalParameters, + this.NoSpaceBetweenEmptyInterfaceBraceBrackets, + this.NoSpaceBeforeOpenAngularBracket, + this.NoSpaceBetweenCloseParenAndAngularBracket, + this.NoSpaceAfterOpenAngularBracket, + this.NoSpaceBeforeCloseAngularBracket, + this.NoSpaceAfterCloseAngularBracket + ]; this.LowPriorityCommonRules = - [ - this.NoSpaceBeforeSemicolon, - this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, - this.NoSpaceBeforeComma, - this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, - this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, - this.SpaceAfterSemicolon, - this.NoSpaceBeforeOpenParenInFuncDecl, - this.SpaceBetweenStatements, this.SpaceAfterTryFinally - ]; + [ + this.NoSpaceBeforeSemicolon, + this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, + this.NoSpaceBeforeComma, + this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, + this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, + this.SpaceAfterSemicolon, + this.NoSpaceBeforeOpenParenInFuncDecl, + this.SpaceBetweenStatements, this.SpaceAfterTryFinally + ]; this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); @@ -24322,13 +25203,19 @@ var ts; RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) { var position; if (rule.Operation.Action == 1) { - position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny; + position = specificTokens ? + 0 : + RulesPosition.IgnoreRulesAny; } else if (!rule.Operation.Context.IsAny()) { - position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny; + position = specificTokens ? + RulesPosition.ContextRulesSpecific : + RulesPosition.ContextRulesAny; } else { - position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny; + position = specificTokens ? + RulesPosition.NoContextRulesSpecific : + RulesPosition.NoContextRulesAny; } var state = constructionState[rulesBucketIndex]; if (state === undefined) { @@ -24450,7 +25337,7 @@ var ts; TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]); TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]); TokenRange.Comments = TokenRange.FromTokens([2, 3]); - TokenRange.TypeNames = TokenRange.FromTokens([64, 119, 121, 113, 122, 98, 112]); + TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]); return TokenRange; })(); Shared.TokenRange = TokenRange; @@ -24643,7 +25530,9 @@ var ts; if (!errors.length) { return rangeHasNoErrors; } - var sorted = errors.filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }).sort(function (e1, e2) { return e1.start - e2.start; }); + var sorted = errors + .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }) + .sort(function (e1, e2) { return e1.start - e2.start; }); if (!sorted.length) { return rangeHasNoErrors; } @@ -25013,8 +25902,8 @@ var ts; } } trimTrailingWhitespaces = - (rule.Operation.Action & (4 | 2)) && - rule.Flag !== 1; + (rule.Operation.Action & (4 | 2)) && + rule.Flag !== 1; } else { trimTrailingWhitespaces = true; @@ -25069,7 +25958,9 @@ var ts; var delta = indentation - nonWhitespaceColumnInFirstPart.column; for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) { var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile); - var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); + var nonWhitespaceCharacterAndColumn = i === 0 + ? nonWhitespaceColumnInFirstPart + : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); var newIndentation = nonWhitespaceCharacterAndColumn.column + delta; if (newIndentation > 0) { var indentationString = getIndentationString(newIndentation, options); @@ -25249,11 +26140,11 @@ var ts; return 0; } var precedingTokenIsLiteral = precedingToken.kind === 8 || - precedingToken.kind === 9 || - precedingToken.kind === 10 || - precedingToken.kind === 11 || - precedingToken.kind === 12 || - precedingToken.kind === 13; + precedingToken.kind === 9 || + precedingToken.kind === 10 || + precedingToken.kind === 11 || + precedingToken.kind === 12 || + precedingToken.kind === 13; if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) { return 0; } @@ -25314,7 +26205,7 @@ var ts; } parentStart = getParentStart(parent, current, sourceFile); var parentAndChildShareLine = parentStart.line === currentStart.line || - childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); + childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); if (useActualIndentation) { var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options); if (actualIndentation !== -1) { @@ -25339,12 +26230,16 @@ var ts; } function getActualIndentationForListItemBeforeComma(commaToken, sourceFile, options) { var commaItemInfo = ts.findListItemInfo(commaToken); - ts.Debug.assert(commaItemInfo && commaItemInfo.listItemIndex > 0); - return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + if (commaItemInfo && commaItemInfo.listItemIndex > 0) { + return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + } + else { + return -1; + } } function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) { var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && - (parent.kind === 220 || !parentAndChildShareLine); + (parent.kind === 220 || !parentAndChildShareLine); if (!useActualIndentation) { return -1; } @@ -25671,13 +26566,13 @@ var ts; while (pos < end) { var token = scanner.scan(); var textPos = scanner.getTextPos(); - nodes.push(createNode(token, pos, textPos, 512, this)); + nodes.push(createNode(token, pos, textPos, 1024, this)); pos = textPos; } return pos; }; NodeObject.prototype.createSyntaxList = function (nodes) { - var list = createNode(221, nodes.pos, nodes.end, 512, this); + var list = createNode(221, nodes.pos, nodes.end, 1024, this); list._children = []; var pos = nodes.pos; for (var i = 0, len = nodes.length; i < len; i++) { @@ -26099,7 +26994,9 @@ var ts; case 131: var functionDeclaration = node; if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) { - var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined; + var lastDeclaration = namedDeclarations.length > 0 ? + namedDeclarations[namedDeclarations.length - 1] : + undefined; if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) { if (functionDeclaration.body && !lastDeclaration.body) { namedDeclarations[namedDeclarations.length - 1] = functionDeclaration; @@ -26117,6 +27014,11 @@ var ts; case 199: case 200: case 202: + case 211: + case 207: + case 202: + case 204: + case 205: case 134: case 135: case 143: @@ -26151,6 +27053,27 @@ var ts; case 129: namedDeclarations.push(node); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + namedDeclarations.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + namedDeclarations.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; } }); this.namedDeclarations = namedDeclarations; @@ -26455,7 +27378,7 @@ var ts; var entry = entries[i]; sourceFiles.push({ name: i, - refCount: entry.refCount, + refCount: entry.languageServiceRefCount, references: entry.owners.slice(0) }); } @@ -26468,34 +27391,40 @@ var ts; return JSON.stringify(bucketInfoArray, null, 2); } function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, true); + } + function updateDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, false); + } + function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) { var bucket = getBucketForCompilationSettings(compilationSettings, true); var entry = ts.lookUp(bucket, fileName); if (!entry) { + ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false); bucket[fileName] = entry = { sourceFile: sourceFile, - refCount: 0, + languageServiceRefCount: 0, owners: [] }; } - entry.refCount++; - return entry.sourceFile; - } - function updateDocument(sourceFile, fileName, compilationSettings, scriptSnapshot, version, textChangeRange) { - var bucket = getBucketForCompilationSettings(compilationSettings, false); - ts.Debug.assert(bucket !== undefined); - var entry = ts.lookUp(bucket, fileName); - ts.Debug.assert(entry !== undefined); - entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, textChangeRange); + else { + if (entry.sourceFile.version !== version) { + entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot)); + } + } + if (acquiring) { + entry.languageServiceRefCount++; + } return entry.sourceFile; } function releaseDocument(fileName, compilationSettings) { var bucket = getBucketForCompilationSettings(compilationSettings, false); ts.Debug.assert(bucket !== undefined); var entry = ts.lookUp(bucket, fileName); - entry.refCount--; - ts.Debug.assert(entry.refCount >= 0); - if (entry.refCount === 0) { + entry.languageServiceRefCount--; + ts.Debug.assert(entry.languageServiceRefCount >= 0); + if (entry.languageServiceRefCount === 0) { delete bucket[fileName]; } } @@ -26526,31 +27455,111 @@ var ts; } }); } + function recordModuleName() { + var importPath = scanner.getTokenValue(); + var pos = scanner.getTokenPos(); + importedFiles.push({ + fileName: importPath, + pos: pos, + end: pos + importPath.length + }); + } function processImport() { scanner.setText(sourceText); var token = scanner.scan(); while (token !== 1) { if (token === 84) { token = scanner.scan(); - if (token === 64) { - token = scanner.scan(); - if (token === 52) { + if (token === 8) { + recordModuleName(); + continue; + } + else { + if (token === 64) { token = scanner.scan(); - if (token === 118) { + if (token === 123) { token = scanner.scan(); - if (token === 16) { + if (token === 8) { + recordModuleName(); + continue; + } + } + else if (token === 52) { + token = scanner.scan(); + if (token === 117) { token = scanner.scan(); - if (token === 8) { - var importPath = scanner.getTokenValue(); - var pos = scanner.getTokenPos(); - importedFiles.push({ - fileName: importPath, - pos: pos, - end: pos + importPath.length - }); + if (token === 16) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + continue; + } } } } + else if (token === 23) { + token = scanner.scan(); + } + else { + continue; + } + } + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 101) { + token = scanner.scan(); + if (token === 64) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + } + } + } + else if (token === 77) { + token = scanner.scan(); + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } } } } @@ -26618,7 +27627,7 @@ var ts; } function isNameOfFunctionDeclaration(node) { return node.kind === 64 && - ts.isAnyFunction(node.parent) && node.parent.name === node; + ts.isFunctionLike(node.parent) && node.parent.name === node; } function isNameOfPropertyAssignment(node) { return (node.kind === 64 || node.kind === 8 || node.kind === 7) && @@ -26713,7 +27722,11 @@ var ts; case 198: return ScriptElementKind.typeElement; case 199: return ScriptElementKind.enumElement; case 193: - return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement; + return ts.isConst(node) + ? ScriptElementKind.constElement + : ts.isLet(node) + ? ScriptElementKind.letElement + : ScriptElementKind.variableElement; case 195: return ScriptElementKind.functionElement; case 134: return ScriptElementKind.memberGetAccessorElement; case 135: return ScriptElementKind.memberSetAccessorElement; @@ -26730,6 +27743,12 @@ var ts; case 127: return ScriptElementKind.typeParameterElement; case 219: return ScriptElementKind.variableElement; case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement; + case 202: + case 207: + case 204: + case 211: + case 205: + return ScriptElementKind.alias; } return ScriptElementKind.unknown; } @@ -26807,11 +27826,7 @@ var ts; if (!changesInCompilationSettingsAffectSyntax) { var oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { - if (sourceFileUpToDate(oldSourceFile)) { - return oldSourceFile; - } - var textChangeRange = hostFileInformation.scriptSnapshot.getChangeRange(oldSourceFile.scriptSnapshot); - return documentRegistry.updateDocument(oldSourceFile, fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, textChangeRange); + return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); } } return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); @@ -26846,7 +27861,9 @@ var ts; } function dispose() { if (program) { - ts.forEach(program.getSourceFiles(), function (f) { documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); }); + ts.forEach(program.getSourceFiles(), function (f) { + return documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); + }); } } function getSyntacticDiagnostics(fileName) { @@ -26991,6 +28008,17 @@ var ts; getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession); } } + else if (ts.getAncestor(previousToken, 204)) { + isMemberCompletion = true; + isNewIdentifierLocation = true; + if (showCompletionsInImportsClause(previousToken)) { + var importDeclaration = ts.getAncestor(previousToken, 203); + ts.Debug.assert(importDeclaration !== undefined); + var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration); + var filteredExports = filterModuleExports(exports, importDeclaration); + getCompletionEntriesFromSymbols(filteredExports, activeCompletionSession); + } + } else { isMemberCompletion = false; isNewIdentifierLocation = isNewIdentifierDefinitionLocation(previousToken); @@ -27031,31 +28059,47 @@ var ts; log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start)); return result; } + function showCompletionsInImportsClause(node) { + if (node) { + if (node.kind === 14 || node.kind === 23) { + return node.parent.kind === 206; + } + } + return false; + } function isNewIdentifierDefinitionLocation(previousToken) { if (previousToken) { var containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case 23: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 151 + || containingNodeKind === 167; case 16: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 159; case 18: return containingNodeKind === 151; - case 117: + case 116: return true; case 20: return containingNodeKind === 200; case 14: return containingNodeKind === 196; case 52: - return containingNodeKind === 193 || containingNodeKind === 167; + return containingNodeKind === 193 + || containingNodeKind === 167; case 11: return containingNodeKind === 169; case 12: return containingNodeKind === 173; - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 130; } switch (previousToken.getText()) { @@ -27068,7 +28112,9 @@ var ts; return false; } function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) { - if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) { + if (previousToken.kind === 8 + || previousToken.kind === 9 + || ts.isTemplateLiteralKind(previousToken.kind)) { var start = previousToken.getStart(); var end = previousToken.getEnd(); if (start < position && position < end) { @@ -27146,27 +28192,27 @@ var ts; containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind); - case 110: + case 109: return containingNodeKind === 130; case 21: return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149); - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 128; case 68: case 76: - case 104: + case 103: case 82: case 97: - case 116: - case 120: + case 115: + case 119: case 84: - case 105: + case 104: case 69: - case 111: + case 110: return true; } switch (previousToken.getText()) { @@ -27191,6 +28237,23 @@ var ts; } return false; } + function filterModuleExports(exports, importDeclaration) { + var exisingImports = {}; + if (!importDeclaration.importClause) { + return exports; + } + if (importDeclaration.importClause.namedBindings && + importDeclaration.importClause.namedBindings.kind === 206) { + ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) { + var name = el.propertyName || el.name; + exisingImports[name.text] = true; + }); + } + if (ts.isEmpty(exisingImports)) { + return exports; + } + return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); }); + } function filterContextualMembersList(contextualMemberSymbols, existingMembers) { if (!existingMembers || existingMembers.length === 0) { return contextualMemberSymbols; @@ -27337,7 +28400,9 @@ var ts; return ScriptElementKind.unknown; } function getSymbolModifiers(symbol) { - return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none; + return symbol && symbol.declarations && symbol.declarations.length > 0 + ? ts.getNodeModifiers(symbol.declarations[0]) + : ScriptElementKindModifier.none; } function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) { if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); } @@ -27421,7 +28486,7 @@ var ts; } } else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || - (location.kind === 114 && location.parent.kind === 133)) { + (location.kind === 113 && location.parent.kind === 133)) { var signature; var functionDeclaration = location.parent; var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures(); @@ -27452,14 +28517,14 @@ var ts; } if ((symbolFlags & 64) && (semanticMeaning & 2)) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(104)); + displayParts.push(ts.keywordPart(103)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); writeTypeParametersOfSymbol(symbol, sourceFile); } if (symbolFlags & 524288) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(123)); + displayParts.push(ts.keywordPart(122)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); displayParts.push(ts.spacePart()); @@ -27479,7 +28544,7 @@ var ts; } if (symbolFlags & 1536) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(117)); + displayParts.push(ts.keywordPart(116)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); } @@ -27535,7 +28600,7 @@ var ts; displayParts.push(ts.spacePart()); displayParts.push(ts.operatorPart(52)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(118)); + displayParts.push(ts.keywordPart(117)); displayParts.push(ts.punctuationPart(16)); displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), 8)); displayParts.push(ts.punctuationPart(17)); @@ -27698,6 +28763,12 @@ var ts; if (!symbol) { return undefined; } + if (symbol.flags & 8388608) { + var declaration = symbol.declarations[0]; + if (node.kind === 64 && node.parent === declaration) { + symbol = typeInfoResolver.getAliasedSymbol(symbol); + } + } var result = []; if (node.parent.kind === 218) { var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); @@ -27754,7 +28825,7 @@ var ts; return false; } function tryAddConstructSignature(symbol, location, symbolKind, symbolName, containerName, result) { - if (isNewExpressionTarget(location) || location.kind === 114) { + if (isNewExpressionTarget(location) || location.kind === 113) { if (symbol.flags & 32) { var classDeclaration = symbol.getDeclarations()[0]; ts.Debug.assert(classDeclaration && classDeclaration.kind === 196); @@ -27839,13 +28910,13 @@ var ts; return getLoopBreakContinueOccurrences(node.parent); } break; - case 114: + case 113: if (hasKind(node.parent, 133)) { return getConstructorOccurrences(node.parent); } break; - case 116: - case 120: + case 115: + case 119: if (hasKind(node.parent, 134) || hasKind(node.parent, 135)) { return getGetAndSetOccurrences(node.parent); } @@ -27950,7 +29021,7 @@ var ts; aggregate(tryStatement.finallyBlock); } } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28043,7 +29114,7 @@ var ts; if (node.kind === 185 || node.kind === 184) { statementAccumulator.push(node); } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28070,7 +29141,7 @@ var ts; } break; default: - if (ts.isAnyFunction(node)) { + if (ts.isFunctionLike(node)) { return undefined; } break; @@ -28083,7 +29154,7 @@ var ts; var keywords = []; ts.forEach(declarations, function (declaration) { ts.forEach(declaration.getChildren(), function (token) { - return pushKeywordIf(keywords, token, 114); + return pushKeywordIf(keywords, token, 113); }); }); return ts.map(keywords, getReferenceEntryFromNode); @@ -28096,7 +29167,7 @@ var ts; function tryPushAccessorKeyword(accessorSymbol, accessorKind) { var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { - ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 116, 120); }); + ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); }); } } } @@ -28154,17 +29225,17 @@ var ts; return ts.map(keywords, getReferenceEntryFromNode); function getFlagFromModifier(modifier) { switch (modifier) { - case 109: - return 16; - case 107: - return 32; case 108: + return 16; + case 106: + return 32; + case 107: return 64; - case 110: + case 109: return 128; case 77: return 1; - case 115: + case 114: return 2; default: ts.Debug.fail(); @@ -28210,24 +29281,6 @@ var ts; ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8); return getReferencesForNode(node, program.getSourceFiles(), false, findInStrings, findInComments); } - function initializeNameTable(sourceFile) { - var nameTable = {}; - walk(sourceFile); - sourceFile.nameTable = nameTable; - function walk(node) { - switch (node.kind) { - case 64: - nameTable[node.text] = node.text; - break; - case 8: - case 7: - nameTable[node.text] = node.text; - break; - default: - ts.forEachChild(node, walk); - } - } - } function getReferencesForNode(node, sourceFiles, searchOnlyInCurrentFile, findInStrings, findInComments) { if (isLabelName(node)) { if (isJumpStatementTarget(node)) { @@ -28254,7 +29307,7 @@ var ts; } var result; var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); - var declaredName = getDeclaredName(symbol); + var declaredName = getDeclaredName(symbol, node); var scope = getSymbolScope(symbol); if (scope) { result = []; @@ -28267,14 +29320,11 @@ var ts; getReferencesInNode(sourceFiles[0], symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } else { - var internedName = getInternedName(symbol, declarations); + var internedName = getInternedName(symbol, node, declarations); ts.forEach(sourceFiles, function (sourceFile) { cancellationToken.throwIfCancellationRequested(); - if (!sourceFile.nameTable) { - initializeNameTable(sourceFile); - } - ts.Debug.assert(sourceFile.nameTable !== undefined); - if (ts.lookUp(sourceFile.nameTable, internedName)) { + var nameTable = getNameTable(sourceFile); + if (ts.lookUp(nameTable, internedName)) { result = result || []; getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } @@ -28282,11 +29332,31 @@ var ts; } } return result; - function getDeclaredName(symbol) { + function isImportOrExportSpecifierName(location) { + return location.parent && + (location.parent.kind === 207 || location.parent.kind === 211) && + location.parent.propertyName === location; + } + function isImportOrExportSpecifierImportSymbol(symbol) { + return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) { + return declaration.kind === 207 || declaration.kind === 211; + }); + } + function getDeclaredName(symbol, location) { + var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; }); + if (functionExpression && functionExpression.name) { + var name = functionExpression.name.text; + } + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var name = typeInfoResolver.symbolToString(symbol); return stripQuotes(name); } - function getInternedName(symbol, declarations) { + function getInternedName(symbol, location, declarations) { + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; }); if (functionExpression && functionExpression.name) { var name = functionExpression.name.text; @@ -28305,13 +29375,16 @@ var ts; return name; } function getSymbolScope(symbol) { - if (symbol.getFlags() && (4 | 8192)) { + if (symbol.flags & (4 | 8192)) { var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; }); if (privateDeclaration) { return ts.getAncestor(privateDeclaration, 196); } } - if (symbol.parent || (symbol.getFlags() & 268435456)) { + if (symbol.flags & 8388608) { + return undefined; + } + if (symbol.parent || (symbol.flags & 268435456)) { return undefined; } var scope = undefined; @@ -28562,6 +29635,9 @@ var ts; } function populateSearchSymbolSet(symbol, location) { var result = [symbol]; + if (isImportOrExportSpecifierImportSymbol(symbol)) { + result.push(typeInfoResolver.getAliasedSymbol(symbol)); + } if (isNameOfPropertyAssignment(location)) { ts.forEach(getPropertySymbolsFromContextualType(location), function (contextualSymbol) { result.push.apply(result, typeInfoResolver.getRootSymbols(contextualSymbol)); @@ -28611,6 +29687,10 @@ var ts; if (searchSymbols.indexOf(referenceSymbol) >= 0) { return true; } + if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && + searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) { + return true; + } if (isNameOfPropertyAssignment(referenceLocation)) { return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) { return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; }); @@ -28689,7 +29769,7 @@ var ts; }; } function isWriteAccess(node) { - if (node.kind === 64 && ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (node.kind === 64 && ts.isDeclarationName(node)) { return true; } var parent = node.parent; @@ -28766,11 +29846,17 @@ var ts; else { return 4; } + case 206: + case 207: case 202: + case 203: + case 208: + case 209: return 1 | 2 | 4; case 220: return 4 | 1; } + return 1 | 2 | 4; ts.Debug.fail("Unknown declaration type"); } function isTypeReference(node) { @@ -28811,7 +29897,7 @@ var ts; else if (isInRightSideOfImport(node)) { return getMeaningFromRightHandSideOfImportEquals(node); } - else if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + else if (ts.isDeclarationName(node)) { return getMeaningFromDeclaration(node.parent); } else if (isTypeReference(node)) { @@ -29320,6 +30406,41 @@ var ts; }; } ts.createLanguageService = createLanguageService; + function getNameTable(sourceFile) { + if (!sourceFile.nameTable) { + initializeNameTable(sourceFile); + } + return sourceFile.nameTable; + } + ts.getNameTable = getNameTable; + function initializeNameTable(sourceFile) { + var nameTable = {}; + walk(sourceFile); + sourceFile.nameTable = nameTable; + function walk(node) { + switch (node.kind) { + case 64: + nameTable[node.text] = node.text; + break; + case 8: + case 7: + if (ts.isDeclarationName(node) || + node.parent.kind === 212 || + isArgumentOfElementAccessExpression(node)) { + nameTable[node.text] = node.text; + } + break; + default: + ts.forEachChild(node, walk); + } + } + } + function isArgumentOfElementAccessExpression(node) { + return node && + node.parent && + node.parent.kind === 154 && + node.parent.argumentExpression === node; + } function createClassifier() { var scanner = ts.createScanner(2, false); var noRegexTable = []; @@ -29338,19 +30459,19 @@ var ts; var templateStack = []; function isAccessibilityModifier(kind) { switch (kind) { - case 109: - case 107: case 108: + case 106: + case 107: return true; } return false; } function canFollow(keyword1, keyword2) { if (isAccessibilityModifier(keyword1)) { - if (keyword2 === 116 || - keyword2 === 120 || - keyword2 === 114 || - keyword2 === 110) { + if (keyword2 === 115 || + keyword2 === 119 || + keyword2 === 113 || + keyword2 === 109) { return true; } return false; @@ -29415,11 +30536,11 @@ var ts; else if (token === 25 && angleBracketStack > 0) { angleBracketStack--; } - else if (token === 112 || - token === 121 || - token === 119 || - token === 113 || - token === 122) { + else if (token === 111 || + token === 120 || + token === 118 || + token === 112 || + token === 121) { if (angleBracketStack > 0 && !syntacticClassifierAbsent) { token = 64; } @@ -29470,7 +30591,9 @@ var ts; } if (numBackslashes & 1) { var quoteChar = tokenText.charCodeAt(0); - result.finalLexState = quoteChar === 34 ? 3 : 2; + result.finalLexState = quoteChar === 34 + ? 3 + : 2; } } } @@ -29704,13 +30827,7 @@ var ts; return this.compilationSettings; }; LSHost.prototype.getScriptFileNames = function () { - var filenames = []; - for (var filename in this.filenameToScript) { - if (this.filenameToScript[filename] && this.filenameToScript[filename].isOpen) { - filenames.push(filename); - } - } - return filenames; + return this.roots.map(function (root) { return root.fileName; }); }; LSHost.prototype.getScriptVersion = function (filename) { return this.getScriptInfo(filename).svc.latestVersion().toString(); @@ -29979,7 +31096,7 @@ var ts; var r = this.openFileRoots[i]; if (info.defaultProject.getSourceFile(r)) { this.inferredProjects = - copyListRemovingItem(r.defaultProject, this.inferredProjects); + copyListRemovingItem(r.defaultProject, this.inferredProjects); this.openFilesReferenced.push(r); r.defaultProject = info.defaultProject; } @@ -30044,15 +31161,20 @@ var ts; ProjectService.prototype.updateProjectStructure = function () { this.log("updating project structure from ...", "Info"); this.printProjects(); + var openFilesReferenced = []; + var unattachedOpenFiles = []; for (var i = 0, len = this.openFilesReferenced.length; i < len; i++) { - var refdFile = this.openFilesReferenced[i]; - refdFile.defaultProject.updateGraph(); - var sourceFile = refdFile.defaultProject.getSourceFile(refdFile); - if (!sourceFile) { - this.openFilesReferenced = copyListRemovingItem(refdFile, this.openFilesReferenced); - this.addOpenFile(refdFile); + var referencedFile = this.openFilesReferenced[i]; + referencedFile.defaultProject.updateGraph(); + var sourceFile = referencedFile.defaultProject.getSourceFile(referencedFile); + if (sourceFile) { + openFilesReferenced.push(referencedFile); + } + else { + unattachedOpenFiles.push(referencedFile); } } + this.openFilesReferenced = openFilesReferenced; var openFileRoots = []; for (var i = 0, len = this.openFileRoots.length; i < len; i++) { var rootFile = this.openFileRoots[i]; @@ -30068,6 +31190,9 @@ var ts; } } this.openFileRoots = openFileRoots; + for (var i = 0, len = unattachedOpenFiles.length; i < len; i++) { + this.addOpenFile(unattachedOpenFiles[i]); + } this.printProjects(); }; ProjectService.prototype.getScriptInfo = function (filename) { @@ -30562,6 +31687,7 @@ var ts; ScriptVersionCache.changeLengthThreshold = 256; return ScriptVersionCache; })(); + server.ScriptVersionCache = ScriptVersionCache; var LineIndexSnapshot = (function () { function LineIndexSnapshot(version, cache) { this.version = version; @@ -30643,7 +31769,7 @@ var ts; }; LineIndex.prototype.getText = function (rangeStart, rangeLength) { var accum = ""; - if (rangeLength > 0) { + if ((rangeLength > 0) && (rangeStart < this.root.charCount())) { this.walk(rangeStart, rangeLength, { goSubtree: true, done: false, @@ -30686,7 +31812,19 @@ var ts; var checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText); } var walker = new EditWalker(); - if (deleteLength > 0) { + if (pos >= this.root.charCount()) { + pos = this.root.charCount() - 1; + var endString = this.getText(pos, 1); + if (newText) { + newText = endString + newText; + } + else { + newText = endString; + } + deleteLength = 0; + walker.suppressTrailingText = true; + } + else if (deleteLength > 0) { var e = pos + deleteLength; var lineInfo = this.charOffsetToLineNumberAndPos(e); if ((lineInfo && (lineInfo.col == 0))) { @@ -30699,20 +31837,10 @@ var ts; } } } - else if (pos >= this.root.charCount()) { - var endString = this.getText(pos - 1, 1); - if (newText) { - newText = endString + newText; - } - else { - newText = endString; - } - pos = pos - 1; - deleteLength = 0; - walker.suppressTrailingText = true; + if (pos < this.root.charCount()) { + this.root.walk(pos, deleteLength, walker); + walker.insertLines(newText); } - this.root.walk(pos, deleteLength, walker); - walker.insertLines(newText); if (this.checkEdits) { var updatedText = this.getText(0, this.root.charCount()); ts.Debug.assert(checkText == updatedText, "buffer edit mismatch"); @@ -30770,6 +31898,7 @@ var ts; }; return LineIndex; })(); + server.LineIndex = LineIndex; var LineNode = (function () { function LineNode() { this.totalChars = 0; @@ -31214,17 +32343,27 @@ var ts; this.response(body, commandName, requestSequence, errorMessage); }; Session.prototype.semanticCheck = function (file, project) { - var diags = project.compilerService.languageService.getSemanticDiagnostics(file); - if (diags) { - var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); }); - this.event({ file: file, diagnostics: bakedDiags }, "semanticDiag"); + try { + var diags = project.compilerService.languageService.getSemanticDiagnostics(file); + if (diags) { + var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); }); + this.event({ file: file, diagnostics: bakedDiags }, "semanticDiag"); + } + } + catch (err) { + this.logError(err, "semantic check"); } }; Session.prototype.syntacticCheck = function (file, project) { - var diags = project.compilerService.languageService.getSyntacticDiagnostics(file); - if (diags) { - var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); }); - this.event({ file: file, diagnostics: bakedDiags }, "syntaxDiag"); + try { + var diags = project.compilerService.languageService.getSyntacticDiagnostics(file); + if (diags) { + var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); }); + this.event({ file: file, diagnostics: bakedDiags }, "syntaxDiag"); + } + } + catch (err) { + this.logError(err, "syntactic check"); } }; Session.prototype.errorCheck = function (file, project) { @@ -31317,11 +32456,11 @@ var ts; if (!renameLocations) { return undefined; } - var bakedRenameLocs = renameLocations.map(function (location) { return { + var bakedRenameLocs = renameLocations.map(function (location) { return ({ file: location.fileName, start: compilerService.host.positionToLineCol(location.fileName, location.textSpan.start), end: compilerService.host.positionToLineCol(location.fileName, ts.textSpanEnd(location.textSpan)) - }; }).sort(function (a, b) { + }); }).sort(function (a, b) { if (a.file < b.file) { return -1; } @@ -31530,6 +32669,7 @@ var ts; } }; Session.prototype.change = function (line, col, endLine, endCol, insertString, fileName) { + var _this = this; var file = ts.normalizePath(fileName); var project = this.projectService.getProjectForFile(file); if (project) { @@ -31540,6 +32680,7 @@ var ts; compilerService.host.editScript(file, start, end, insertString); this.changeSeq++; } + this.updateProjectStructure(this.changeSeq, function (n) { return n == _this.changeSeq; }); } }; Session.prototype.reload = function (fileName, tempFileName, reqSeq) { @@ -31938,6 +33079,10 @@ var ts; close: function () { return watchedFileSet.removeFile(watchedFile); } }; }; - new IOSession(ts.sys, logger).listen(); + var ioSession = new IOSession(ts.sys, logger); + process.on('uncaughtException', function (err) { + ioSession.logError(err, "unknown"); + }); + ioSession.listen(); })(server = ts.server || (ts.server = {})); })(ts || (ts = {})); diff --git a/bin/typescript.d.ts b/bin/typescript.d.ts index 8da331c74e1..3de69b45409 100644 --- a/bin/typescript.d.ts +++ b/bin/typescript.d.ts @@ -124,28 +124,28 @@ declare module "typescript" { WhileKeyword = 99, WithKeyword = 100, AsKeyword = 101, - FromKeyword = 102, - ImplementsKeyword = 103, - InterfaceKeyword = 104, - LetKeyword = 105, - PackageKeyword = 106, - PrivateKeyword = 107, - ProtectedKeyword = 108, - PublicKeyword = 109, - StaticKeyword = 110, - YieldKeyword = 111, - AnyKeyword = 112, - BooleanKeyword = 113, - ConstructorKeyword = 114, - DeclareKeyword = 115, - GetKeyword = 116, - ModuleKeyword = 117, - RequireKeyword = 118, - NumberKeyword = 119, - SetKeyword = 120, - StringKeyword = 121, - SymbolKeyword = 122, - TypeKeyword = 123, + ImplementsKeyword = 102, + InterfaceKeyword = 103, + LetKeyword = 104, + PackageKeyword = 105, + PrivateKeyword = 106, + ProtectedKeyword = 107, + PublicKeyword = 108, + StaticKeyword = 109, + YieldKeyword = 110, + AnyKeyword = 111, + BooleanKeyword = 112, + ConstructorKeyword = 113, + DeclareKeyword = 114, + GetKeyword = 115, + ModuleKeyword = 116, + RequireKeyword = 117, + NumberKeyword = 118, + SetKeyword = 119, + StringKeyword = 120, + SymbolKeyword = 121, + TypeKeyword = 122, + FromKeyword = 123, OfKeyword = 124, QualifiedName = 125, ComputedPropertyName = 126, @@ -251,8 +251,8 @@ declare module "typescript" { LastReservedWord = 100, FirstKeyword = 65, LastKeyword = 124, - FirstFutureReservedWord = 103, - LastFutureReservedWord = 111, + FirstFutureReservedWord = 102, + LastFutureReservedWord = 110, FirstTypeNode = 139, LastTypeNode = 147, FirstPunctuation = 14, @@ -276,15 +276,16 @@ declare module "typescript" { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -412,7 +413,7 @@ declare module "typescript" { body?: Block | Expression; } interface FunctionDeclaration extends FunctionLikeDeclaration, Statement { - name: Identifier; + name?: Identifier; body?: Block; } interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement { @@ -505,7 +506,9 @@ declare module "typescript" { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { @@ -515,6 +518,7 @@ declare module "typescript" { interface LiteralExpression extends PrimaryExpression { text: string; isUnterminated?: boolean; + hasExtendedUnicodeEscape?: boolean; } interface StringLiteralExpression extends LiteralExpression { _stringLiteralExpressionBrand: any; @@ -541,6 +545,7 @@ declare module "typescript" { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { @@ -636,16 +641,15 @@ declare module "typescript" { catchClause?: CatchClause; finallyBlock?: Block; } - interface CatchClause extends Declaration { - name: Identifier; - type?: TypeNode; + interface CatchClause extends Node { + variableDeclaration: VariableDeclaration; block: Block; } interface ModuleElement extends Node { _moduleElementBrand: any; } interface ClassDeclaration extends Declaration, ModuleElement { - name: Identifier; + name?: Identifier; typeParameters?: NodeArray; heritageClauses?: NodeArray; members: NodeArray; @@ -675,10 +679,7 @@ declare module "typescript" { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -703,7 +704,7 @@ declare module "typescript" { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -718,8 +719,9 @@ declare module "typescript" { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + interface ExportAssignment extends Declaration, ModuleElement { + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; @@ -727,7 +729,7 @@ declare module "typescript" { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -832,6 +834,7 @@ declare module "typescript" { getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean; getAliasedSymbol(symbol: Symbol): Symbol; + getExportsOfExternalModule(node: ImportDeclaration): Symbol[]; } interface SymbolDisplayBuilder { buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void; @@ -889,10 +892,10 @@ declare module "typescript" { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; - isReferencedImportDeclaration(node: Node): boolean; + hasExportDefaultValue(node: SourceFile): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -903,6 +906,7 @@ declare module "typescript" { isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; isUnknownIdentifier(location: Node, name: string): boolean; + getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { FunctionScopedVariable = 1, @@ -928,13 +932,14 @@ declare module "typescript" { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -959,7 +964,7 @@ declare module "typescript" { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, @@ -988,10 +993,9 @@ declare module "typescript" { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } @@ -1007,6 +1011,7 @@ declare module "typescript" { SuperStatic = 32, ContextChecked = 64, EnumValuesComputed = 128, + BlockScopedBindingInLoop = 256, } interface NodeLinks { resolvedType?: Type; @@ -1383,6 +1388,7 @@ declare module "typescript" { getTokenPos(): number; getTokenText(): string; getTokenValue(): string; + hasExtendedUnicodeEscape(): boolean; hasPrecedingLineBreak(): boolean; isIdentifier(): boolean; isReservedWord(): boolean; @@ -1479,9 +1485,6 @@ declare module "typescript" { getDocumentationComment(): SymbolDisplayPart[]; } interface SourceFile { - version: string; - scriptSnapshot: IScriptSnapshot; - nameTable: Map; getNamedDeclarations(): Declaration[]; getLineAndCharacterOfPosition(pos: number): LineAndCharacter; getLineStarts(): number[]; @@ -1835,25 +1838,17 @@ declare module "typescript" { acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile; /** * Request an updated version of an already existing SourceFile with a given fileName - * and compilationSettings. The update will intern call updateLanguageServiceSourceFile + * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile * to get an updated SourceFile. * - * Note: It is not allowed to call update on a SourceFile that was not acquired from this - * registry originally. - * - * @param sourceFile The original sourceFile object to update * @param fileName The name of the file requested * @param compilationSettings Some compilation settings like target affects the * shape of a the resulting SourceFile. This allows the DocumentRegistry to store * multiple copies of the same file for different compilation settings. - * @parm scriptSnapshot Text of the file. Only used if the file was not found - * in the registry and a new one was created. - * @parm version Current version of the file. Only used if the file was not found - * in the registry and a new one was created. - * @parm textChangeRange Change ranges since the last snapshot. Only used if the file - * was not found in the registry and a new one was created. + * @param scriptSnapshot Text of the file. + * @param version Current version of the file. */ - updateDocument(sourceFile: SourceFile, fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange): SourceFile; + updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile; /** * Informs the DocumentRegistry that a file is not needed any longer. * diff --git a/bin/typescript.js b/bin/typescript.js index 4ee694a8f19..f3c487b2079 100644 --- a/bin/typescript.js +++ b/bin/typescript.js @@ -118,28 +118,28 @@ var ts; SyntaxKind[SyntaxKind["WhileKeyword"] = 99] = "WhileKeyword"; SyntaxKind[SyntaxKind["WithKeyword"] = 100] = "WithKeyword"; SyntaxKind[SyntaxKind["AsKeyword"] = 101] = "AsKeyword"; - SyntaxKind[SyntaxKind["FromKeyword"] = 102] = "FromKeyword"; - SyntaxKind[SyntaxKind["ImplementsKeyword"] = 103] = "ImplementsKeyword"; - SyntaxKind[SyntaxKind["InterfaceKeyword"] = 104] = "InterfaceKeyword"; - SyntaxKind[SyntaxKind["LetKeyword"] = 105] = "LetKeyword"; - SyntaxKind[SyntaxKind["PackageKeyword"] = 106] = "PackageKeyword"; - SyntaxKind[SyntaxKind["PrivateKeyword"] = 107] = "PrivateKeyword"; - SyntaxKind[SyntaxKind["ProtectedKeyword"] = 108] = "ProtectedKeyword"; - SyntaxKind[SyntaxKind["PublicKeyword"] = 109] = "PublicKeyword"; - SyntaxKind[SyntaxKind["StaticKeyword"] = 110] = "StaticKeyword"; - SyntaxKind[SyntaxKind["YieldKeyword"] = 111] = "YieldKeyword"; - SyntaxKind[SyntaxKind["AnyKeyword"] = 112] = "AnyKeyword"; - SyntaxKind[SyntaxKind["BooleanKeyword"] = 113] = "BooleanKeyword"; - SyntaxKind[SyntaxKind["ConstructorKeyword"] = 114] = "ConstructorKeyword"; - SyntaxKind[SyntaxKind["DeclareKeyword"] = 115] = "DeclareKeyword"; - SyntaxKind[SyntaxKind["GetKeyword"] = 116] = "GetKeyword"; - SyntaxKind[SyntaxKind["ModuleKeyword"] = 117] = "ModuleKeyword"; - SyntaxKind[SyntaxKind["RequireKeyword"] = 118] = "RequireKeyword"; - SyntaxKind[SyntaxKind["NumberKeyword"] = 119] = "NumberKeyword"; - SyntaxKind[SyntaxKind["SetKeyword"] = 120] = "SetKeyword"; - SyntaxKind[SyntaxKind["StringKeyword"] = 121] = "StringKeyword"; - SyntaxKind[SyntaxKind["SymbolKeyword"] = 122] = "SymbolKeyword"; - SyntaxKind[SyntaxKind["TypeKeyword"] = 123] = "TypeKeyword"; + SyntaxKind[SyntaxKind["ImplementsKeyword"] = 102] = "ImplementsKeyword"; + SyntaxKind[SyntaxKind["InterfaceKeyword"] = 103] = "InterfaceKeyword"; + SyntaxKind[SyntaxKind["LetKeyword"] = 104] = "LetKeyword"; + SyntaxKind[SyntaxKind["PackageKeyword"] = 105] = "PackageKeyword"; + SyntaxKind[SyntaxKind["PrivateKeyword"] = 106] = "PrivateKeyword"; + SyntaxKind[SyntaxKind["ProtectedKeyword"] = 107] = "ProtectedKeyword"; + SyntaxKind[SyntaxKind["PublicKeyword"] = 108] = "PublicKeyword"; + SyntaxKind[SyntaxKind["StaticKeyword"] = 109] = "StaticKeyword"; + SyntaxKind[SyntaxKind["YieldKeyword"] = 110] = "YieldKeyword"; + SyntaxKind[SyntaxKind["AnyKeyword"] = 111] = "AnyKeyword"; + SyntaxKind[SyntaxKind["BooleanKeyword"] = 112] = "BooleanKeyword"; + SyntaxKind[SyntaxKind["ConstructorKeyword"] = 113] = "ConstructorKeyword"; + SyntaxKind[SyntaxKind["DeclareKeyword"] = 114] = "DeclareKeyword"; + SyntaxKind[SyntaxKind["GetKeyword"] = 115] = "GetKeyword"; + SyntaxKind[SyntaxKind["ModuleKeyword"] = 116] = "ModuleKeyword"; + SyntaxKind[SyntaxKind["RequireKeyword"] = 117] = "RequireKeyword"; + SyntaxKind[SyntaxKind["NumberKeyword"] = 118] = "NumberKeyword"; + SyntaxKind[SyntaxKind["SetKeyword"] = 119] = "SetKeyword"; + SyntaxKind[SyntaxKind["StringKeyword"] = 120] = "StringKeyword"; + SyntaxKind[SyntaxKind["SymbolKeyword"] = 121] = "SymbolKeyword"; + SyntaxKind[SyntaxKind["TypeKeyword"] = 122] = "TypeKeyword"; + SyntaxKind[SyntaxKind["FromKeyword"] = 123] = "FromKeyword"; SyntaxKind[SyntaxKind["OfKeyword"] = 124] = "OfKeyword"; SyntaxKind[SyntaxKind["QualifiedName"] = 125] = "QualifiedName"; SyntaxKind[SyntaxKind["ComputedPropertyName"] = 126] = "ComputedPropertyName"; @@ -245,8 +245,8 @@ var ts; SyntaxKind[SyntaxKind["LastReservedWord"] = 100] = "LastReservedWord"; SyntaxKind[SyntaxKind["FirstKeyword"] = 65] = "FirstKeyword"; SyntaxKind[SyntaxKind["LastKeyword"] = 124] = "LastKeyword"; - SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 103] = "FirstFutureReservedWord"; - SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 111] = "LastFutureReservedWord"; + SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 102] = "FirstFutureReservedWord"; + SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 110] = "LastFutureReservedWord"; SyntaxKind[SyntaxKind["FirstTypeNode"] = 139] = "FirstTypeNode"; SyntaxKind[SyntaxKind["LastTypeNode"] = 147] = "LastTypeNode"; SyntaxKind[SyntaxKind["FirstPunctuation"] = 14] = "FirstPunctuation"; @@ -271,15 +271,16 @@ var ts; NodeFlags[NodeFlags["Private"] = 32] = "Private"; NodeFlags[NodeFlags["Protected"] = 64] = "Protected"; NodeFlags[NodeFlags["Static"] = 128] = "Static"; - NodeFlags[NodeFlags["MultiLine"] = 256] = "MultiLine"; - NodeFlags[NodeFlags["Synthetic"] = 512] = "Synthetic"; - NodeFlags[NodeFlags["DeclarationFile"] = 1024] = "DeclarationFile"; - NodeFlags[NodeFlags["Let"] = 2048] = "Let"; - NodeFlags[NodeFlags["Const"] = 4096] = "Const"; - NodeFlags[NodeFlags["OctalLiteral"] = 8192] = "OctalLiteral"; - NodeFlags[NodeFlags["Modifier"] = 243] = "Modifier"; + NodeFlags[NodeFlags["Default"] = 256] = "Default"; + NodeFlags[NodeFlags["MultiLine"] = 512] = "MultiLine"; + NodeFlags[NodeFlags["Synthetic"] = 1024] = "Synthetic"; + NodeFlags[NodeFlags["DeclarationFile"] = 2048] = "DeclarationFile"; + NodeFlags[NodeFlags["Let"] = 4096] = "Let"; + NodeFlags[NodeFlags["Const"] = 8192] = "Const"; + NodeFlags[NodeFlags["OctalLiteral"] = 16384] = "OctalLiteral"; + NodeFlags[NodeFlags["Modifier"] = 499] = "Modifier"; NodeFlags[NodeFlags["AccessibilityModifier"] = 112] = "AccessibilityModifier"; - NodeFlags[NodeFlags["BlockScoped"] = 6144] = "BlockScoped"; + NodeFlags[NodeFlags["BlockScoped"] = 12288] = "BlockScoped"; })(ts.NodeFlags || (ts.NodeFlags = {})); var NodeFlags = ts.NodeFlags; (function (ParserContextFlags) { @@ -353,13 +354,14 @@ var ts; SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue"; SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType"; SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace"; - SymbolFlags[SymbolFlags["Import"] = 8388608] = "Import"; + SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias"; SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated"; SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged"; SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient"; SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype"; SymbolFlags[SymbolFlags["UnionProperty"] = 268435456] = "UnionProperty"; SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional"; + SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar"; SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum"; SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable"; SymbolFlags[SymbolFlags["Value"] = 107455] = "Value"; @@ -384,7 +386,7 @@ var ts; SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes"; SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530912] = "TypeParameterExcludes"; SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793056] = "TypeAliasExcludes"; - SymbolFlags[SymbolFlags["ImportExcludes"] = 8388608] = "ImportExcludes"; + SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes"; SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember"; SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal"; SymbolFlags[SymbolFlags["HasLocals"] = 255504] = "HasLocals"; @@ -404,6 +406,7 @@ var ts; NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 32] = "SuperStatic"; NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 64] = "ContextChecked"; NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 128] = "EnumValuesComputed"; + NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 256] = "BlockScopedBindingInLoop"; })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {})); var NodeCheckFlags = ts.NodeCheckFlags; (function (TypeFlags) { @@ -825,7 +828,9 @@ var ts; } ts.localizedDiagnosticMessages = undefined; function getLocaleSpecificMessage(message) { - return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message; + return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] + ? ts.localizedDiagnosticMessages[message] + : message; } ts.getLocaleSpecificMessage = getLocaleSpecificMessage; function createFileDiagnostic(file, start, length, message) { @@ -973,7 +978,9 @@ var ts; normalized.pop(); } else { - normalized.push(part); + if (part) { + normalized.push(part); + } } } } @@ -1116,7 +1123,7 @@ var ts; } ts.removeFileExtension = removeFileExtension; var backslashOrDoubleQuote = /[\"\\]/g; - var escapedCharsRegExp = /[\0-\19\t\v\f\b\0\r\n\u2028\u2029\u0085]/g; + var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; var escapedCharsMap = { "\0": "\\0", "\t": "\\t", @@ -1131,20 +1138,6 @@ var ts; "\u2029": "\\u2029", "\u0085": "\\u0085" }; - function escapeString(s) { - s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s; - s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; - return s; - function getReplacement(c) { - return escapedCharsMap[c] || unicodeEscape(c); - } - function unicodeEscape(c) { - var hexCharCode = c.charCodeAt(0).toString(16); - var paddedHexCode = ("0000" + hexCharCode).slice(-4); - return "\\u" + paddedHexCode; - } - } - ts.escapeString = escapeString; function getDefaultLibFileName(options) { return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; } @@ -1464,7 +1457,6 @@ var ts; Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." }, Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." }, Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." }, - Catch_clause_parameter_cannot_have_a_type_annotation: { code: 1013, category: 1, key: "Catch clause parameter cannot have a type annotation." }, A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." }, Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." }, A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." }, @@ -1572,7 +1564,6 @@ var ts; const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" }, const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." }, let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." }, - Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1159, category: 1, key: "Tagged templates are only available when targeting ECMAScript 6 and higher." }, Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." }, Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." }, An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." }, @@ -1609,6 +1600,11 @@ var ts; External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." }, An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." }, Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." }, + Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." }, + Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." }, + Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." }, + An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." }, + Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." }, Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." }, Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." }, Static_members_cannot_reference_class_type_parameters: { code: 2302, category: 1, key: "Static members cannot reference class type parameters." }, @@ -1782,6 +1778,14 @@ var ts; for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." }, The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." }, Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" }, + The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." }, + Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." }, + The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." }, + The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." }, + The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." }, + Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" }, Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, @@ -1851,6 +1855,7 @@ var ts; Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." }, + Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." }, The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." }, Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" }, @@ -1926,25 +1931,24 @@ var ts; You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." }, yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." }, Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." }, - The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }, - for_of_statements_are_not_currently_supported: { code: 9003, category: 1, key: "'for...of' statements are not currently supported." } + The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." } }; })(ts || (ts = {})); var ts; (function (ts) { var textToToken = { - "any": 112, + "any": 111, "as": 101, - "boolean": 113, + "boolean": 112, "break": 65, "case": 66, "catch": 67, "class": 68, "continue": 70, "const": 69, - "constructor": 114, + "constructor": 113, "debugger": 71, - "declare": 115, + "declare": 114, "default": 72, "delete": 73, "do": 74, @@ -1955,43 +1959,43 @@ var ts; "false": 79, "finally": 80, "for": 81, - "from": 102, + "from": 123, "function": 82, - "get": 116, + "get": 115, "if": 83, - "implements": 103, + "implements": 102, "import": 84, "in": 85, "instanceof": 86, - "interface": 104, - "let": 105, - "module": 117, + "interface": 103, + "let": 104, + "module": 116, "new": 87, "null": 88, - "number": 119, - "package": 106, - "private": 107, - "protected": 108, - "public": 109, - "require": 118, + "number": 118, + "package": 105, + "private": 106, + "protected": 107, + "public": 108, + "require": 117, "return": 89, - "set": 120, - "static": 110, - "string": 121, + "set": 119, + "static": 109, + "string": 120, "super": 90, "switch": 91, - "symbol": 122, + "symbol": 121, "this": 92, "throw": 93, "true": 94, "try": 95, - "type": 123, + "type": 122, "typeof": 96, "var": 97, "void": 98, "while": 99, "with": 100, - "yield": 111, + "yield": 110, "of": 124, "{": 14, "}": 15, @@ -2071,11 +2075,15 @@ var ts; return false; } function isUnicodeIdentifierStart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierStart) : + lookupInUnicodeMap(code, unicodeES3IdentifierStart); } ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart; function isUnicodeIdentifierPart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierPart) : + lookupInUnicodeMap(code, unicodeES3IdentifierPart); } function makeReverseMap(source) { var result = []; @@ -2364,6 +2372,7 @@ var ts; var token; var tokenValue; var precedingLineBreak; + var hasExtendedUnicodeEscape; var tokenIsUnterminated; function error(message, length) { if (onError) { @@ -2413,10 +2422,16 @@ var ts; } return +(text.substring(start, pos)); } - function scanHexDigits(count, mustMatchCount) { + function scanExactNumberOfHexDigits(count) { + return scanHexDigits(count, false); + } + function scanMinimumNumberOfHexDigits(count) { + return scanHexDigits(count, true); + } + function scanHexDigits(minCount, scanAsManyAsPossible) { var digits = 0; var value = 0; - while (digits < count || !mustMatchCount) { + while (digits < minCount || scanAsManyAsPossible) { var ch = text.charCodeAt(pos); if (ch >= 48 && ch <= 57) { value = value * 16 + ch - 48; @@ -2433,7 +2448,7 @@ var ts; pos++; digits++; } - if (digits < count) { + if (digits < minCount) { value = -1; } return value; @@ -2546,16 +2561,15 @@ var ts; return "\'"; case 34: return "\""; - case 120: case 117: - var ch = scanHexDigits(ch === 120 ? 2 : 4, true); - if (ch >= 0) { - return String.fromCharCode(ch); - } - else { - error(ts.Diagnostics.Hexadecimal_digit_expected); - return ""; + if (pos < len && text.charCodeAt(pos) === 123) { + hasExtendedUnicodeEscape = true; + pos++; + return scanExtendedUnicodeEscape(); } + return scanHexadecimalEscape(4); + case 120: + return scanHexadecimalEscape(2); case 13: if (pos < len && text.charCodeAt(pos) === 10) { pos++; @@ -2568,11 +2582,57 @@ var ts; return String.fromCharCode(ch); } } + function scanHexadecimalEscape(numDigits) { + var escapedValue = scanExactNumberOfHexDigits(numDigits); + if (escapedValue >= 0) { + return String.fromCharCode(escapedValue); + } + else { + error(ts.Diagnostics.Hexadecimal_digit_expected); + return ""; + } + } + function scanExtendedUnicodeEscape() { + var escapedValue = scanMinimumNumberOfHexDigits(1); + var isInvalidExtendedEscape = false; + if (escapedValue < 0) { + error(ts.Diagnostics.Hexadecimal_digit_expected); + isInvalidExtendedEscape = true; + } + else if (escapedValue > 0x10FFFF) { + error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive); + isInvalidExtendedEscape = true; + } + if (pos >= len) { + error(ts.Diagnostics.Unexpected_end_of_text); + isInvalidExtendedEscape = true; + } + else if (text.charCodeAt(pos) == 125) { + pos++; + } + else { + error(ts.Diagnostics.Unterminated_Unicode_escape_sequence); + isInvalidExtendedEscape = true; + } + if (isInvalidExtendedEscape) { + return ""; + } + return utf16EncodeAsString(escapedValue); + } + function utf16EncodeAsString(codePoint) { + ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF); + if (codePoint <= 65535) { + return String.fromCharCode(codePoint); + } + var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800; + var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00; + return String.fromCharCode(codeUnit1, codeUnit2); + } function peekUnicodeEscape() { if (pos + 5 < len && text.charCodeAt(pos + 1) === 117) { var start = pos; pos += 2; - var value = scanHexDigits(4, true); + var value = scanExactNumberOfHexDigits(4); pos = start; return value; } @@ -2634,6 +2694,7 @@ var ts; } function scan() { startPos = pos; + hasExtendedUnicodeEscape = false; precedingLineBreak = false; tokenIsUnterminated = false; while (true) { @@ -2785,7 +2846,7 @@ var ts; case 48: if (pos + 2 < len && (text.charCodeAt(pos + 1) === 88 || text.charCodeAt(pos + 1) === 120)) { pos += 2; - var value = scanHexDigits(1, false); + var value = scanMinimumNumberOfHexDigits(1); if (value < 0) { error(ts.Diagnostics.Hexadecimal_digit_expected); value = 0; @@ -3055,6 +3116,7 @@ var ts; getTokenPos: function () { return tokenPos; }, getTokenText: function () { return text.substring(tokenPos, pos); }, getTokenValue: function () { return tokenValue; }, + hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; }, hasPrecedingLineBreak: function () { return precedingLineBreak; }, isIdentifier: function () { return token === 64 || token > 100; }, isReservedWord: function () { return token >= 65 && token <= 100; }, @@ -3203,35 +3265,51 @@ var ts; return ts.getBaseFileName(moduleName).replace(/\W/g, "_"); } ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 12288) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + function isCatchClauseVariableDeclaration(declaration) { + return declaration && + declaration.kind === 193 && + declaration.parent && + declaration.parent.kind === 216; + } + ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; function declarationNameToString(name) { return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); } ts.declarationNameToString = declarationNameToString; function createDiagnosticForNode(node, message, arg0, arg1, arg2) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = getTokenPosOfNode(node, file); - var length = node.end - start; - return ts.createFileDiagnostic(file, start, length, message, arg0, arg1, arg2); + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); } ts.createDiagnosticForNode = createDiagnosticForNode; function createDiagnosticForNodeFromMessageChain(node, messageChain) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = ts.skipTrivia(file.text, node.pos); - var length = node.end - start; + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); return { - file: file, - start: start, - length: length, + file: sourceFile, + start: span.start, + length: span.length, code: messageChain.code, category: messageChain.category, messageText: messageChain.next ? messageChain : messageChain.messageText }; } ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; - function getErrorSpanForNode(node) { - var errorSpan; + function getSpanOfTokenAtPosition(sourceFile, pos) { + var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.text); + scanner.setTextPos(pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return createTextSpanFromBounds(start, scanner.getTextPos()); + } + ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; + function getErrorSpanForNode(sourceFile, node) { + var errorNode = node; switch (node.kind) { case 193: case 150: @@ -3240,10 +3318,18 @@ var ts; case 200: case 199: case 219: - errorSpan = node.name; + case 195: + case 160: + errorNode = node.name; break; } - return errorSpan && errorSpan.pos < errorSpan.end ? errorSpan : node; + if (errorNode === undefined) { + return getSpanOfTokenAtPosition(sourceFile, node.pos); + } + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : ts.skipTrivia(sourceFile.text, errorNode.pos); + return createTextSpanFromBounds(pos, errorNode.end); } ts.getErrorSpanForNode = getErrorSpanForNode; function isExternalModule(file) { @@ -3251,7 +3337,7 @@ var ts; } ts.isExternalModule = isExternalModule; function isDeclarationFile(file) { - return (file.flags & 1024) !== 0; + return (file.flags & 2048) !== 0; } ts.isDeclarationFile = isDeclarationFile; function isConstEnumDeclaration(node) { @@ -3281,11 +3367,11 @@ var ts; } ts.getCombinedNodeFlags = getCombinedNodeFlags; function isConst(node) { - return !!(getCombinedNodeFlags(node) & 4096); + return !!(getCombinedNodeFlags(node) & 8192); } ts.isConst = isConst; function isLet(node) { - return !!(getCombinedNodeFlags(node) & 2048); + return !!(getCombinedNodeFlags(node) & 4096); } ts.isLet = isLet; function isPrologueDirective(node) { @@ -3337,7 +3423,24 @@ var ts; } } ts.forEachReturnStatement = forEachReturnStatement; - function isAnyFunction(node) { + function isVariableLike(node) { + if (node) { + switch (node.kind) { + case 150: + case 219: + case 128: + case 217: + case 130: + case 129: + case 218: + case 193: + return true; + } + } + return false; + } + ts.isVariableLike = isVariableLike; + function isFunctionLike(node) { if (node) { switch (node.kind) { case 133: @@ -3361,9 +3464,9 @@ var ts; } return false; } - ts.isAnyFunction = isAnyFunction; + ts.isFunctionLike = isFunctionLike; function isFunctionBlock(node) { - return node && node.kind === 174 && isAnyFunction(node.parent); + return node && node.kind === 174 && isFunctionLike(node.parent); } ts.isFunctionBlock = isFunctionBlock; function isObjectLiteralMethod(node) { @@ -3373,7 +3476,7 @@ var ts; function getContainingFunction(node) { while (true) { node = node.parent; - if (!node || isAnyFunction(node)) { + if (!node || isFunctionLike(node)) { return node; } } @@ -3611,12 +3714,12 @@ var ts; } ts.isTemplateLiteralKind = isTemplateLiteralKind; function isBindingPattern(node) { - return node.kind === 149 || node.kind === 148; + return !!node && (node.kind === 149 || node.kind === 148); } ts.isBindingPattern = isBindingPattern; function isInAmbientContext(node) { while (node) { - if (node.flags & (2 | 1024)) { + if (node.flags & (2 | 2048)) { return true; } node = node.parent; @@ -3626,31 +3729,33 @@ var ts; ts.isInAmbientContext = isInAmbientContext; function isDeclaration(node) { switch (node.kind) { - case 127: - case 128: - case 193: + case 161: case 150: - case 130: - case 129: - case 217: - case 218: + case 196: + case 133: + case 199: case 219: + case 211: + case 195: + case 160: + case 134: + case 204: + case 202: + case 207: + case 197: case 132: case 131: - case 195: - case 134: - case 135: - case 133: - case 196: - case 197: - case 198: - case 199: case 200: - case 202: - case 204: - case 207: case 205: - case 211: + case 128: + case 217: + case 130: + case 129: + case 135: + case 218: + case 198: + case 127: + case 193: return true; } return false; @@ -3683,27 +3788,29 @@ var ts; } } ts.isStatement = isStatement; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name) { + function isDeclarationName(name) { if (name.kind !== 64 && name.kind !== 8 && name.kind !== 7) { return false; } var parent = name.parent; - if (isDeclaration(parent) || parent.kind === 160) { - return parent.name === name; + if (parent.kind === 207 || parent.kind === 211) { + if (parent.propertyName) { + return true; + } } - if (parent.kind === 216) { + if (isDeclaration(parent)) { return parent.name === name; } return false; } - ts.isDeclarationOrFunctionExpressionOrCatchVariableName = isDeclarationOrFunctionExpressionOrCatchVariableName; + ts.isDeclarationName = isDeclarationName; function getClassBaseTypeNode(node) { var heritageClause = getHeritageClause(node.heritageClauses, 78); return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; } ts.getClassBaseTypeNode = getClassBaseTypeNode; function getClassImplementedTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 103); + var heritageClause = getHeritageClause(node.heritageClauses, 102); return heritageClause ? heritageClause.types : undefined; } ts.getClassImplementedTypeNodes = getClassImplementedTypeNodes; @@ -3817,13 +3924,14 @@ var ts; ts.isESSymbolIdentifier = isESSymbolIdentifier; function isModifier(token) { switch (token) { - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: case 77: - case 115: + case 114: case 69: + case 72: return true; } return false; @@ -3938,6 +4046,42 @@ var ts; return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); } ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; + function nodeStartsNewLexicalEnvironment(n) { + return isFunctionLike(n) || n.kind === 200 || n.kind === 220; + } + ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; + function nodeIsSynthesized(node) { + return node.pos === -1 && node.end === -1; + } + ts.nodeIsSynthesized = nodeIsSynthesized; + function createSynthesizedNode(kind, startsOnNewLine) { + var node = ts.createNode(kind); + node.pos = -1; + node.end = -1; + node.startsOnNewLine = startsOnNewLine; + return node; + } + ts.createSynthesizedNode = createSynthesizedNode; + function generateUniqueName(baseName, isExistingName) { + if (baseName.charCodeAt(0) !== 95) { + var baseName = "_" + baseName; + if (!isExistingName(baseName)) { + return baseName; + } + } + if (baseName.charCodeAt(baseName.length - 1) !== 95) { + baseName += "_"; + } + var i = 1; + while (true) { + var name = baseName + i; + if (!isExistingName(name)) { + return name; + } + i++; + } + } + ts.generateUniqueName = generateUniqueName; function createDiagnosticCollection() { var nonFileDiagnostics = []; var fileDiagnostics = {}; @@ -4003,6 +4147,41 @@ var ts; } } ts.createDiagnosticCollection = createDiagnosticCollection; + var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; + var escapedCharsMap = { + "\0": "\\0", + "\t": "\\t", + "\v": "\\v", + "\f": "\\f", + "\b": "\\b", + "\r": "\\r", + "\n": "\\n", + "\\": "\\\\", + "\"": "\\\"", + "\u2028": "\\u2028", + "\u2029": "\\u2029", + "\u0085": "\\u0085" + }; + function escapeString(s) { + s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; + return s; + function getReplacement(c) { + return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); + } + } + ts.escapeString = escapeString; + function get16BitUnicodeEscapeSequence(charCode) { + var hexCharCode = charCode.toString(16).toUpperCase(); + var paddedHexCode = ("0000" + hexCharCode).slice(-4); + return "\\u" + paddedHexCode; + } + var nonAsciiCharacters = /[^\u0000-\u007F]/g; + function escapeNonAsciiCharacters(s) { + return nonAsciiCharacters.test(s) ? + s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : + s; + } + ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; })(ts || (ts = {})); var ts; (function (ts) { @@ -4113,6 +4292,7 @@ var ts; return visitNodes(cbNodes, node.properties); case 153: return visitNode(cbNode, node.expression) || + visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name); case 154: return visitNode(cbNode, node.expression) || @@ -4149,7 +4329,9 @@ var ts; visitNode(cbNode, node.right); case 168: return visitNode(cbNode, node.condition) || + visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || + visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse); case 171: return visitNode(cbNode, node.expression); @@ -4215,8 +4397,7 @@ var ts; visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock); case 216: - return visitNode(cbNode, node.name) || - visitNode(cbNode, node.type) || + return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block); case 196: return visitNodes(cbNodes, node.modifiers) || @@ -4271,7 +4452,7 @@ var ts; visitNode(cbNode, node.name); case 208: return visitNodes(cbNodes, node.modifiers) || - visitNode(cbNode, node.exportName); + visitNode(cbNode, node.expression); case 169: return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans); case 173: @@ -4344,13 +4525,14 @@ var ts; ; function modifierToFlag(token) { switch (token) { - case 110: return 128; - case 109: return 16; - case 108: return 64; - case 107: return 32; + case 109: return 128; + case 108: return 16; + case 107: return 64; + case 106: return 32; case 77: return 1; - case 115: return 2; - case 69: return 4096; + case 114: return 2; + case 69: return 8192; + case 72: return 256; } return 0; } @@ -4676,7 +4858,7 @@ var ts; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); - sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 1024 : 0; + sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 2048 : 0; var contextFlags = 0; var parseErrorBeforeNextFinishedNode = false; var scanner = ts.createScanner(languageVersion, true, sourceText, scanError); @@ -4804,7 +4986,9 @@ var ts; var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length; var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode; var saveContextFlags = contextFlags; - var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback); + var result = isLookAhead + ? scanner.lookAhead(callback) + : scanner.tryScan(callback); ts.Debug.assert(saveContextFlags === contextFlags); if (!result || isLookAhead) { token = saveToken; @@ -4823,10 +5007,10 @@ var ts; if (token === 64) { return true; } - if (token === 111 && inYieldContext()) { + if (token === 110 && inYieldContext()) { return false; } - return inStrictModeContext() ? token > 111 : token > 100; + return inStrictModeContext() ? token > 110 : token > 100; } function parseExpected(kind, diagnosticMessage) { if (token === kind) { @@ -4850,12 +5034,14 @@ var ts; } function parseOptionalToken(t) { if (token === t) { - var node = createNode(t); - nextToken(); - return finishNode(node); + return parseTokenNode(); } return undefined; } + function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) { + return parseOptionalToken(t) || + createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0); + } function parseTokenNode() { var node = createNode(token); nextToken(); @@ -4974,13 +5160,26 @@ var ts; } if (token === 77) { nextToken(); + if (token === 72) { + return lookAhead(nextTokenIsClassOrFunction); + } return token !== 35 && token !== 14 && canFollowModifier(); } + if (token === 72) { + return nextTokenIsClassOrFunction(); + } nextToken(); return canFollowModifier(); } function canFollowModifier() { - return token === 18 || token === 14 || token === 35 || isLiteralPropertyName(); + return token === 18 + || token === 14 + || token === 35 + || isLiteralPropertyName(); + } + function nextTokenIsClassOrFunction() { + nextToken(); + return token === 68 || token === 82; } function isListElement(parsingContext, inErrorRecovery) { var node = currentNode(parsingContext); @@ -5034,7 +5233,7 @@ var ts; return isIdentifier(); } function isNotHeritageClauseTypeName() { - if (token === 103 || + if (token === 102 || token === 78) { return lookAhead(nextTokenIsIdentifier); } @@ -5058,11 +5257,11 @@ var ts; case 4: return token === 15 || token === 66 || token === 72; case 8: - return token === 14 || token === 78 || token === 103; + return token === 14 || token === 78 || token === 102; case 9: return isVariableDeclaratorListTerminator(); case 16: - return token === 25 || token === 16 || token === 14 || token === 78 || token === 103; + return token === 25 || token === 16 || token === 14 || token === 78 || token === 102; case 12: return token === 17 || token === 22; case 14: @@ -5398,7 +5597,7 @@ var ts; literal = parseLiteralNode(); } else { - literal = createMissingNode(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); + literal = parseExpectedToken(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); } span.literal = literal; return finishNode(span); @@ -5407,14 +5606,19 @@ var ts; var node = createNode(token); var text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; + if (scanner.hasExtendedUnicodeEscape()) { + node.hasExtendedUnicodeEscape = true; + } if (scanner.isUnterminated()) { node.isUnterminated = true; } var tokenPos = scanner.getTokenPos(); nextToken(); finishNode(node); - if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= 8192; + if (node.kind === 7 + && sourceText.charCodeAt(tokenPos) === 48 + && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { + node.flags |= 16384; } return node; } @@ -5452,7 +5656,9 @@ var ts; } function parseParameterType() { if (parseOptional(51)) { - return token === 8 ? parseLiteralNode(true) : parseType(); + return token === 8 + ? parseLiteralNode(true) + : parseType(); } return undefined; } @@ -5622,7 +5828,9 @@ var ts; case 24: return parseSignatureMember(136); case 18: - return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature(); + return isIndexSignature() + ? parseIndexSignatureDeclaration(undefined) + : parsePropertyOrMethodSignature(); case 87: if (lookAhead(isStartOfConstructSignature)) { return parseSignatureMember(137); @@ -5644,7 +5852,9 @@ var ts; } function parseIndexSignatureWithModifiers() { var modifiers = parseModifiers(); - return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined; + return isIndexSignature() + ? parseIndexSignatureDeclaration(modifiers) + : undefined; } function isStartOfConstructSignature() { nextToken(); @@ -5692,11 +5902,11 @@ var ts; } function parseNonArrayType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReference(); case 98: @@ -5715,11 +5925,11 @@ var ts; } function isStartOfType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 96: case 14: @@ -5840,7 +6050,7 @@ var ts; case 39: case 24: case 64: - case 111: + case 110: return true; default: if (isBinaryOperator()) { @@ -5887,7 +6097,7 @@ var ts; return parseConditionalExpressionRest(expr); } function isYieldExpression() { - if (token === 111) { + if (token === 110) { if (inYieldContext()) { return true; } @@ -5933,7 +6143,9 @@ var ts; if (triState === 0) { return undefined; } - var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); + var arrowFunction = triState === 1 + ? parseParenthesizedArrowFunctionExpressionHead(true) + : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); if (!arrowFunction) { return undefined; } @@ -6012,13 +6224,15 @@ var ts; return parseAssignmentExpressionOrHigher(); } function parseConditionalExpressionRest(leftOperand) { - if (!parseOptional(50)) { + var questionToken = parseOptionalToken(50); + if (!questionToken) { return leftOperand; } var node = createNode(168, leftOperand.pos); node.condition = leftOperand; + node.questionToken = questionToken; node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(51); + node.colonToken = parseExpectedToken(51, false, ts.Diagnostics._0_expected, ts.tokenToString(51)); node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } @@ -6153,7 +6367,9 @@ var ts; return expression; } function parseLeftHandSideExpressionOrHigher() { - var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher(); + var expression = token === 90 + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); return parseCallExpressionRest(expression); } function parseMemberExpressionOrHigher() { @@ -6167,7 +6383,7 @@ var ts; } var node = createNode(153, expression.pos); node.expression = expression; - parseExpected(20, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.dotToken = parseExpectedToken(20, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); node.name = parseRightSideOfDot(true); return finishNode(node); } @@ -6181,10 +6397,11 @@ var ts; } function parseMemberExpressionRest(expression) { while (true) { - var dotOrBracketStart = scanner.getTokenPos(); - if (parseOptional(20)) { + var dotToken = parseOptionalToken(20); + if (dotToken) { var propertyAccess = createNode(153, expression.pos); propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; propertyAccess.name = parseRightSideOfDot(true); expression = finishNode(propertyAccess); continue; @@ -6206,7 +6423,9 @@ var ts; if (token === 10 || token === 11) { var tagExpression = createNode(157, expression.pos); tagExpression.tag = expression; - tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression(); + tagExpression.template = token === 10 + ? parseLiteralNode() + : parseTemplateExpression(); expression = finishNode(tagExpression); continue; } @@ -6252,7 +6471,9 @@ var ts; if (!parseExpected(25)) { return undefined; } - return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined; + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } function canFollowTypeArgumentsInExpression() { switch (token) { @@ -6327,7 +6548,9 @@ var ts; return finishNode(node); } function parseArgumentOrArrayLiteralElement() { - return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher(); + return token === 21 ? parseSpreadElement() : + token === 23 ? createNode(172) : + parseAssignmentExpressionOrHigher(); } function parseArgumentExpression() { return allowInAnd(parseArgumentOrArrayLiteralElement); @@ -6336,16 +6559,16 @@ var ts; var node = createNode(151); parseExpected(18); if (scanner.hasPrecedingLineBreak()) - node.flags |= 256; + node.flags |= 512; node.elements = parseDelimitedList(14, parseArgumentOrArrayLiteralElement); parseExpected(19); return finishNode(node); } function tryParseAccessorDeclaration(fullStart, modifiers) { - if (parseContextualModifier(116)) { + if (parseContextualModifier(115)) { return parseAccessorDeclaration(134, fullStart, modifiers); } - else if (parseContextualModifier(120)) { + else if (parseContextualModifier(119)) { return parseAccessorDeclaration(135, fullStart, modifiers); } return undefined; @@ -6384,7 +6607,7 @@ var ts; var node = createNode(152); parseExpected(14); if (scanner.hasPrecedingLineBreak()) { - node.flags |= 256; + node.flags |= 512; } node.properties = parseDelimitedList(13, parseObjectLiteralElement, true); parseExpected(15); @@ -6471,7 +6694,7 @@ var ts; parseExpected(16); var initializer = undefined; if (token !== 22) { - if (token === 97 || token === 105 || token === 69) { + if (token === 97 || token === 104 || token === 69) { initializer = parseVariableDeclarationList(true); } else { @@ -6587,9 +6810,9 @@ var ts; function parseCatchClause() { var result = createNode(216); parseExpected(67); - parseExpected(16); - result.name = parseIdentifier(); - result.type = parseTypeAnnotation(); + if (parseExpected(16)) { + result.variableDeclaration = parseVariableDeclaration(); + } parseExpected(17); result.block = parseBlock(false, false); return finishNode(result); @@ -6628,7 +6851,7 @@ var ts; return !inErrorRecovery; case 14: case 97: - case 105: + case 104: case 82: case 83: case 74: @@ -6648,18 +6871,18 @@ var ts; case 69: var isConstEnum = lookAhead(nextTokenIsEnumKeyword); return !isConstEnum; - case 104: + case 103: case 68: - case 117: + case 116: case 76: - case 123: + case 122: if (isDeclarationStart()) { return false; } - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: if (lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine)) { return false; } @@ -6712,7 +6935,7 @@ var ts; return parseTryStatement(); case 71: return parseDebuggerStatement(); - case 105: + case 104: if (isLetDeclaration()) { return parseVariableStatement(scanner.getStartPos(), undefined); } @@ -6736,7 +6959,7 @@ var ts; return undefined; } return parseVariableStatement(start, modifiers); - case 105: + case 104: if (!isLetDeclaration()) { return undefined; } @@ -6819,11 +7042,11 @@ var ts; switch (token) { case 97: break; - case 105: - node.flags |= 2048; + case 104: + node.flags |= 4096; break; case 69: - node.flags |= 4096; + node.flags |= 8192; break; default: ts.Debug.fail(); @@ -6855,7 +7078,7 @@ var ts; setModifiers(node, modifiers); parseExpected(82); node.asteriskToken = parseOptionalToken(35); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); fillSignature(51, !!node.asteriskToken, false, node); node.body = parseFunctionBlockOrSemicolon(!!node.asteriskToken, ts.Diagnostics.or_expected); return finishNode(node); @@ -6863,7 +7086,7 @@ var ts; function parseConstructorDeclaration(pos, modifiers) { var node = createNode(133, pos); setModifiers(node, modifiers); - parseExpected(114); + parseExpected(113); fillSignature(51, false, false, node); node.body = parseFunctionBlockOrSemicolon(false, ts.Diagnostics.or_expected); return finishNode(node); @@ -6924,7 +7147,7 @@ var ts; return true; } if (idToken !== undefined) { - if (!ts.isKeyword(idToken) || idToken === 120 || idToken === 116) { + if (!ts.isKeyword(idToken) || idToken === 119 || idToken === 115) { return true; } switch (token) { @@ -6969,7 +7192,7 @@ var ts; if (accessor) { return accessor; } - if (token === 114) { + if (token === 113) { return parseConstructorDeclaration(fullStart, modifiers); } if (isIndexSignature()) { @@ -6988,11 +7211,13 @@ var ts; var node = createNode(196, fullStart); setModifiers(node, modifiers); parseExpected(68); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(true); if (parseExpected(14)) { - node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers(); + node.members = inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseClassMembers) + : parseClassMembers(); parseExpected(15); } else { @@ -7002,7 +7227,9 @@ var ts; } function parseHeritageClauses(isClassHeritageClause) { if (isHeritageClause()) { - return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker(); + return isClassHeritageClause && inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseHeritageClausesWorker) + : parseHeritageClausesWorker(); } return undefined; } @@ -7010,7 +7237,7 @@ var ts; return parseList(19, false, parseHeritageClause); } function parseHeritageClause() { - if (token === 78 || token === 103) { + if (token === 78 || token === 102) { var node = createNode(215); node.token = token; nextToken(); @@ -7020,7 +7247,7 @@ var ts; return undefined; } function isHeritageClause() { - return token === 78 || token === 103; + return token === 78 || token === 102; } function parseClassMembers() { return parseList(6, false, parseClassElement); @@ -7028,7 +7255,7 @@ var ts; function parseInterfaceDeclaration(fullStart, modifiers) { var node = createNode(197, fullStart); setModifiers(node, modifiers); - parseExpected(104); + parseExpected(103); node.name = parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(false); @@ -7038,7 +7265,7 @@ var ts; function parseTypeAliasDeclaration(fullStart, modifiers) { var node = createNode(198, fullStart); setModifiers(node, modifiers); - parseExpected(123); + parseExpected(122); node.name = parseIdentifier(); parseExpected(52); node.type = parseType(); @@ -7081,7 +7308,9 @@ var ts; setModifiers(node, modifiers); node.flags |= flags; node.name = parseIdentifier(); - node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock(); + node.body = parseOptional(20) + ? parseInternalModuleTail(getNodePos(), undefined, 1) + : parseModuleBlock(); return finishNode(node); } function parseAmbientExternalModuleDeclaration(fullStart, modifiers) { @@ -7092,11 +7321,13 @@ var ts; return finishNode(node); } function parseModuleDeclaration(fullStart, modifiers) { - parseExpected(117); - return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); + parseExpected(116); + return token === 8 + ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) + : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); } function isExternalModuleReference() { - return token === 118 && + return token === 117 && lookAhead(nextTokenIsOpenParen); } function nextTokenIsOpenParen() { @@ -7105,7 +7336,7 @@ var ts; function nextTokenIsCommaOrFromKeyword() { nextToken(); return token === 23 || - token === 102; + token === 123; } function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) { parseExpected(84); @@ -7113,7 +7344,7 @@ var ts; var identifier; if (isIdentifier()) { identifier = parseIdentifier(); - if (token !== 23 && token !== 102) { + if (token !== 23 && token !== 123) { var importEqualsDeclaration = createNode(202, fullStart); setModifiers(importEqualsDeclaration, modifiers); importEqualsDeclaration.name = identifier; @@ -7129,7 +7360,7 @@ var ts; token === 35 || token === 14) { importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(102); + parseExpected(123); } importDeclaration.moduleSpecifier = parseModuleSpecifier(); parseSemicolon(); @@ -7147,11 +7378,13 @@ var ts; return finishNode(importClause); } function parseModuleReference() { - return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false); + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(false); } function parseExternalModuleReference() { var node = createNode(212); - parseExpected(118); + parseExpected(117); parseExpected(16); node.expression = parseModuleSpecifier(); parseExpected(17); @@ -7209,22 +7442,28 @@ var ts; var node = createNode(209, fullStart); setModifiers(node, modifiers); if (parseOptional(35)) { - parseExpected(102); + parseExpected(123); node.moduleSpecifier = parseModuleSpecifier(); } else { node.exportClause = parseNamedImportsOrExports(210); - if (parseOptional(102)) { + if (parseOptional(123)) { node.moduleSpecifier = parseModuleSpecifier(); } } parseSemicolon(); return finishNode(node); } - function parseExportAssignmentTail(fullStart, modifiers) { + function parseExportAssignment(fullStart, modifiers) { var node = createNode(208, fullStart); setModifiers(node, modifiers); - node.exportName = parseIdentifier(); + if (parseOptional(52)) { + node.isExportEquals = true; + } + else { + parseExpected(72); + } + node.expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); return finishNode(node); } @@ -7237,24 +7476,24 @@ var ts; case 69: case 82: return true; - case 105: + case 104: return isLetDeclaration(); case 68: - case 104: + case 103: case 76: - case 123: + case 122: return lookAhead(nextTokenIsIdentifierOrKeyword); case 84: return lookAhead(nextTokenCanFollowImportKeyword); - case 117: + case 116: return lookAhead(nextTokenIsIdentifierOrKeywordOrStringLiteral); case 77: return lookAhead(nextTokenCanFollowExportKeyword); - case 115: - case 109: - case 107: + case 114: case 108: - case 110: + case 106: + case 107: + case 109: return lookAhead(nextTokenIsDeclarationStart); } } @@ -7277,7 +7516,7 @@ var ts; function nextTokenCanFollowExportKeyword() { nextToken(); return token === 52 || token === 35 || - token === 14 || isDeclarationStart(); + token === 14 || token === 72 || isDeclarationStart(); } function nextTokenIsDeclarationStart() { nextToken(); @@ -7291,8 +7530,8 @@ var ts; var modifiers = parseModifiers(); if (token === 77) { nextToken(); - if (parseOptional(52)) { - return parseExportAssignmentTail(fullStart, modifiers); + if (token === 72 || token === 52) { + return parseExportAssignment(fullStart, modifiers); } if (token === 35 || token === 14) { return parseExportDeclaration(fullStart, modifiers); @@ -7300,20 +7539,20 @@ var ts; } switch (token) { case 97: - case 105: + case 104: case 69: return parseVariableStatement(fullStart, modifiers); case 82: return parseFunctionDeclaration(fullStart, modifiers); case 68: return parseClassDeclaration(fullStart, modifiers); - case 104: + case 103: return parseInterfaceDeclaration(fullStart, modifiers); - case 123: + case 122: return parseTypeAliasDeclaration(fullStart, modifiers); case 76: return parseEnumDeclaration(fullStart, modifiers); - case 117: + case 116: return parseModuleDeclaration(fullStart, modifiers); case 84: return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers); @@ -7331,7 +7570,9 @@ var ts; return parseSourceElementOrModuleElement(); } function parseSourceElementOrModuleElement() { - return isDeclarationStart() ? parseDeclaration() : parseStatement(); + return isDeclarationStart() + ? parseDeclaration() + : parseStatement(); } function processReferenceComments(sourceFile) { var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText); @@ -7389,7 +7630,13 @@ var ts; } function setExternalModuleIndicator(sourceFile) { sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) { - return node.flags & 1 || node.kind === 202 && node.moduleReference.kind === 212 || node.kind === 203 || node.kind === 208 || node.kind === 209 ? node : undefined; + return node.flags & 1 + || node.kind === 202 && node.moduleReference.kind === 212 + || node.kind === 203 + || node.kind === 208 + || node.kind === 209 + ? node + : undefined; }); } } @@ -7485,7 +7732,8 @@ var ts; var Symbol = ts.objectAllocator.getSymbolConstructor(); if (!file.locals) { file.locals = {}; - container = blockScopeContainer = file; + container = file; + setBlockScopeContainer(file, false); bind(file); file.symbolCount = symbolCount; } @@ -7493,6 +7741,12 @@ var ts; symbolCount++; return new Symbol(flags, name); } + function setBlockScopeContainer(node, cleanLocals) { + blockScopeContainer = node; + if (cleanLocals) { + blockScopeContainer.locals = undefined; + } + } function addDeclarationToSymbol(symbol, node, symbolKind) { symbol.flags |= symbolKind; if (!symbol.declarations) @@ -7529,6 +7783,13 @@ var ts; return "__new"; case 138: return "__index"; + case 209: + return "__export"; + case 208: + return "default"; + case 195: + case 196: + return node.flags & 256 ? "default" : undefined; } } function getDisplayName(node) { @@ -7536,18 +7797,20 @@ var ts; } function declareSymbol(symbols, parent, node, includes, excludes) { ts.Debug.assert(!ts.hasDynamicName(node)); - var name = getDeclarationName(node); + var name = node.flags & 256 && parent ? "default" : getDeclarationName(node); if (name !== undefined) { var symbol = ts.hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { if (node.name) { node.name.parent = node; } - var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = symbol.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 + : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name, message, getDisplayName(declaration))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name, message, getDisplayName(node))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); symbol = createSymbol(0, name); } } @@ -7617,7 +7880,7 @@ var ts; lastContainer = container; } if (isBlockScopeContainer) { - blockScopeContainer = node; + setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220); } ts.forEachChild(node, bind); container = saveContainer; @@ -7685,12 +7948,6 @@ var ts; } } } - function bindExportDeclaration(node) { - if (!node.exportClause) { - (container.exportStars || (container.exportStars = [])).push(node); - } - bindChildren(node, 0, false); - } function bindFunctionOrConstructorType(node) { var symbol = createSymbol(131072, getDeclarationName(node)); addDeclarationToSymbol(symbol, node, 131072); @@ -7706,14 +7963,7 @@ var ts; bindChildren(node, symbolKind, isBlockScopeContainer); } function bindCatchVariableDeclaration(node) { - var symbol = createSymbol(1, node.name.text || "__missing"); - addDeclarationToSymbol(symbol, node, 1); - var saveParent = parent; - var savedBlockScopeContainer = blockScopeContainer; - parent = blockScopeContainer = node; - ts.forEachChild(node, bind); - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; + bindChildren(node, 0, true); } function bindBlockScopedVariableDeclaration(node) { switch (blockScopeContainer.kind) { @@ -7750,7 +8000,7 @@ var ts; if (ts.isBindingPattern(node.name)) { bindChildren(node, 0, false); } - else if (ts.getCombinedNodeFlags(node) & 6144) { + else if (ts.isBlockOrCatchScoped(node)) { bindBlockScopedVariableDeclaration(node); } else { @@ -7832,9 +8082,6 @@ var ts; case 211: bindDeclaration(node, 8388608, 8388608, false); break; - case 209: - bindExportDeclaration(node); - break; case 204: if (node.name) { bindDeclaration(node, 8388608, 8388608, false); @@ -7843,13 +8090,28 @@ var ts; bindChildren(node, 0, false); } break; + case 209: + if (!node.exportClause) { + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); + } + bindChildren(node, 0, false); + break; + case 208: + if (node.expression.kind === 64) { + declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608); + } + else { + declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455); + } + bindChildren(node, 0, false); + break; case 220: if (ts.isExternalModule(node)) { bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true); break; } case 174: - bindChildren(node, 0, !ts.isAnyFunction(node.parent)); + bindChildren(node, 0, !ts.isFunctionLike(node.parent)); break; case 216: case 181: @@ -7937,8 +8199,9 @@ var ts; isValidPropertyAccess: isValidPropertyAccess, getSignatureFromDeclaration: getSignatureFromDeclaration, isImplementationOfOverload: isImplementationOfOverload, - getAliasedSymbol: resolveImport, - getEmitResolver: getEmitResolver + getAliasedSymbol: resolveAlias, + getEmitResolver: getEmitResolver, + getExportsOfExternalModule: getExportsOfExternalModule }; var undefinedSymbol = createSymbol(4 | 67108864, "undefined"); var argumentsSymbol = createSymbol(4 | 67108864, "arguments"); @@ -7972,6 +8235,7 @@ var ts; var globalRegExpType; var globalTemplateStringsArrayType; var globalESSymbolType; + var globalIterableType; var anyArrayType; var tupleTypes = {}; var unionTypes = {}; @@ -8005,7 +8269,9 @@ var ts; return emitResolver; } function error(location, message, arg0, arg1, arg2) { - var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); + var diagnostic = location + ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) + : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); diagnostics.add(diagnostic); } function createSymbol(flags, name) { @@ -8091,7 +8357,8 @@ var ts; recordMergedSymbol(target, source); } else { - var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = target.flags & 2 || source.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(source.declarations, function (node) { error(node.name ? node.name : node, message, symbolToString(source)); }); @@ -8125,13 +8392,6 @@ var ts; } } } - function extendSymbolTable(target, source) { - for (var id in source) { - if (!ts.hasProperty(target, id)) { - target[id] = source[id]; - } - } - } function getSymbolLinks(symbol) { if (symbol.flags & 67108864) return symbol; @@ -8158,7 +8418,7 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target === unknownSymbol || target.flags & meaning) { return symbol; } @@ -8194,7 +8454,7 @@ var ts; break; case 200: if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) { - if (!(result.flags & 8388608 && getDeclarationOfImportSymbol(result).kind === 211)) { + if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) { break loop; } result = undefined; @@ -8258,13 +8518,6 @@ var ts; break loop; } break; - case 216: - var id = location.name; - if (name === id.text) { - result = location.symbol; - break loop; - } - break; } lastLocation = location; location = location.parent; @@ -8285,7 +8538,7 @@ var ts; return undefined; } if (result.flags & 2) { - var declaration = ts.forEach(result.declarations, function (d) { return ts.getCombinedNodeFlags(d) & 6144 ? d : undefined; }); + var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; }); ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); if (!isDefinedBefore(declaration, errorLocation)) { error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name)); @@ -8294,15 +8547,16 @@ var ts; } return result; } - function isImportSymbolDeclaration(node) { + function isAliasSymbolDeclaration(node) { return node.kind === 202 || node.kind === 204 && !!node.name || node.kind === 205 || node.kind === 207 || - node.kind === 211; + node.kind === 211 || + node.kind === 208; } - function getDeclarationOfImportSymbol(symbol) { - return ts.forEach(symbol.declarations, function (d) { return isImportSymbolDeclaration(d) ? d : undefined; }); + function getDeclarationOfAliasSymbol(symbol) { + return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; }); } function getTargetOfImportEqualsDeclaration(node) { if (node.moduleReference.kind === 212) { @@ -8335,7 +8589,7 @@ var ts; error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name)); return; } - return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveImport(symbol); + return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveAlias(symbol); } } } @@ -8343,7 +8597,12 @@ var ts; return getExternalModuleMember(node.parent.parent.parent, node); } function getTargetOfExportSpecifier(node) { - return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node, node.propertyName || node.name, 107455 | 793056 | 1536); + return node.parent.parent.moduleSpecifier ? + getExternalModuleMember(node.parent.parent, node) : + resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); + } + function getTargetOfExportAssignment(node) { + return resolveEntityName(node.expression, 107455 | 793056 | 1536); } function getTargetOfImportDeclaration(node) { switch (node.kind) { @@ -8357,14 +8616,16 @@ var ts; return getTargetOfImportSpecifier(node); case 211: return getTargetOfExportSpecifier(node); + case 208: + return getTargetOfExportAssignment(node); } } - function resolveImport(symbol) { - ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Imports here."); + function resolveAlias(symbol) { + ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Alias here."); var links = getSymbolLinks(symbol); if (!links.target) { links.target = resolvingSymbol; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); var target = getTargetOfImportDeclaration(node); if (links.target === resolvingSymbol) { links.target = target || unknownSymbol; @@ -8378,6 +8639,29 @@ var ts; } return links.target; } + function markExportAsReferenced(node) { + var symbol = getSymbolOfNode(node); + var target = resolveAlias(symbol); + if (target && target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target)) { + markAliasSymbolAsReferenced(symbol); + } + } + function markAliasSymbolAsReferenced(symbol) { + var links = getSymbolLinks(symbol); + if (!links.referenced) { + links.referenced = true; + var node = getDeclarationOfAliasSymbol(symbol); + if (node.kind === 208) { + checkExpressionCached(node.expression); + } + else if (node.kind === 211) { + checkExpressionCached(node.propertyName || node.name); + } + else if (ts.isInternalModuleImportEqualsDeclaration(node)) { + checkExpressionCached(node.moduleReference); + } + } + } function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) { if (!importDeclaration) { importDeclaration = ts.getAncestor(entityName, 202); @@ -8387,38 +8671,40 @@ var ts; entityName = entityName.parent; } if (entityName.kind === 64 || entityName.parent.kind === 125) { - return resolveEntityName(importDeclaration, entityName, 1536); + return resolveEntityName(entityName, 1536); } else { ts.Debug.assert(entityName.parent.kind === 202); - return resolveEntityName(importDeclaration, entityName, 107455 | 793056 | 1536); + return resolveEntityName(entityName, 107455 | 793056 | 1536); } } function getFullyQualifiedName(symbol) { return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol); } - function resolveEntityName(location, name, meaning) { + function resolveEntityName(name, meaning) { if (ts.getFullWidth(name) === 0) { return undefined; } if (name.kind === 64) { - var symbol = resolveName(location, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); + var symbol = resolveName(name, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); if (!symbol) { - return; + return undefined; } } else if (name.kind === 125) { - var namespace = resolveEntityName(location, name.left, 1536); - if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) - return; - var symbol = getSymbol(getExportsOfSymbol(namespace), name.right.text, meaning); + var namespace = resolveEntityName(name.left, 1536); + if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) { + return undefined; + } + var right = name.right; + var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning); if (!symbol) { - error(location, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(name.right)); - return; + error(right, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right)); + return undefined; } } ts.Debug.assert((symbol.flags & 16777216) === 0, "Should never get an instantiated symbol here."); - return symbol.flags & meaning ? symbol : resolveImport(symbol); + return symbol.flags & meaning ? symbol : resolveAlias(symbol); } function isExternalModuleNameRelative(moduleName) { return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; @@ -8458,6 +8744,9 @@ var ts; } error(moduleReferenceLiteral, ts.Diagnostics.Cannot_find_external_module_0, moduleName); } + function getExportAssignmentSymbol(moduleSymbol) { + return moduleSymbol.exports["default"]; + } function getResolvedExportAssignmentSymbol(moduleSymbol) { var symbol = getExportAssignmentSymbol(moduleSymbol); if (symbol) { @@ -8465,82 +8754,52 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - return resolveImport(symbol); + return resolveAlias(symbol); } } } - function getExportAssignmentSymbol(symbol) { - checkTypeOfExportAssignmentSymbol(symbol); - return getSymbolLinks(symbol).exportAssignmentSymbol; - } - function checkTypeOfExportAssignmentSymbol(containerSymbol) { - var symbolLinks = getSymbolLinks(containerSymbol); - if (!symbolLinks.exportAssignmentChecked) { - var exportInformation = collectExportInformationForSourceFileOrModule(containerSymbol); - if (exportInformation.exportAssignments.length) { - if (exportInformation.exportAssignments.length > 1) { - ts.forEach(exportInformation.exportAssignments, function (node) { return error(node, ts.Diagnostics.A_module_cannot_have_more_than_one_export_assignment); }); - } - var node = exportInformation.exportAssignments[0]; - if (exportInformation.hasExportedMember) { - error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); - } - if (node.exportName.text) { - var meaning = 107455 | 793056 | 1536; - var exportSymbol = resolveName(node, node.exportName.text, meaning, ts.Diagnostics.Cannot_find_name_0, node.exportName); - } - symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; - } - symbolLinks.exportAssignmentChecked = true; - } - } - function collectExportInformationForSourceFileOrModule(symbol) { - var seenExportedMember = false; - var result = []; - ts.forEach(symbol.declarations, function (declaration) { - var block = (declaration.kind === 220 ? declaration : declaration.body); - ts.forEach(block.statements, function (node) { - if (node.kind === 208) { - result.push(node); - } - else { - seenExportedMember = seenExportedMember || (node.flags & 1) !== 0; - } - }); - }); - return { - hasExportedMember: seenExportedMember, - exportAssignments: result - }; - } function getExportsOfSymbol(symbol) { return symbol.flags & 1536 ? getExportsOfModule(symbol) : symbol.exports; } - function getExportsOfModule(symbol) { - var links = getSymbolLinks(symbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(symbol)); + function getExportsOfModule(moduleSymbol) { + var links = getSymbolLinks(moduleSymbol); + return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); } - function getExportsForModule(symbol) { + function extendExportSymbols(target, source) { + for (var id in source) { + if (id !== "default" && !ts.hasProperty(target, id)) { + target[id] = source[id]; + } + } + } + function getExportsForModule(moduleSymbol) { + if (compilerOptions.target < 2) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + return { + "default": defaultSymbol + }; + } + } var result; var visitedSymbols = []; - visit(symbol); - return result; + visit(moduleSymbol); + return result || moduleSymbol.exports; function visit(symbol) { if (!ts.contains(visitedSymbols, symbol)) { visitedSymbols.push(symbol); - if (!result) { - result = symbol.exports; - } - else { - extendSymbolTable(result, symbol.exports); - } - ts.forEach(symbol.declarations, function (node) { - if (node.kind === 220 || node.kind === 200) { - ts.forEach(node.exportStars, function (exportStar) { - visit(resolveExternalModuleName(exportStar, exportStar.moduleSpecifier)); - }); + if (symbol !== moduleSymbol) { + if (!result) { + result = cloneSymbolTable(moduleSymbol.exports); } - }); + extendExportSymbols(result, symbol.exports); + } + var exportStars = symbol.exports["__export"]; + if (exportStars) { + ts.forEach(exportStars.declarations, function (node) { + visit(resolveExternalModuleName(node, node.moduleSpecifier)); + }); + } } } } @@ -8555,7 +8814,9 @@ var ts; return getMergedSymbol(symbol.parent); } function getExportSymbolOfValueSymbolIfExported(symbol) { - return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol; + return symbol && (symbol.flags & 1048576) !== 0 + ? getMergedSymbol(symbol.exportSymbol) + : symbol; } function symbolIsValue(symbol) { if (symbol.flags & 16777216) { @@ -8565,7 +8826,7 @@ var ts; return true; } if (symbol.flags & 8388608) { - return (resolveImport(symbol).flags & 107455) !== 0; + return (resolveAlias(symbol).flags & 107455) !== 0; } return false; } @@ -8682,8 +8943,8 @@ var ts; if (symbolFromSymbolTable.flags & 8388608) { if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) { - var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); - if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); + if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) { return [symbolFromSymbolTable]; } var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined; @@ -8708,7 +8969,7 @@ var ts; if (symbolFromSymbolTable === symbol) { return true; } - symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -8999,7 +9260,7 @@ var ts; buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, 793056, 0, flags); } else { - writeKeyword(writer, 112); + writeKeyword(writer, 111); } } else { @@ -9090,7 +9351,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 0, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 121); + writeKeyword(writer, 120); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -9103,7 +9364,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 1, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 119); + writeKeyword(writer, 118); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -9268,7 +9529,7 @@ var ts; return true; } if (symbolOfNode.flags & 8388608) { - return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); } } function isSymbolUsedInExportAssignment(symbol) { @@ -9276,7 +9537,7 @@ var ts; return true; } if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & 8388608)) { - resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); if (resolvedExportSymbol === symbol) { return true; } @@ -9410,6 +9671,9 @@ var ts; if (declaration.parent.parent.kind === 182) { return anyType; } + if (declaration.parent.parent.kind === 183) { + return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent); + } if (ts.isBindingPattern(declaration.parent)) { return getTypeForBindingElement(declaration); } @@ -9469,7 +9733,9 @@ var ts; return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes); } function getTypeFromBindingPattern(pattern) { - return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern); + return pattern.kind === 148 + ? getTypeFromObjectBindingPattern(pattern) + : getTypeFromArrayBindingPattern(pattern); } function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) { var type = getTypeForVariableLikeDeclaration(declaration); @@ -9498,9 +9764,12 @@ var ts; return links.type = getTypeOfPrototypeProperty(symbol); } var declaration = symbol.valueDeclaration; - if (declaration.kind === 216) { + if (declaration.parent.kind === 216) { return links.type = anyType; } + if (declaration.kind === 208) { + return links.type = checkExpression(declaration.expression); + } links.type = resolvingType; var type = getWidenedTypeForVariableLikeDeclaration(declaration, true); if (links.type === resolvingType) { @@ -9510,7 +9779,9 @@ var ts; else if (links.type === resolvingType) { links.type = anyType; if (compilerOptions.noImplicitAny) { - var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; + var diagnostic = symbol.valueDeclaration.type ? + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; error(symbol.valueDeclaration, diagnostic, symbolToString(symbol)); } } @@ -9590,10 +9861,10 @@ var ts; } return links.type; } - function getTypeOfImport(symbol) { + function getTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.type) { - links.type = getTypeOfSymbol(resolveImport(symbol)); + links.type = getTypeOfSymbol(resolveAlias(symbol)); } return links.type; } @@ -9621,7 +9892,7 @@ var ts; return getTypeOfAccessors(symbol); } if (symbol.flags & 8388608) { - return getTypeOfImport(symbol); + return getTypeOfAlias(symbol); } return unknownType; } @@ -9775,10 +10046,10 @@ var ts; } return links.declaredType; } - function getDeclaredTypeOfImport(symbol) { + function getDeclaredTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.declaredType) { - links.declaredType = getDeclaredTypeOfSymbol(resolveImport(symbol)); + links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)); } return links.declaredType; } @@ -9800,7 +10071,7 @@ var ts; return getDeclaredTypeOfTypeParameter(symbol); } if (symbol.flags & 8388608) { - return getDeclaredTypeOfImport(symbol); + return getDeclaredTypeOfAlias(symbol); } return unknownType; } @@ -9890,7 +10161,8 @@ var ts; var baseType = classType.baseTypes[0]; var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1); return ts.map(baseSignatures, function (baseSignature) { - var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); + var signature = baseType.flags & 4096 ? + getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); signature.typeParameters = classType.typeParameters; signature.resolvedReturnType = classType; return signature; @@ -10171,11 +10443,22 @@ var ts; }); return result; } + function getExportsOfExternalModule(node) { + if (!node.moduleSpecifier) { + return emptyArray; + } + var module = resolveExternalModuleName(node, node.moduleSpecifier); + if (!module || !module.exports) { + return emptyArray; + } + return ts.mapToArray(getExportsOfModule(module)); + } function getSignatureFromDeclaration(declaration) { var links = getNodeLinks(declaration); if (!links.resolvedSignature) { var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined; - var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; + var typeParameters = classType ? classType.typeParameters : + declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; var parameters = []; var hasStringLiterals = false; var minArgumentCount = -1; @@ -10316,7 +10599,7 @@ var ts; return symbol.members["__index"]; } function getIndexDeclarationOfSymbol(symbol, kind) { - var syntaxKind = kind === 1 ? 119 : 121; + var syntaxKind = kind === 1 ? 118 : 120; var indexSymbol = getIndexSymbol(symbol); if (indexSymbol) { var len = indexSymbol.declarations.length; @@ -10334,7 +10617,9 @@ var ts; } function getIndexTypeOfSymbol(symbol, kind) { var declaration = getIndexDeclarationOfSymbol(symbol, kind); - return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined; + return declaration + ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType + : undefined; } function getConstraintOfTypeParameter(type) { if (!type.constraint) { @@ -10419,7 +10704,7 @@ var ts; function getTypeFromTypeReferenceNode(node) { var links = getNodeLinks(node); if (!links.resolvedType) { - var symbol = resolveEntityName(node, node.typeName, 793056); + var symbol = resolveEntityName(node.typeName, 793056); if (symbol) { var type; if ((symbol.flags & 262144) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { @@ -10492,8 +10777,9 @@ var ts; function getGlobalSymbol(name, meaning, diagnostic) { return resolveName(undefined, name, meaning, diagnostic, name); } - function getGlobalType(name) { - return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), 0); + function getGlobalType(name, arity) { + if (arity === void 0) { arity = 0; } + return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity); } function getGlobalESSymbolConstructorSymbol() { return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol")); @@ -10637,15 +10923,15 @@ var ts; } function getTypeFromTypeNode(node) { switch (node.kind) { - case 112: + case 111: return anyType; - case 121: + case 120: return stringType; - case 119: + case 118: return numberType; - case 113: + case 112: return booleanType; - case 122: + case 121: return esSymbolType; case 98: return voidType; @@ -10797,7 +11083,8 @@ var ts; return mapper(type); } if (type.flags & 32768) { - return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type; + return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? + instantiateAnonymousType(type, mapper) : type; } if (type.flags & 4096) { return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType)); @@ -10826,7 +11113,7 @@ var ts; isContextSensitive(node.whenFalse); case 167: return node.operatorToken.kind === 49 && - (isContextSensitive(node.left) || isContextSensitive(node.right)); + (isContextSensitive(node.left) || isContextSensitive(node.right)); case 217: return isContextSensitive(node.initializer); case 132: @@ -11596,7 +11883,9 @@ var ts; var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type; break; case 128: - var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; + var diagnostic = declaration.dotDotDotToken ? + ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : + ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; break; case 195: case 132: @@ -11697,7 +11986,9 @@ var ts; for (var i = 0; i < typeParameters.length; i++) { if (target === typeParameters[i]) { var inferences = context.inferences[i]; - var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []); + var candidates = inferiority ? + inferences.secondary || (inferences.secondary = []) : + inferences.primary || (inferences.primary = []); if (!ts.contains(candidates, source)) candidates.push(source); break; @@ -12106,46 +12397,56 @@ var ts; return type; } } - function markLinkedImportsAsReferenced(node) { - if (node) { - var nodeLinks = getNodeLinks(node); - while (nodeLinks.importOnRightSide) { - var rightSide = nodeLinks.importOnRightSide; - nodeLinks.importOnRightSide = undefined; - getSymbolLinks(rightSide).referenced = true; - ts.Debug.assert((rightSide.flags & 8388608) !== 0); - nodeLinks = getNodeLinks(ts.getDeclarationOfKind(rightSide, 202)); - } - } - } function checkIdentifier(node) { var symbol = getResolvedSymbol(node); if (symbol === argumentsSymbol && ts.getContainingFunction(node).kind === 161) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & 8388608) { - var symbolLinks = getSymbolLinks(symbol); - if (!symbolLinks.referenced) { - var importOrExportAssignment = getLeftSideOfImportEqualsOrExportAssignment(node); - if (!importOrExportAssignment || - (importOrExportAssignment.flags & 1) || - (importOrExportAssignment.kind === 208)) { - symbolLinks.referenced = !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol)); - } - else { - var nodeLinks = getNodeLinks(importOrExportAssignment); - ts.Debug.assert(!nodeLinks.importOnRightSide); - nodeLinks.importOnRightSide = symbol; - } - } - if (symbolLinks.referenced) { - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) { + markAliasSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); + checkBlockScopedBindingCapturedInLoop(node, symbol); return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); } + function isInsideFunction(node, threshold) { + var current = node; + while (current && current !== threshold) { + if (ts.isFunctionLike(current)) { + return true; + } + current = current.parent; + } + return false; + } + function checkBlockScopedBindingCapturedInLoop(node, symbol) { + if (languageVersion >= 2 || + (symbol.flags & 2) === 0 || + symbol.valueDeclaration.parent.kind === 216) { + return; + } + var container = symbol.valueDeclaration; + while (container.kind !== 194) { + container = container.parent; + } + container = container.parent; + if (container.kind === 175) { + container = container.parent; + } + var inFunction = isInsideFunction(node.parent, container); + var current = container; + while (current && !ts.nodeStartsNewLexicalEnvironment(current)) { + if (isIterationStatement(current, false)) { + if (inFunction) { + grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node)); + } + getNodeLinks(symbol.valueDeclaration).flags |= 256; + break; + } + current = current.parent; + } + } function captureLexicalThis(node, container) { var classNode = container.parent && container.parent.kind === 196 ? container.parent : undefined; getNodeLinks(node).flags |= 2; @@ -12231,19 +12532,19 @@ var ts; if (container.flags & 128) { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135; + container.kind === 131 || + container.kind === 134 || + container.kind === 135; } else { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135 || - container.kind === 130 || - container.kind === 129 || - container.kind === 133; + container.kind === 131 || + container.kind === 134 || + container.kind === 135 || + container.kind === 130 || + container.kind === 129 || + container.kind === 133; } } } @@ -12428,7 +12729,9 @@ var ts; var type = getContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); - return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1); + return getTypeOfPropertyOfContextualType(type, "" + index) + || getIndexTypeOfContextualType(type, 1) + || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); } return undefined; } @@ -12492,7 +12795,9 @@ var ts; } function getContextualSignature(node) { ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node)); - var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node); + var type = ts.isObjectLiteralMethod(node) + ? getContextualTypeForObjectLiteralMethod(node) + : getContextualType(node); if (!type) { return undefined; } @@ -12618,7 +12923,9 @@ var ts; } else { ts.Debug.assert(memberDecl.kind === 218); - var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper); + var type = memberDecl.name.kind === 126 + ? unknownType + : checkExpression(memberDecl.name, contextualMapper); } typeFlags |= type.flags; var prop = createSymbol(4 | 67108864 | member.flags, member.name); @@ -12734,7 +13041,9 @@ var ts; return anyType; } function isValidPropertyAccess(node, propertyName) { - var left = node.kind === 153 ? node.expression : node.left; + var left = node.kind === 153 + ? node.expression + : node.left; var type = checkExpressionOrQualifiedName(left); if (type !== unknownType && type !== anyType) { var prop = getPropertyOfType(getWidenedType(type), propertyName); @@ -13028,7 +13337,9 @@ var ts; var arg = args[i]; if (arg.kind !== 172) { var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i); - var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); + var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : + arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : + checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) { return false; } @@ -13305,9 +13616,6 @@ var ts; return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { - if (languageVersion < 2) { - grammarErrorOnFirstToken(node.template, ts.Diagnostics.Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher); - } return getReturnTypeOfSignature(getResolvedSignature(node)); } function checkTypeAssertion(node) { @@ -13323,9 +13631,13 @@ var ts; } function getTypeAtPosition(signature, pos) { if (pos >= 0) { - return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; + return signature.hasRestParameter ? + pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; } - return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType; + return signature.hasRestParameter ? + getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : + anyArrayType; } function assignContextualParameterTypes(signature, context, mapper) { var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0); @@ -13466,7 +13778,7 @@ var ts; } return true; } - function checkReferenceExpression(n, invalidReferenceMessage, constantVarianleMessage) { + function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) { function findSymbol(n) { var symbol = getNodeLinks(n).resolvedSymbol; return symbol && getExportSymbolOfValueSymbolIfExported(symbol); @@ -13492,14 +13804,14 @@ var ts; case 64: case 153: var symbol = findSymbol(n); - return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 4096) !== 0; + return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 8192) !== 0; case 154: var index = n.argumentExpression; var symbol = findSymbol(n.expression); if (symbol && index && index.kind === 8) { var name = index.text; var prop = getPropertyOfType(getTypeOfSymbol(symbol), name); - return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 4096) !== 0; + return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 8192) !== 0; } return false; case 159: @@ -13513,7 +13825,7 @@ var ts; return false; } if (isConstVariableReference(n)) { - error(n, constantVarianleMessage); + error(n, constantVariableMessage); return false; } return true; @@ -13627,9 +13939,10 @@ var ts; var p = properties[i]; if (p.kind === 217 || p.kind === 218) { var name = p.name; - var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || - getIndexTypeOfType(sourceType, 0); + var type = sourceType.flags & 1 ? sourceType : + getTypeOfPropertyOfType(sourceType, name.text) || + isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || + getIndexTypeOfType(sourceType, 0); if (type) { checkDestructuringAssignment(p.initializer || name, type); } @@ -13654,7 +13967,9 @@ var ts; if (e.kind !== 172) { if (e.kind !== 171) { var propName = "" + i; - var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1); + var type = sourceType.flags & 1 ? sourceType : + isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : + getIndexTypeOfType(sourceType, 1); if (type) { checkDestructuringAssignment(e, type, contextualMapper); } @@ -13802,7 +14117,9 @@ var ts; return rightType; } function checkForDisallowedESSymbolOperand(operator) { - var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined; + var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : + someConstituentTypeHasKind(rightType, 1048576) ? node.right : + undefined; if (offendingSymbolOperand) { error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator)); return false; @@ -13913,8 +14230,8 @@ var ts; } if (isConstEnumObjectType(type)) { var ok = (node.parent.kind === 153 && node.parent.expression === node) || - (node.parent.kind === 154 && node.parent.expression === node) || - ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); + (node.parent.kind === 154 && node.parent.expression === node) || + ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); if (!ok) { error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment); } @@ -14064,7 +14381,7 @@ var ts; var declaration = indexSymbol.declarations[i]; if (declaration.parameters.length === 1 && declaration.parameters[0].type) { switch (declaration.parameters[0].type.kind) { - case 121: + case 120: if (!seenStringIndexer) { seenStringIndexer = true; } @@ -14072,7 +14389,7 @@ var ts; error(declaration, ts.Diagnostics.Duplicate_string_index_signature); } break; - case 119: + case 118: if (!seenNumericIndexer) { seenNumericIndexer = true; } @@ -14139,7 +14456,7 @@ var ts; if (ts.getClassBaseTypeNode(node.parent)) { if (containsSuperCall(node.body)) { var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || - ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); + ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); if (superCallShouldBeFirst) { var statements = node.body.statements; if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) { @@ -14461,13 +14778,15 @@ var ts; case 197: return 2097152; case 200: - return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304; + return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 + ? 4194304 | 1048576 + : 4194304; case 196: case 199: return 2097152 | 1048576; case 202: var result = 0; - var target = resolveImport(getSymbolOfNode(d)); + var target = resolveAlias(getSymbolOfNode(d)); ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); }); return result; default: @@ -14488,7 +14807,7 @@ var ts; } function checkFunctionLikeDeclaration(node) { checkSignatureDeclaration(node); - if (node.name.kind === 126) { + if (node.name && node.name.kind === 126) { checkComputedPropertyName(node.name); } if (!ts.hasDynamicName(node)) { @@ -14604,24 +14923,24 @@ var ts; } } function checkVarDeclaredNamesNotShadowed(node) { - if (node.initializer && (ts.getCombinedNodeFlags(node) & 6144) === 0) { + if (node.initializer && (ts.getCombinedNodeFlags(node) & 12288) === 0) { var symbol = getSymbolOfNode(node); if (symbol.flags & 1) { var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined); if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) { - if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 6144) { + if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) { var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194); var container = varDeclList.parent.kind === 175 && - varDeclList.parent.parent; + varDeclList.parent.parent; var namesShareScope = container && - (container.kind === 174 && ts.isAnyFunction(container.parent) || - (container.kind === 201 && container.kind === 200) || - container.kind === 220); + (container.kind === 174 && ts.isFunctionLike(container.parent) || + (container.kind === 201 && container.kind === 200) || + container.kind === 220); if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); - error(ts.getErrorSpanForNode(node), ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); + error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); } } } @@ -14777,33 +15096,127 @@ var ts; checkSourceElement(node.statement); } function checkForOfStatement(node) { - checkGrammarForOfStatement(node); + if (languageVersion < 2) { + grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); + return; + } + checkGrammarForInOrForOfStatement(node); + if (node.initializer.kind === 194) { + checkForInOrForOfVariableDeclaration(node); + } + else { + var varExpr = node.initializer; + var rightType = checkExpression(node.expression); + var iteratedType = checkIteratedType(rightType, node.expression); + if (varExpr.kind === 151 || varExpr.kind === 152) { + checkDestructuringAssignment(varExpr, iteratedType || unknownType); + } + else { + var leftType = checkExpression(varExpr); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant); + if (iteratedType) { + checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined); + } + } + } + checkSourceElement(node.statement); } function checkForInStatement(node) { checkGrammarForInOrForOfStatement(node); if (node.initializer.kind === 194) { - var variableDeclarationList = node.initializer; - if (variableDeclarationList.declarations.length >= 1) { - var decl = variableDeclarationList.declarations[0]; - checkVariableDeclaration(decl); + var variable = node.initializer.declarations[0]; + if (variable && ts.isBindingPattern(variable.name)) { + error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); } + checkForInOrForOfVariableDeclaration(node); } else { var varExpr = node.initializer; - var exprType = checkExpression(varExpr); - if (!allConstituentTypesHaveKind(exprType, 1 | 258)) { + var leftType = checkExpression(varExpr); + if (varExpr.kind === 151 || varExpr.kind === 152) { + error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); + } + else if (!allConstituentTypesHaveKind(leftType, 1 | 258)) { error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any); } else { - checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant); } } - var exprType = checkExpression(node.expression); - if (!allConstituentTypesHaveKind(exprType, 1 | 48128 | 512)) { + var rightType = checkExpression(node.expression); + if (!allConstituentTypesHaveKind(rightType, 1 | 48128 | 512)) { error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter); } checkSourceElement(node.statement); } + function checkForInOrForOfVariableDeclaration(iterationStatement) { + var variableDeclarationList = iterationStatement.initializer; + if (variableDeclarationList.declarations.length >= 1) { + var decl = variableDeclarationList.declarations[0]; + checkVariableDeclaration(decl); + } + } + function getTypeForVariableDeclarationInForOfStatement(forOfStatement) { + if (languageVersion < 2) { + return anyType; + } + var expressionType = getTypeOfExpression(forOfStatement.expression); + return checkIteratedType(expressionType, forOfStatement.expression) || anyType; + } + function checkIteratedType(iterable, expressionForError) { + ts.Debug.assert(languageVersion >= 2); + var iteratedType = getIteratedType(iterable, expressionForError); + if (expressionForError && iteratedType) { + var completeIterableType = globalIterableType !== emptyObjectType + ? createTypeReference(globalIterableType, [iteratedType]) + : emptyObjectType; + checkTypeAssignableTo(iterable, completeIterableType, expressionForError); + } + return iteratedType; + function getIteratedType(iterable, expressionForError) { + if (allConstituentTypesHaveKind(iterable, 1)) { + return undefined; + } + var iteratorFunction = getTypeOfPropertyOfType(iterable, ts.getPropertyNameForKnownSymbolName("iterator")); + if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, 1)) { + return undefined; + } + var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, 0) : emptyArray; + if (iteratorFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator); + } + return undefined; + } + var iterator = getUnionType(ts.map(iteratorFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iterator, 1)) { + return undefined; + } + var iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next"); + if (iteratorNextFunction && allConstituentTypesHaveKind(iteratorNextFunction, 1)) { + return undefined; + } + var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, 0) : emptyArray; + if (iteratorNextFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method); + } + return undefined; + } + var iteratorNextResult = getUnionType(ts.map(iteratorNextFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iteratorNextResult, 1)) { + return undefined; + } + var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value"); + if (!iteratorNextValue) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property); + } + return undefined; + } + return iteratorNextValue; + } + } function checkBreakOrContinueStatement(node) { checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node); } @@ -14879,7 +15292,7 @@ var ts; if (!checkGrammarStatementInAmbientContext(node)) { var current = node.parent; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { break; } if (current.kind === 189 && current.label.text === node.label.text) { @@ -14907,16 +15320,33 @@ var ts; checkBlock(node.tryBlock); var catchClause = node.catchClause; if (catchClause) { - if (catchClause.type) { - var sourceFile = ts.getSourceFileOfNode(node); - var colonStart = ts.skipTrivia(sourceFile.text, catchClause.name.end); - grammarErrorAtPos(sourceFile, colonStart, ":".length, ts.Diagnostics.Catch_clause_parameter_cannot_have_a_type_annotation); + if (catchClause.variableDeclaration) { + if (catchClause.variableDeclaration.name.kind !== 64) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier); + } + else if (catchClause.variableDeclaration.type) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation); + } + else if (catchClause.variableDeclaration.initializer) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer); + } + else { + var identifierName = catchClause.variableDeclaration.name.text; + var locals = catchClause.block.locals; + if (locals && ts.hasProperty(locals, identifierName)) { + var localSymbol = locals[identifierName]; + if (localSymbol && (localSymbol.flags & 2) !== 0) { + grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); + } + } + checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.variableDeclaration.name); + } } - checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.name); checkBlock(catchClause.block); } - if (node.finallyBlock) + if (node.finallyBlock) { checkBlock(node.finallyBlock); + } } function checkIndexConstraints(type) { var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1); @@ -14971,7 +15401,9 @@ var ts; errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0]; } if (errorNode && !isTypeAssignableTo(propertyType, indexType)) { - var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; + var errorMessage = indexKind === 0 + ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 + : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType)); } } @@ -15004,10 +15436,12 @@ var ts; } function checkClassDeclaration(node) { checkGrammarClassDeclarationHeritageClauses(node); - checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + if (node.name) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + } checkTypeParameters(node.typeParameters); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); var type = getDeclaredTypeOfSymbol(symbol); @@ -15020,10 +15454,10 @@ var ts; if (type.baseTypes.length) { if (produceDiagnostics) { var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); + checkTypeAssignableTo(type, baseType, node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, baseTypeNode.typeName, 107455)) { + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); + if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, 107455)) { error(baseTypeNode, ts.Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); } checkKindsOfPropertyMemberOverrides(type, baseType); @@ -15039,7 +15473,7 @@ var ts; if (t !== unknownType) { var declaredType = (t.flags & 4096) ? t.target : t; if (declaredType.flags & (1024 | 2048)) { - checkTypeAssignableTo(type, t, node.name, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); + checkTypeAssignableTo(type, t, node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); } else { error(typeRefNode, ts.Diagnostics.A_class_may_only_implement_another_class_or_interface); @@ -15387,21 +15821,15 @@ var ts; if (!ts.isInAmbientContext(node) && node.name.kind === 8) { grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names); } - else if (node.name.kind === 64 && node.body.kind === 201) { - var statements = node.body.statements; - for (var i = 0, n = statements.length; i < n; i++) { - var statement = statements[i]; - if (statement.kind === 208) { - grammarErrorOnNode(statement, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); - } - } - } } checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); - if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { + if (symbol.flags & 512 + && symbol.declarations.length > 1 + && !ts.isInAmbientContext(node) + && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); if (classOrFunc) { if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) { @@ -15437,7 +15865,9 @@ var ts; } var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8; if (node.parent.kind !== 220 && !inAmbientExternalModule) { - error(moduleName, node.kind === 209 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); + error(moduleName, node.kind === 209 ? + ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : + ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); return false; } if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) { @@ -15446,15 +15876,17 @@ var ts; } return true; } - function checkImportSymbol(node) { + function checkAliasSymbol(node) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | - (symbol.flags & 793056 ? 793056 : 0) | - (symbol.flags & 1536 ? 1536 : 0); + (symbol.flags & 793056 ? 793056 : 0) | + (symbol.flags & 1536 ? 1536 : 0); if (target.flags & excludedMeanings) { - var message = node.kind === 211 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; + var message = node.kind === 211 ? + ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : + ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; error(node, message, symbolToString(symbol)); } } @@ -15462,10 +15894,10 @@ var ts; function checkImportBinding(node) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); - checkImportSymbol(node); + checkAliasSymbol(node); } function checkImportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers); } if (checkExternalImportOrExportDeclaration(node)) { @@ -15487,50 +15919,107 @@ var ts; } function checkImportEqualsDeclaration(node) { checkGrammarModifiers(node); - if (ts.isInternalModuleImportEqualsDeclaration(node)) { + if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); - if (target !== unknownSymbol) { - if (target.flags & 107455) { - var moduleName = getFirstIdentifier(node.moduleReference); - if (resolveEntityName(node, moduleName, 107455 | 1536).flags & 1536) { - checkExpressionOrQualifiedName(node.moduleReference); - } - else { - error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); - } - } - if (target.flags & 793056) { - checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); - } + if (node.flags & 1) { + markExportAsReferenced(node); } - } - else { - if (checkExternalImportOrExportDeclaration(node)) { - checkImportBinding(node); + if (ts.isInternalModuleImportEqualsDeclaration(node)) { + var target = resolveAlias(getSymbolOfNode(node)); + if (target !== unknownSymbol) { + if (target.flags & 107455) { + var moduleName = getFirstIdentifier(node.moduleReference); + if (!(resolveEntityName(moduleName, 107455 | 1536).flags & 1536)) { + error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); + } + } + if (target.flags & 793056) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); + } + } } } } function checkExportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers); } if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { if (node.exportClause) { - ts.forEach(node.exportClause.elements, checkImportSymbol); + ts.forEach(node.exportClause.elements, checkExportSpecifier); } } } + function checkExportSpecifier(node) { + checkAliasSymbol(node); + if (!node.parent.parent.moduleSpecifier) { + markExportAsReferenced(node); + } + } function checkExportAssignment(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + var container = node.parent.kind === 220 ? node.parent : node.parent.parent; + if (container.kind === 200 && container.name.kind === 64) { + error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); + return; + } + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; - if (container.kind !== 220) { - container = container.parent; + if (node.expression.kind === 64) { + markExportAsReferenced(node); + } + else { + checkExpressionCached(node.expression); + } + checkExternalModuleExports(container); + } + function getModuleStatements(node) { + if (node.kind === 220) { + return node.statements; + } + if (node.kind === 200 && node.body.kind === 201) { + return node.body.statements; + } + return emptyArray; + } + function hasExportedMembers(moduleSymbol) { + var declarations = moduleSymbol.declarations; + for (var i = 0; i < declarations.length; i++) { + var statements = getModuleStatements(declarations[i]); + for (var j = 0; j < statements.length; j++) { + var node = statements[j]; + if (node.kind === 209) { + var exportClause = node.exportClause; + if (!exportClause) { + return true; + } + var specifiers = exportClause.elements; + for (var k = 0; k < specifiers.length; k++) { + var specifier = specifiers[k]; + if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) { + return true; + } + } + } + else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) { + return true; + } + } + } + } + function checkExternalModuleExports(node) { + var moduleSymbol = getSymbolOfNode(node); + var links = getSymbolLinks(moduleSymbol); + if (!links.exportsChecked) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + if (hasExportedMembers(moduleSymbol)) { + var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; + error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); + } + } + links.exportsChecked = true; } - checkTypeOfExportAssignmentSymbol(getSymbolOfNode(container)); } function checkSourceElement(node) { if (!node) @@ -15712,6 +16201,7 @@ var ts; case 196: case 199: case 219: + case 208: case 220: ts.forEachChild(node, checkFunctionExpressionBodies); break; @@ -15731,11 +16221,7 @@ var ts; ts.forEach(node.statements, checkSourceElement); checkFunctionExpressionBodies(node); if (ts.isExternalModule(node)) { - var symbol = getExportAssignmentSymbol(node.symbol); - if (symbol && symbol.flags & 8388608) { - getSymbolLinks(symbol).referenced = true; - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + checkExternalModuleExports(node); } if (potentialThisCollisions.length) { ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope); @@ -15824,11 +16310,6 @@ var ts; copySymbol(location.symbol, meaning); } break; - case 216: - if (location.name.text) { - copySymbol(location.symbol, meaning); - } - break; } memberFlags = location.flags; location = location.parent; @@ -15862,11 +16343,11 @@ var ts; return true; } switch (node.kind) { + case 111: + case 118: + case 120: case 112: - case 119: case 121: - case 113: - case 122: return true; case 98: return node.parent.kind !== 164; @@ -15925,7 +16406,7 @@ var ts; return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent; } if (nodeOnRightSide.parent.kind === 208) { - return nodeOnRightSide.parent.exportName === nodeOnRightSide && nodeOnRightSide.parent; + return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent; } return undefined; } @@ -15937,11 +16418,11 @@ var ts; (node.parent.kind === 153 && node.parent.name === node); } function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) { - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(entityName)) { + if (ts.isDeclarationName(entityName)) { return getSymbolOfNode(entityName.parent); } if (entityName.parent.kind === 208) { - return resolveEntityName(entityName.parent.parent, entityName, 107455 | 793056 | 1536 | 8388608); + return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608); } if (entityName.kind !== 153) { if (isInRightSideOfImportOrExportAssignment(entityName)) { @@ -15957,7 +16438,7 @@ var ts; } if (entityName.kind === 64) { var meaning = 107455 | 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } else if (entityName.kind === 153) { var symbol = getNodeLinks(entityName).resolvedSymbol; @@ -15977,7 +16458,7 @@ var ts; else if (isTypeReferenceIdentifier(entityName)) { var meaning = entityName.parent.kind === 139 ? 793056 : 1536; meaning |= 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } return undefined; } @@ -15985,11 +16466,13 @@ var ts; if (isInsideWithStatementBody(node)) { return undefined; } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { return getSymbolOfNode(node.parent); } if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) { - return node.parent.kind === 208 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node); + return node.parent.kind === 208 + ? getSymbolOfEntityNameOrPropertyAccessExpression(node) + : getSymbolOfPartOfRightHandSideOfImportEquals(node); } switch (node.kind) { case 64: @@ -16000,18 +16483,19 @@ var ts; case 90: var type = checkExpression(node); return type.symbol; - case 114: + case 113: var constructorDeclaration = node.parent; if (constructorDeclaration && constructorDeclaration.kind === 133) { return constructorDeclaration.parent.symbol; } return undefined; case 8: - if (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && - ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) { - var importSymbol = getSymbolOfNode(node.parent.parent); - var moduleType = getTypeOfSymbol(importSymbol); - return moduleType ? moduleType.symbol : undefined; + var moduleName; + if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && + ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || + ((node.parent.kind === 203 || node.parent.kind === 209) && + node.parent.moduleSpecifier === node)) { + return resolveExternalModuleName(node, node); } case 7: if (node.parent.kind == 154 && node.parent.argumentExpression === node) { @@ -16029,7 +16513,7 @@ var ts; } function getShorthandAssignmentValueSymbol(location) { if (location && location.kind === 218) { - return resolveEntityName(location, location.name, 107455); + return resolveEntityName(location.name, 107455); } return undefined; } @@ -16055,7 +16539,7 @@ var ts; var symbol = getSymbolOfNode(node); return getTypeOfSymbol(symbol); } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { var symbol = getSymbolInfo(node); return symbol && getTypeOfSymbol(symbol); } @@ -16132,6 +16616,10 @@ var ts; return generatedNames; function generateNames(node) { switch (node.kind) { + case 195: + case 196: + generateNameForFunctionOrClassDeclaration(node); + break; case 200: generateNameForModuleOrEnum(node); generateNames(node.body); @@ -16145,6 +16633,9 @@ var ts; case 209: generateNameForExportDeclaration(node); break; + case 208: + generateNameForExportAssignment(node); + break; case 220: case 201: ts.forEach(node.statements, generateNames); @@ -16155,27 +16646,17 @@ var ts; return ts.hasProperty(globals, name) || ts.hasProperty(sourceFile.identifiers, name) || ts.hasProperty(generatedNames, name); } function makeUniqueName(baseName) { - if (baseName.charCodeAt(0) !== 95) { - var baseName = "_" + baseName; - if (!isExistingName(baseName)) { - return generatedNames[baseName] = baseName; - } - } - if (baseName.charCodeAt(baseName.length - 1) !== 95) { - baseName += "_"; - } - var i = 1; - while (true) { - name = baseName + i; - if (!isExistingName(name)) { - return generatedNames[name] = name; - } - i++; - } + var name = ts.generateUniqueName(baseName, isExistingName); + return generatedNames[name] = name; } function assignGeneratedName(node, name) { getNodeLinks(node).generatedName = ts.unescapeIdentifier(name); } + function generateNameForFunctionOrClassDeclaration(node) { + if (!node.name) { + assignGeneratedName(node, makeUniqueName("default")); + } + } function generateNameForModuleOrEnum(node) { if (node.name.kind === 64) { var name = node.name.text; @@ -16184,7 +16665,8 @@ var ts; } function generateNameForImportOrExportDeclaration(node) { var expr = ts.getExternalModuleName(node); - var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; + var baseName = expr.kind === 8 ? + ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; assignGeneratedName(node, makeUniqueName(baseName)); } function generateNameForImportDeclaration(node) { @@ -16197,6 +16679,11 @@ var ts; generateNameForImportOrExportDeclaration(node); } } + function generateNameForExportAssignment(node) { + if (node.expression.kind !== 64) { + assignGeneratedName(node, makeUniqueName("default")); + } + } } function getGeneratedNameForNode(node) { var links = getNodeLinks(node); @@ -16211,8 +16698,8 @@ var ts; function getLocalNameForImportDeclaration(node) { return getGeneratedNameForNode(node); } - function getImportNameSubstitution(symbol) { - var declaration = getDeclarationOfImportSymbol(symbol); + function getAliasNameSubstitution(symbol) { + var declaration = getDeclarationOfAliasSymbol(symbol); if (declaration && declaration.kind === 207) { var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent); var propertyName = declaration.propertyName || declaration.name; @@ -16243,38 +16730,35 @@ var ts; return getExportNameSubstitution(exportSymbol, node.parent); } if (symbol.flags & 8388608) { - return getImportNameSubstitution(symbol); + return getAliasNameSubstitution(symbol); } } } - function getExportAssignmentName(node) { - var symbol = getExportAssignmentSymbol(getSymbolOfNode(node)); - return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol) ? symbolToString(symbol) : undefined; + function hasExportDefaultValue(node) { + var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node)); + return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol); } function isTopLevelValueImportEqualsWithEntityName(node) { if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) { return false; } - return isImportResolvedToValue(getSymbolOfNode(node)); + return isAliasResolvedToValue(getSymbolOfNode(node)); } - function isImportResolvedToValue(symbol) { - var target = resolveImport(symbol); + function isAliasResolvedToValue(symbol) { + var target = resolveAlias(symbol); return target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target); } function isConstEnumOrConstEnumOnlyModule(s) { return isConstEnumSymbol(s) || s.constEnumOnlyModule; } - function isReferencedImportDeclaration(node) { - if (isImportSymbolDeclaration(node)) { + function isReferencedAliasDeclaration(node) { + if (isAliasSymbolDeclaration(node)) { var symbol = getSymbolOfNode(node); if (getSymbolLinks(symbol).referenced) { return true; } - if (node.kind === 202 && node.flags & 1 && isImportResolvedToValue(symbol)) { - return true; - } } - return ts.forEachChild(node, isReferencedImportDeclaration); + return ts.forEachChild(node, isReferencedAliasDeclaration); } function isImplementationOfOverload(node) { if (ts.nodeIsPresent(node.body)) { @@ -16308,7 +16792,9 @@ var ts; } function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) { var symbol = getSymbolOfNode(declaration); - var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType; + var type = symbol && !(symbol.flags & (2048 | 131072)) + ? getTypeOfSymbol(symbol) + : unknownType; getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) { @@ -16319,12 +16805,38 @@ var ts; return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name); } + function getBlockScopedVariableId(n) { + ts.Debug.assert(!ts.nodeIsSynthesized(n)); + if (n.parent.kind === 153 && + n.parent.name === n) { + return undefined; + } + if (n.parent.kind === 150 && + n.parent.propertyName === n) { + return undefined; + } + var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || + n.parent.kind === 150 + ? getSymbolOfNode(n.parent) + : undefined; + var symbol = declarationSymbol || + getNodeLinks(n).resolvedSymbol || + resolveName(n, n.text, 2 | 8388608, undefined, undefined); + var isLetOrConst = symbol && + (symbol.flags & 2) && + symbol.valueDeclaration.parent.kind !== 216; + if (isLetOrConst) { + getSymbolLinks(symbol); + return symbol.id; + } + return undefined; + } function createResolver() { return { getGeneratedNameForNode: getGeneratedNameForNode, getExpressionNameSubstitution: getExpressionNameSubstitution, - getExportAssignmentName: getExportAssignmentName, - isReferencedImportDeclaration: isReferencedImportDeclaration, + hasExportDefaultValue: hasExportDefaultValue, + isReferencedAliasDeclaration: isReferencedAliasDeclaration, getNodeCheckFlags: getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible: isDeclarationVisible, @@ -16334,7 +16846,8 @@ var ts; isSymbolAccessible: isSymbolAccessible, isEntityNameVisible: isEntityNameVisible, getConstantValue: getConstantValue, - isUnknownIdentifier: isUnknownIdentifier + isUnknownIdentifier: isUnknownIdentifier, + getBlockScopedVariableId: getBlockScopedVariableId }; } function initializeTypeChecker() { @@ -16362,6 +16875,7 @@ var ts; globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray"); globalESSymbolType = getGlobalType("Symbol"); globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"); + globalIterableType = getGlobalType("Iterable", 1); } else { globalTemplateStringsArrayType = unknownType; @@ -16404,14 +16918,14 @@ var ts; for (var i = 0, n = node.modifiers.length; i < n; i++) { var modifier = node.modifiers[i]; switch (modifier.kind) { - case 109: case 108: case 107: + case 106: var text; - if (modifier.kind === 109) { + if (modifier.kind === 108) { text = "public"; } - else if (modifier.kind === 108) { + else if (modifier.kind === 107) { text = "protected"; lastProtected = modifier; } @@ -16430,7 +16944,7 @@ var ts; } flags |= ts.modifierToFlag(modifier.kind); break; - case 110: + case 109: if (flags & 128) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static"); } @@ -16458,7 +16972,7 @@ var ts; } flags |= 1; break; - case 115: + case 114: if (flags & 2) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare"); } @@ -16564,7 +17078,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter); } - if (parameter.flags & 243) { + if (parameter.flags & 499) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier); } if (parameter.questionToken) { @@ -16576,7 +17090,7 @@ var ts; if (!parameter.type) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation); } - if (parameter.type.kind !== 121 && parameter.type.kind !== 119) { + if (parameter.type.kind !== 120 && parameter.type.kind !== 118) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number); } if (!node.type) { @@ -16584,7 +17098,7 @@ var ts; } } function checkGrammarForIndexSignatureModifier(node) { - if (node.flags & 243) { + if (node.flags & 499) { grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members); } } @@ -16649,7 +17163,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); if (seenImplementsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen); } @@ -16672,7 +17186,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause); } checkGrammarHeritageClause(heritageClause); @@ -16769,29 +17283,28 @@ var ts; var variableList = forInOrOfStatement.initializer; if (!checkGrammarVariableDeclarationList(variableList)) { if (variableList.declarations.length > 1) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement + : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic); } var firstDeclaration = variableList.declarations[0]; if (firstDeclaration.initializer) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer + : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; return grammarErrorOnNode(firstDeclaration.name, diagnostic); } if (firstDeclaration.type) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation + : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; return grammarErrorOnNode(firstDeclaration, diagnostic); } } } return false; } - function checkGrammarForOfStatement(forOfStatement) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_not_currently_supported); - if (languageVersion < 2) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); - } - return checkGrammarForInOrForOfStatement(forOfStatement); - } function checkGrammarAccessor(accessor) { var kind = accessor.kind; if (languageVersion < 1) { @@ -16821,7 +17334,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter); } - else if (parameter.flags & 243) { + else if (parameter.flags & 499) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } else if (parameter.questionToken) { @@ -16886,13 +17399,14 @@ var ts; function checkGrammarBreakOrContinueStatement(node) { var current = node; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary); } switch (current.kind) { case 189: if (node.label && current.label.text === node.label.text) { - var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true); + var isMisplacedContinueLabel = node.kind === 184 + && !isIterationStatement(current.statement, true); if (isMisplacedContinueLabel) { return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement); } @@ -16913,11 +17427,15 @@ var ts; current = current.parent; } if (node.label) { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement + : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } else { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement + : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } } @@ -16934,16 +17452,17 @@ var ts; return checkGrammarEvalOrArgumentsInStrictMode(node, node.name); } function checkGrammarVariableDeclaration(node) { - if (ts.isInAmbientContext(node)) { - if (ts.isBindingPattern(node.name)) { - return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + if (node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) { + if (ts.isInAmbientContext(node)) { + if (ts.isBindingPattern(node.name)) { + return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + } + if (node.initializer) { + var equalsTokenLength = "=".length; + return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength, equalsTokenLength, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); + } } - if (node.initializer) { - return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); - } - } - else { - if (!node.initializer) { + else if (!node.initializer) { if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) { return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer); } @@ -16977,14 +17496,6 @@ var ts; if (!declarationList.declarations.length) { return grammarErrorAtPos(ts.getSourceFileOfNode(declarationList), declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty); } - if (languageVersion < 2) { - if (ts.isLet(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - else if (ts.isConst(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - } } function allowLetAndConstDeclarations(parent) { switch (parent.kind) { @@ -17024,7 +17535,7 @@ var ts; return false; } function checkGrammarEnumDeclaration(enumDecl) { - var enumIsConst = (enumDecl.flags & 4096) !== 0; + var enumIsConst = (enumDecl.flags & 8192) !== 0; var hasError = false; if (!enumIsConst) { var inConstantEnumMemberSection = true; @@ -17052,18 +17563,11 @@ var ts; function hasParseDiagnostics(sourceFile) { return sourceFile.parseDiagnostics.length > 0; } - function scanToken(scanner, pos) { - scanner.setTextPos(pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return start; - } function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - var start = scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, scanner.getTextPos() - start, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2)); return true; } } @@ -17076,16 +17580,17 @@ var ts; function grammarErrorOnNode(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var span = ts.getErrorSpanForNode(node); - var start = span.end > span.pos ? ts.skipTrivia(sourceFile.text, span.pos) : span.pos; - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, span.end - start, message, arg0, arg1, arg2)); + diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2)); return true; } } - function checkGrammarEvalOrArgumentsInStrictMode(contextNode, identifier) { - if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { - var name = ts.declarationNameToString(identifier); - return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, name); + function checkGrammarEvalOrArgumentsInStrictMode(contextNode, name) { + if (name && name.kind === 64) { + var identifier = name; + if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { + var nameText = ts.declarationNameToString(identifier); + return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, nameText); + } } } function checkGrammarConstructorTypeParameters(node) { @@ -17149,7 +17654,7 @@ var ts; return getNodeLinks(node).hasReportedStatementInAmbientContext = true; } var links = getNodeLinks(node); - if (!links.hasReportedStatementInAmbientContext && ts.isAnyFunction(node.parent)) { + if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) { return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts); } if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) { @@ -17163,7 +17668,7 @@ var ts; } } function checkGrammarNumbericLiteral(node) { - if (node.flags & 8192) { + if (node.flags & 16384) { if (node.parserContextFlags & 1) { return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode); } @@ -17175,9 +17680,8 @@ var ts; function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, scanner.getTextPos(), 0, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), 0, message, arg0, arg1, arg2)); return true; } } @@ -17306,7 +17810,9 @@ var ts; var lineCount = ts.getLineStarts(currentSourceFile).length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { - var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); + var nextLineStart = (currentLine + 1) === lineCount + ? currentSourceFile.text.length + 1 + : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); if (pos !== comment.pos) { if (firstCommentLineIndent === undefined) { firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); @@ -17384,7 +17890,8 @@ var ts; } else { ts.forEach(declarations, function (member) { - if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) { + if ((member.kind === 134 || member.kind === 135) + && (member.flags & 128) === (accessor.flags & 128)) { var memberName = ts.getPropertyNameForPropertyNameNode(member.name); var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name); if (memberName === accessorName) { @@ -17449,7 +17956,7 @@ var ts; var addedGlobalFileReference = false; ts.forEach(root.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, root, fileReference); - if (referencedFile && ((referencedFile.flags & 1024) || + if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) { writeReferencePath(referencedFile); @@ -17608,11 +18115,11 @@ var ts; } function emitType(type) { switch (type.kind) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 8: return writeTextOfNode(currentSourceFile, type); @@ -17702,8 +18209,8 @@ var ts; emitLines(node.statements); } function emitExportAssignment(node) { - write("export = "); - writeTextOfNode(currentSourceFile, node.exportName); + write(node.isExportEquals ? "export = " : "export default "); + writeTextOfNode(currentSourceFile, node.expression); write(";"); writeLine(); } @@ -17919,7 +18426,9 @@ var ts; function getHeritageClauseVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.parent.parent.kind === 196) { - diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; + diagnosticMessage = isImplementsList ? + ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : + ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; } else { diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; @@ -18012,17 +18521,31 @@ var ts; function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.kind === 193) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; } else if (node.kind === 130 || node.kind === 129) { if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; } } return diagnosticMessage !== undefined ? { @@ -18084,17 +18607,25 @@ var ts; } function getTypeAnnotationFromAccessor(accessor) { if (accessor) { - return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined; + return accessor.kind === 134 + ? accessor.type + : accessor.parameters.length > 0 + ? accessor.parameters[0].type + : undefined; } } function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (accessorWithTypeAnnotation.kind === 135) { if (accessorWithTypeAnnotation.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; } return { diagnosticMessage: diagnosticMessage, @@ -18104,10 +18635,18 @@ var ts; } else { if (accessorWithTypeAnnotation.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; } return { diagnosticMessage: diagnosticMessage, @@ -18189,28 +18728,48 @@ var ts; var diagnosticMessage; switch (node.kind) { case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 138: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 132: case 131: if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; break; default: ts.Debug.fail("This is unknown kind for signature: " + node.kind); @@ -18249,28 +18808,50 @@ var ts; var diagnosticMessage; switch (node.parent.kind) { case 133: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; break; case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 132: case 131: if (node.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } else if (node.parent.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; break; default: ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind); @@ -18322,7 +18903,11 @@ var ts; } } function writeReferencePath(referencedFile) { - var declFileName = referencedFile.flags & 1024 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var declFileName = referencedFile.flags & 2048 + ? referencedFile.fileName + : shouldEmitToOwnFile(referencedFile, compilerOptions) + ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") + : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false); referencePathsOutput += "/// " + newLine; } @@ -18374,12 +18959,16 @@ var ts; var increaseIndent = writer.increaseIndent; var decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var lastFrame; + var currentScopeNames; + var generatedBlockScopeNames; var extendsEmitted = false; var tempCount = 0; var tempVariables; var tempParameters; var externalImports; var exportSpecifiers; + var exportDefault; var writeEmittedFiles = writeJavaScriptFile; var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments; var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments; @@ -18411,6 +19000,53 @@ var ts; writeLine(); writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); return; + function enterNameScope() { + var names = currentScopeNames; + currentScopeNames = undefined; + if (names) { + lastFrame = { names: names, previous: lastFrame }; + return true; + } + return false; + } + function exitNameScope(popFrame) { + if (popFrame) { + currentScopeNames = lastFrame.names; + lastFrame = lastFrame.previous; + } + else { + currentScopeNames = undefined; + } + } + function generateUniqueNameForLocation(location, baseName) { + var name; + if (!isExistingName(location, baseName)) { + name = baseName; + } + else { + name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); }); + } + if (!currentScopeNames) { + currentScopeNames = {}; + } + return currentScopeNames[name] = name; + } + function isExistingName(location, name) { + if (!resolver.isUnknownIdentifier(location, name)) { + return true; + } + if (currentScopeNames && ts.hasProperty(currentScopeNames, name)) { + return true; + } + var frame = lastFrame; + while (frame) { + if (ts.hasProperty(frame.names, name)) { + return true; + } + frame = frame.previous; + } + return false; + } function initializeEmitterWithSourceMaps() { var sourceMapDir; var sourceMapSourceIndex = -1; @@ -18564,7 +19200,9 @@ var ts; node.kind === 199) { if (node.name) { var name = node.name; - scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text; + scopeName = name.kind === 126 + ? ts.getTextOfNode(name) + : node.name.text; } recordScopeNameStart(scopeName); } @@ -18670,13 +19308,13 @@ var ts; function createTempVariable(location, forLoopVariable) { var name = forLoopVariable ? "_i" : undefined; while (true) { - if (name && resolver.isUnknownIdentifier(location, name)) { + if (name && !isExistingName(location, name)) { break; } name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25); tempCount++; } - var result = ts.createNode(64); + var result = ts.createSynthesizedNode(64); result.text = name; return result; } @@ -18720,7 +19358,7 @@ var ts; emit(node); } } - function emitParenthesized(node, parenthesized) { + function emitParenthesizedIf(node, parenthesized) { if (parenthesized) { write("("); } @@ -18807,37 +19445,109 @@ var ts; emit(nodes[i]); } } - function isBinaryOrOctalIntegerLiteral(text) { - if (text.length <= 0) { - return false; - } - if (text.charCodeAt(1) === 66 || text.charCodeAt(1) === 98 || - text.charCodeAt(1) === 79 || text.charCodeAt(1) === 111) { - return true; + function isBinaryOrOctalIntegerLiteral(node, text) { + if (node.kind === 7 && text.length > 1) { + switch (text.charCodeAt(1)) { + case 98: + case 66: + case 111: + case 79: + return true; + } } return false; } function emitLiteral(node) { - var text = languageVersion < 2 && ts.isTemplateLiteralKind(node.kind) ? getTemplateLiteralAsStringLiteral(node) : node.parent ? ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node) : node.text; + var text = getLiteralText(node); if (compilerOptions.sourceMap && (node.kind === 8 || ts.isTemplateLiteralKind(node.kind))) { writer.writeLiteral(text); } - else if (languageVersion < 2 && node.kind === 7 && isBinaryOrOctalIntegerLiteral(text)) { + else if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) { write(node.text); } else { write(text); } } - function getTemplateLiteralAsStringLiteral(node) { - return '"' + ts.escapeString(node.text) + '"'; + function getLiteralText(node) { + if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) { + return getQuotedEscapedLiteralText('"', node.text, '"'); + } + if (node.parent) { + return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + } + switch (node.kind) { + case 8: + return getQuotedEscapedLiteralText('"', node.text, '"'); + case 10: + return getQuotedEscapedLiteralText('`', node.text, '`'); + case 11: + return getQuotedEscapedLiteralText('`', node.text, '${'); + case 12: + return getQuotedEscapedLiteralText('}', node.text, '${'); + case 13: + return getQuotedEscapedLiteralText('}', node.text, '`'); + case 7: + return node.text; + } + ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for."); + } + function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) { + return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; + } + function emitDownlevelRawTemplateLiteral(node) { + var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var isLast = node.kind === 10 || node.kind === 13; + text = text.substring(1, text.length - (isLast ? 1 : 2)); + text = text.replace(/\r\n?/g, "\n"); + text = ts.escapeString(text); + write('"' + text + '"'); + } + function emitDownlevelTaggedTemplateArray(node, literalEmitter) { + write("["); + if (node.template.kind === 10) { + literalEmitter(node.template); + } + else { + literalEmitter(node.template.head); + ts.forEach(node.template.templateSpans, function (child) { + write(", "); + literalEmitter(child.literal); + }); + } + write("]"); + } + function emitDownlevelTaggedTemplate(node) { + var tempVariable = createAndRecordTempVariable(node); + write("("); + emit(tempVariable); + write(" = "); + emitDownlevelTaggedTemplateArray(node, emit); + write(", "); + emit(tempVariable); + write(".raw = "); + emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral); + write(", "); + emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag)); + write("("); + emit(tempVariable); + if (node.template.kind === 169) { + ts.forEach(node.template.templateSpans, function (templateSpan) { + write(", "); + var needsParens = templateSpan.expression.kind === 167 + && templateSpan.expression.operatorToken.kind === 23; + emitParenthesizedIf(templateSpan.expression, needsParens); + }); + } + write("))"); } function emitTemplateExpression(node) { if (languageVersion >= 2) { ts.forEachChild(node, emit); return; } - var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent); + var emitOuterParens = ts.isExpression(node.parent) + && templateNeedsParens(node, node.parent); if (emitOuterParens) { write("("); } @@ -18848,11 +19558,12 @@ var ts; } for (var i = 0; i < node.templateSpans.length; i++) { var templateSpan = node.templateSpans[i]; - var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; + var needsParens = templateSpan.expression.kind !== 159 + && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; if (i > 0 || headEmitted) { write(" + "); } - emitParenthesized(templateSpan.expression, needsParens); + emitParenthesizedIf(templateSpan.expression, needsParens); if (templateSpan.literal.text.length !== 0) { write(" + "); emitLiteral(templateSpan.literal); @@ -18950,8 +19661,6 @@ var ts; return false; case 189: return node.parent.label === node; - case 216: - return node.parent.name === node; } } function emitExpressionIdentifier(node) { @@ -18963,7 +19672,18 @@ var ts; writeTextOfNode(currentSourceFile, node); } } + function getBlockScopedVariableId(node) { + return !ts.nodeIsSynthesized(node) && resolver.getBlockScopedVariableId(node); + } function emitIdentifier(node) { + var variableId = getBlockScopedVariableId(node); + if (variableId !== undefined && generatedBlockScopeNames) { + var text = generatedBlockScopeNames[variableId]; + if (text) { + write(text); + return; + } + } if (!node.parent) { write(node.text); } @@ -19026,7 +19746,7 @@ var ts; write("..."); emit(node.expression); } - function needsParenthesisForPropertyAccess(node) { + function needsParenthesisForPropertyAccessOrInvocation(node) { switch (node.kind) { case 64: case 151: @@ -19052,7 +19772,7 @@ var ts; var e = elements[pos]; if (e.kind === 171) { e = e.expression; - emitParenthesized(e, group === 0 && needsParenthesisForPropertyAccess(e)); + emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e)); pos++; } else { @@ -19091,24 +19811,18 @@ var ts; write("]"); } else { - emitListWithSpread(elements, (node.flags & 256) !== 0, elements.hasTrailingComma); + emitListWithSpread(elements, (node.flags & 512) !== 0, elements.hasTrailingComma); } } - function createSynthesizedNode(kind) { - var node = ts.createNode(kind); - node.pos = -1; - node.end = -1; - return node; - } function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) { var parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex); return emit(parenthesizedObjectLiteral); } function createDownlevelObjectLiteralWithComputedProperties(originalObjectLiteral, firstComputedPropertyIndex) { var tempVar = createAndRecordTempVariable(originalObjectLiteral); - var initialObjectLiteral = createSynthesizedNode(152); + var initialObjectLiteral = ts.createSynthesizedNode(152); initialObjectLiteral.properties = originalObjectLiteral.properties.slice(0, firstComputedPropertyIndex); - initialObjectLiteral.flags |= 256; + initialObjectLiteral.flags |= 512; var propertyPatches = createBinaryExpression(tempVar, 52, initialObjectLiteral); ts.forEach(originalObjectLiteral.properties, function (property) { var patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property); @@ -19116,7 +19830,7 @@ var ts; propertyPatches = createBinaryExpression(propertyPatches, 23, patchedProperty); } }); - propertyPatches = createBinaryExpression(propertyPatches, 23, tempVar); + propertyPatches = createBinaryExpression(propertyPatches, 23, createIdentifier(tempVar.text, true)); var result = createParenthesizedExpression(propertyPatches); return result; } @@ -19127,7 +19841,7 @@ var ts; function tryCreatePatchingPropertyAssignment(objectLiteral, tempVar, property) { var leftHandSide = createMemberAccessForPropertyName(tempVar, property.name); var maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property); - return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide); + return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide, true); } function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) { switch (property.kind) { @@ -19143,7 +19857,7 @@ var ts; if (firstAccessor !== property) { return undefined; } - var propertyDescriptor = createSynthesizedNode(152); + var propertyDescriptor = ts.createSynthesizedNode(152); var descriptorProperties = []; if (getAccessor) { var getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body)); @@ -19153,7 +19867,7 @@ var ts; var setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body)); descriptorProperties.push(setProperty); } - var trueExpr = createSynthesizedNode(94); + var trueExpr = ts.createSynthesizedNode(94); var enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr); descriptorProperties.push(enumerableTrue); var configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr); @@ -19166,7 +19880,7 @@ var ts; } } function createParenthesizedExpression(expression) { - var result = createSynthesizedNode(159); + var result = ts.createSynthesizedNode(159); result.expression = expression; return result; } @@ -19180,9 +19894,9 @@ var ts; result.end = -1; return result; } - function createBinaryExpression(left, operator, right) { - var result = createSynthesizedNode(167); - result.operatorToken = createSynthesizedNode(operator); + function createBinaryExpression(left, operator, right, startsOnNewLine) { + var result = ts.createSynthesizedNode(167, startsOnNewLine); + result.operatorToken = ts.createSynthesizedNode(operator); result.left = left; result.right = right; return result; @@ -19202,36 +19916,37 @@ var ts; } } function createPropertyAssignment(name, initializer) { - var result = createSynthesizedNode(217); + var result = ts.createSynthesizedNode(217); result.name = name; result.initializer = initializer; return result; } function createFunctionExpression(parameters, body) { - var result = createSynthesizedNode(160); + var result = ts.createSynthesizedNode(160); result.parameters = parameters; result.body = body; return result; } function createPropertyAccessExpression(expression, name) { - var result = createSynthesizedNode(153); + var result = ts.createSynthesizedNode(153); result.expression = expression; + result.dotToken = ts.createSynthesizedNode(20); result.name = name; return result; } function createElementAccessExpression(expression, argumentExpression) { - var result = createSynthesizedNode(154); + var result = ts.createSynthesizedNode(154); result.expression = expression; result.argumentExpression = argumentExpression; return result; } - function createIdentifier(name) { - var result = createSynthesizedNode(64); + function createIdentifier(name, startsOnNewLine) { + var result = ts.createSynthesizedNode(64, startsOnNewLine); result.text = name; return result; } function createCallExpression(invokedExpression, arguments) { - var result = createSynthesizedNode(155); + var result = ts.createSynthesizedNode(155); result.expression = invokedExpression; result.arguments = arguments; return result; @@ -19296,13 +20011,29 @@ var ts; } return false; } + function indentIfOnDifferentLines(parent, node1, node2) { + var isSynthesized = ts.nodeIsSynthesized(parent); + var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { + increaseIndent(); + writeLine(); + return true; + } + return false; + } function emitPropertyAccess(node) { if (tryEmitConstantValue(node)) { return; } emit(node.expression); + var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken); write("."); + indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name); emit(node.name); + if (indented) { + decreaseIndent(); + } } function emitQualifiedName(node) { emit(node.left); @@ -19416,26 +20147,33 @@ var ts; } } function emitTaggedTemplateExpression(node) { - emit(node.tag); - write(" "); - emit(node.template); + if (compilerOptions.target >= 2) { + emit(node.tag); + write(" "); + emit(node.template); + } + else { + emitDownlevelTaggedTemplate(node); + } } function emitParenExpression(node) { - if (node.expression.kind === 158) { - var operand = node.expression.expression; - while (operand.kind == 158) { - operand = operand.expression; - } - if (operand.kind !== 165 && - operand.kind !== 164 && - operand.kind !== 163 && - operand.kind !== 162 && - operand.kind !== 166 && - operand.kind !== 156 && - !(operand.kind === 155 && node.parent.kind === 156) && - !(operand.kind === 160 && node.parent.kind === 155)) { - emit(operand); - return; + if (!node.parent || node.parent.kind !== 161) { + if (node.expression.kind === 158) { + var operand = node.expression.expression; + while (operand.kind == 158) { + operand = operand.expression; + } + if (operand.kind !== 165 && + operand.kind !== 164 && + operand.kind !== 163 && + operand.kind !== 162 && + operand.kind !== 166 && + operand.kind !== 156 && + !(operand.kind === 155 && node.parent.kind === 156) && + !(operand.kind === 160 && node.parent.kind === 155)) { + emit(operand); + return; + } } } write("("); @@ -19481,48 +20219,58 @@ var ts; } else { emit(node.left); - if (node.operatorToken.kind !== 23) { + var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken); + if (!indented1 && node.operatorToken.kind !== 23) { write(" "); } write(ts.tokenToString(node.operatorToken.kind)); - var operatorEnd = ts.getLineAndCharacterOfPosition(currentSourceFile, node.operatorToken.end); - var rightStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.right.pos)); - var onDifferentLine = operatorEnd.line !== rightStart.line; - if (onDifferentLine) { - var exprStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); - var firstCharOfExpr = getFirstNonWhitespaceCharacterIndexOnLine(exprStart.line); - var shouldIndent = rightStart.character > firstCharOfExpr; - if (shouldIndent) { - increaseIndent(); - } - writeLine(); + if (!indented1) { + var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right); } - else { + if (!indented2) { write(" "); } emit(node.right); - if (shouldIndent) { + if (indented1 || indented2) { decreaseIndent(); } } } - function getFirstNonWhitespaceCharacterIndexOnLine(line) { - var lineStart = ts.getLineStarts(currentSourceFile)[line]; - var text = currentSourceFile.text; - for (var i = lineStart; i < text.length; i++) { - var ch = text.charCodeAt(i); - if (!ts.isWhiteSpace(text.charCodeAt(i)) || ts.isLineBreak(ch)) { - break; - } - } - return i - lineStart; + function synthesizedNodeStartsOnNewLine(node) { + return ts.nodeIsSynthesized(node) && node.startsOnNewLine; } function emitConditionalExpression(node) { emit(node.condition); - write(" ? "); + var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken); + if (!indent1) { + write(" "); + } + write("?"); + if (!indent1) { + var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue); + } + if (!indent2) { + write(" "); + } emit(node.whenTrue); - write(" : "); + if (indent1 || indent2) { + decreaseIndent(); + } + var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken); + if (!indent3) { + write(" "); + } + write(":"); + if (!indent3) { + var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse); + } + if (!indent4) { + write(" "); + } emit(node.whenFalse); + if (indent3 || indent4) { + decreaseIndent(); + } } function isSingleLineEmptyBlock(node) { if (node && node.kind === 174) { @@ -19566,7 +20314,7 @@ var ts; } } function emitExpressionStatement(node) { - emitParenthesized(node.expression, node.expression.kind === 161); + emitParenthesizedIf(node.expression, node.expression.kind === 161); write(";"); } function emitIfStatement(node) { @@ -19607,6 +20355,30 @@ var ts; write(")"); emitEmbeddedStatement(node.statement); } + function emitStartOfVariableDeclarationList(decl, startPos) { + var tokenKind = 97; + if (decl && languageVersion >= 2) { + if (ts.isLet(decl)) { + tokenKind = 104; + } + else if (ts.isConst(decl)) { + tokenKind = 69; + } + } + if (startPos !== undefined) { + emitToken(tokenKind, startPos); + } + else { + switch (tokenKind) { + case 97: + return write("var "); + case 104: + return write("let "); + case 69: + return write("const "); + } + } + } function emitForStatement(node) { var endPos = emitToken(81, node.pos); write(" "); @@ -19614,17 +20386,9 @@ var ts; if (node.initializer && node.initializer.kind === 194) { var variableDeclarationList = node.initializer; var declarations = variableDeclarationList.declarations; - if (declarations[0] && ts.isLet(declarations[0])) { - emitToken(105, endPos); - } - else if (declarations[0] && ts.isConst(declarations[0])) { - emitToken(69, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(declarations[0], endPos); write(" "); - emitCommaList(variableDeclarationList.declarations); + emitCommaList(declarations); } else if (node.initializer) { emit(node.initializer); @@ -19644,12 +20408,7 @@ var ts; var variableDeclarationList = node.initializer; if (variableDeclarationList.declarations.length >= 1) { var decl = variableDeclarationList.declarations[0]; - if (ts.isLet(decl)) { - emitToken(105, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(decl, endPos); write(" "); emit(decl); } @@ -19748,8 +20507,8 @@ var ts; var endPos = emitToken(67, node.pos); write(" "); emitToken(16, endPos); - emit(node.name); - emitToken(17, node.name.end); + emit(node.variableDeclaration); + emitToken(17, node.variableDeclaration ? node.variableDeclaration.end : endPos); write(" "); emitBlock(node.block); } @@ -19781,8 +20540,15 @@ var ts; emitNode(node.name); emitEnd(node.name); } + function createVoidZero() { + var zero = ts.createSynthesizedNode(7); + zero.text = "0"; + var result = ts.createSynthesizedNode(164); + result.expression = zero; + return result; + } function emitExportMemberAssignments(name) { - if (exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { + if (!exportDefault && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { ts.forEach(exportSpecifiers[name.text], function (specifier) { writeLine(); emitStart(specifier.name); @@ -19809,6 +20575,7 @@ var ts; if (emitCount++) { write(", "); } + renameNonTopLevelLetAndConst(name); if (name.parent && (name.parent.kind === 193 || name.parent.kind === 150)) { emitModuleMemberName(name.parent); } @@ -19829,27 +20596,25 @@ var ts; } return expr; } - function createVoidZero() { - var zero = ts.createNode(7); - zero.text = "0"; - var result = ts.createNode(164); - result.expression = zero; - return result; - } function createDefaultValueCheck(value, defaultValue) { value = ensureIdentifier(value); - var equals = ts.createNode(167); + var equals = ts.createSynthesizedNode(167); equals.left = value; - equals.operatorToken = ts.createNode(30); + equals.operatorToken = ts.createSynthesizedNode(30); equals.right = createVoidZero(); - var cond = ts.createNode(168); - cond.condition = equals; - cond.whenTrue = defaultValue; - cond.whenFalse = value; + return createConditionalExpression(equals, defaultValue, value); + } + function createConditionalExpression(condition, whenTrue, whenFalse) { + var cond = ts.createSynthesizedNode(168); + cond.condition = condition; + cond.questionToken = ts.createSynthesizedNode(50); + cond.whenTrue = whenTrue; + cond.colonToken = ts.createSynthesizedNode(51); + cond.whenFalse = whenFalse; return cond; } function createNumericLiteral(value) { - var node = ts.createNode(7); + var node = ts.createSynthesizedNode(7); node.text = "" + value; return node; } @@ -19857,7 +20622,7 @@ var ts; if (expr.kind === 64 || expr.kind === 153 || expr.kind === 154) { return expr; } - var node = ts.createNode(159); + var node = ts.createSynthesizedNode(159); node.expression = expr; return node; } @@ -19865,13 +20630,10 @@ var ts; if (propName.kind !== 64) { return createElementAccess(object, propName); } - var node = ts.createNode(153); - node.expression = parenthesizeForAccess(object); - node.name = propName; - return node; + return createPropertyAccessExpression(parenthesizeForAccess(object), propName); } function createElementAccess(object, index) { - var node = ts.createNode(154); + var node = ts.createSynthesizedNode(154); node.expression = parenthesizeForAccess(object); node.argumentExpression = index; return node; @@ -19993,8 +20755,19 @@ var ts; } } else { + var isLet = renameNonTopLevelLetAndConst(node.name); emitModuleMemberName(node); - emitOptional(" = ", node.initializer); + var initializer = node.initializer; + if (!initializer && languageVersion < 2) { + var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && + (getCombinedFlagsForIdentifier(node.name) & 4096); + if (isUninitializedLet && + node.parent.parent.kind !== 182 && + node.parent.parent.kind !== 183) { + initializer = createVoidZero(); + } + } + emitOptional(" = ", initializer); } } function emitExportVariableAssignments(node) { @@ -20006,17 +20779,64 @@ var ts; ts.forEach(name.elements, emitExportVariableAssignments); } } + function getEnclosingBlockScopeContainer(node) { + var current = node; + while (current) { + if (ts.isFunctionLike(current)) { + return current; + } + switch (current.kind) { + case 220: + case 91: + case 216: + case 200: + case 181: + case 182: + case 183: + return current; + case 174: + if (!ts.isFunctionLike(current.parent)) { + return current; + } + } + current = current.parent; + } + } + function getCombinedFlagsForIdentifier(node) { + if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return 0; + } + return ts.getCombinedNodeFlags(node.parent); + } + function renameNonTopLevelLetAndConst(node) { + if (languageVersion >= 2 || + ts.nodeIsSynthesized(node) || + node.kind !== 64 || + (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return; + } + var combinedFlags = getCombinedFlagsForIdentifier(node); + if (((combinedFlags & 12288) === 0) || combinedFlags & 1) { + return; + } + var list = ts.getAncestor(node, 194); + if (list.parent.kind === 175 && list.parent.parent.kind === 220) { + return; + } + var blockScopeContainer = getEnclosingBlockScopeContainer(node); + var parent = blockScopeContainer.kind === 220 + ? blockScopeContainer + : blockScopeContainer.parent; + var generatedName = generateUniqueNameForLocation(parent, node.text); + var variableId = resolver.getBlockScopedVariableId(node); + if (!generatedBlockScopeNames) { + generatedBlockScopeNames = []; + } + generatedBlockScopeNames[variableId] = generatedName; + } function emitVariableStatement(node) { if (!(node.flags & 1)) { - if (ts.isLet(node.declarationList)) { - write("let "); - } - else if (ts.isConst(node.declarationList)) { - write("const "); - } - else { - write("var "); - } + emitStartOfVariableDeclarationList(node.declarationList); } emitCommaList(node.declarationList.declarations); write(";"); @@ -20121,6 +20941,14 @@ var ts; function shouldEmitAsArrowFunction(node) { return node.kind === 161 && languageVersion >= 2; } + function emitDeclarationName(node) { + if (node.name) { + emitNode(node.name); + } + else { + write(resolver.getGeneratedNameForNode(node)); + } + } function emitFunctionDeclaration(node) { if (ts.nodeIsMissing(node.body)) { return emitPinnedOrTripleSlashComments(node); @@ -20132,10 +20960,10 @@ var ts; write("function "); } if (node.kind === 195 || (node.kind === 160 && node.name)) { - emit(node.name); + emitDeclarationName(node); } emitSignatureAndBody(node); - if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } if (node.kind !== 132 && node.kind !== 131) { @@ -20175,6 +21003,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); if (shouldEmitAsArrowFunction(node)) { emitSignatureParametersForArrow(node); write(" =>"); @@ -20191,15 +21020,16 @@ var ts; else { emitExpressionFunctionBody(node, node.body); } - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20215,7 +21045,11 @@ var ts; return; } write(" "); - emit(body); + var current = body; + while (current.kind === 158) { + current = current.expression; + } + emitParenthesizedIf(body, current.kind === 152); } function emitDownLevelExpressionFunctionBody(node, body) { write(" {"); @@ -20254,45 +21088,15 @@ var ts; scopeEmitEnd(); } function emitBlockFunctionBody(node, body) { - if (body.statements.length === 0 && !anyParameterHasBindingPatternOrInitializer(node)) { - emitFunctionBodyWithNoStatements(node, body); - } - else { - emitFunctionBodyWithStatements(node, body); - } - } - function anyParameterHasBindingPatternOrInitializer(func) { - return ts.forEach(func.parameters, hasBindingPatternOrInitializer); - } - function hasBindingPatternOrInitializer(parameter) { - return parameter.initializer || ts.isBindingPattern(parameter.name); - } - function emitFunctionBodyWithNoStatements(node, body) { - var singleLine = isSingleLineEmptyBlock(node.body); - write(" {"); - if (singleLine) { - write(" "); - } - else { - increaseIndent(); - writeLine(); - } - emitLeadingCommentsOfPosition(body.statements.end); - if (!singleLine) { - decreaseIndent(); - } - emitToken(15, body.statements.end); - } - function emitFunctionBodyWithStatements(node, body) { write(" {"); scopeEmitStart(node); - var outPos = writer.getTextPos(); + var initialTextPos = writer.getTextPos(); increaseIndent(); emitDetachedComments(body.statements); var startIndex = emitDirectivePrologues(body.statements, true); emitFunctionBodyPreamble(node); decreaseIndent(); - var preambleEmitted = writer.getTextPos() !== outPos; + var preambleEmitted = writer.getTextPos() !== initialTextPos; if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { for (var i = 0, n = body.statements.length; i < n; i++) { write(" "); @@ -20365,7 +21169,7 @@ var ts; emitStart(member); emitStart(member.name); if (staticFlag) { - emitNode(node.name); + emitDeclarationName(node); } else { write("this"); @@ -20390,7 +21194,7 @@ var ts; emitLeadingComments(member); emitStart(member); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20411,7 +21215,7 @@ var ts; emitStart(member); write("Object.defineProperty("); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20456,7 +21260,7 @@ var ts; } function emitClassDeclaration(node) { write("var "); - emit(node.name); + emitDeclarationName(node); write(" = (function ("); var baseTypeNode = ts.getClassBaseTypeNode(node); if (baseTypeNode) { @@ -20469,7 +21273,7 @@ var ts; writeLine(); emitStart(baseTypeNode); write("__extends("); - emit(node.name); + emitDeclarationName(node); write(", _super);"); emitEnd(baseTypeNode); } @@ -20478,11 +21282,10 @@ var ts; emitMemberFunctions(node); emitMemberAssignments(node, 128); writeLine(); - function emitClassReturnStatement() { + emitToken(15, node.members.end, function () { write("return "); - emitNode(node.name); - } - emitToken(15, node.members.end, emitClassReturnStatement); + emitDeclarationName(node); + }); write(";"); decreaseIndent(); writeLine(); @@ -20495,16 +21298,16 @@ var ts; } write(");"); emitEnd(node); - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } - if (languageVersion < 2 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } function emitConstructorOfClass() { @@ -20514,6 +21317,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); ts.forEach(node.members, function (member) { if (member.kind === 133 && !member.body) { emitPinnedOrTripleSlashComments(member); @@ -20525,7 +21329,7 @@ var ts; } emitStart(ctor || node); write("function "); - emit(node.name); + emitDeclarationName(node); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); @@ -20573,6 +21377,7 @@ var ts; if (ctor) { emitTrailingComments(ctor); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20691,7 +21496,9 @@ var ts; var saveTempVariables = tempVariables; tempCount = 0; tempVariables = undefined; + var popFrame = enterNameScope(); emit(node.body); + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; } @@ -20780,7 +21587,7 @@ var ts; emitImportDeclaration(node); return; } - if (resolver.isReferencedImportDeclaration(node) || + if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); @@ -20876,17 +21683,29 @@ var ts; function createExternalModuleInfo(sourceFile) { externalImports = []; exportSpecifiers = {}; + exportDefault = undefined; ts.forEach(sourceFile.statements, function (node) { if (node.kind === 209 && !node.moduleSpecifier) { ts.forEach(node.exportClause.elements, function (specifier) { + if (specifier.name.text === "default") { + exportDefault = exportDefault || specifier; + } var name = (specifier.propertyName || specifier.name).text; (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier); }); } + else if (node.kind === 208) { + exportDefault = exportDefault || node; + } + else if (node.kind === 195 || node.kind === 196) { + if (node.flags & 1 && node.flags & 256) { + exportDefault = exportDefault || node; + } + } else { var info = createExternalImportInfo(node); if (info) { - if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedImportDeclaration(node)) { + if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) { externalImports.push(info); } } @@ -20967,18 +21786,7 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { - writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("return "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); - write(";"); - emitEnd(exportAssignment); - } + emitExportDefault(node, true); decreaseIndent(); writeLine(); write("});"); @@ -20987,17 +21795,24 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { + emitExportDefault(node, false); + } + function emitExportDefault(sourceFile, emitAsReturn) { + if (exportDefault && resolver.hasExportDefaultValue(sourceFile)) { writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("module.exports = "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emitStart(exportDefault); + write(emitAsReturn ? "return " : "module.exports = "); + if (exportDefault.kind === 208) { + emit(exportDefault.expression); + } + else if (exportDefault.kind === 211) { + emit(exportDefault.propertyName); + } + else { + emitDeclarationName(exportDefault); + } write(";"); - emitEnd(exportAssignment); + emitEnd(exportDefault); } } function emitDirectivePrologues(statements, startWithNewLine) { @@ -21048,6 +21863,7 @@ var ts; else { externalImports = undefined; exportSpecifiers = undefined; + exportDefault = undefined; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); @@ -21367,6 +22183,7 @@ var ts; var ts; (function (ts) { ts.emitTime = 0; + ts.ioReadTime = 0; function createCompilerHost(options) { var currentDirectory; var existingDirectories = {}; @@ -21376,11 +22193,15 @@ var ts; var unsupportedFileEncodingErrorCode = -2147024809; function getSourceFile(fileName, languageVersion, onError) { try { + var start = new Date().getTime(); var text = ts.sys.readFile(fileName, options.charset); + ts.ioReadTime += new Date().getTime() - start; } catch (e) { if (onError) { - onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message); + onError(e.number === unsupportedFileEncodingErrorCode + ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText + : e.message); } text = ""; } @@ -21513,8 +22334,9 @@ var ts; if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) { return { diagnostics: [], sourceMaps: undefined, emitSkipped: true }; } + var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile); var start = new Date().getTime(); - var emitResult = ts.emitFiles(getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile), getEmitHost(writeFileCallback), sourceFile); + var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile); ts.emitTime += new Date().getTime() - start; return emitResult; } @@ -21703,20 +22525,19 @@ var ts; } return; } - var firstExternalModule = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); - if (firstExternalModule && !options.module) { - var externalModuleErrorSpan = ts.getErrorSpanForNode(firstExternalModule.externalModuleIndicator); - var errorStart = ts.skipTrivia(firstExternalModule.text, externalModuleErrorSpan.pos); - var errorLength = externalModuleErrorSpan.end - errorStart; - diagnostics.add(ts.createFileDiagnostic(firstExternalModule, errorStart, errorLength, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); + var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); + if (firstExternalModuleSourceFile && !options.module) { + var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); } if (options.outDir || options.sourceRoot || (options.mapRoot && - (!options.out || firstExternalModule !== undefined))) { + (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents; ts.forEach(files, function (sourceFile) { - if (!(sourceFile.flags & 1024) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { + if (!(sourceFile.flags & 2048) + && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory()); sourcePathComponents.pop(); if (commonPathComponents) { @@ -22383,6 +23204,27 @@ var ts; case 149: ts.forEach(node.elements, visit); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + childNodes.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + childNodes.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; case 150: case 193: if (ts.isBindingPattern(node.name)) { @@ -22394,7 +23236,11 @@ var ts; case 197: case 200: case 195: + case 202: + case 207: + case 211: childNodes.push(node); + break; } } ts.forEach(nodes, visit); @@ -22507,7 +23353,7 @@ var ts; if (ts.isBindingPattern(node.name)) { break; } - if ((node.flags & 243) === 0) { + if ((node.flags & 499) === 0) { return undefined; } return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement); @@ -22559,6 +23405,12 @@ var ts; } case 133: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); + case 211: + case 207: + case 202: + case 204: + case 205: + return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias); } return undefined; function createItem(node, name, scriptElementKind) { @@ -22631,10 +23483,15 @@ var ts; return undefined; } hasGlobalNode = true; - var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : ""; + var rootName = ts.isExternalModule(node) + ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" + : ""; return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems); } function createClassItem(node) { + if (!node.name) { + return undefined; + } var childItems; if (node.members) { var constructor = ts.forEach(node.members, function (member) { @@ -22670,7 +23527,9 @@ var ts; return node; } function getNodeSpan(node) { - return node.kind === 220 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); + return node.kind === 220 + ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) + : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); } function getTextOfNode(node) { return ts.getTextOfNodeFromSourceText(sourceFile.text, node); @@ -23124,7 +23983,9 @@ var ts; function transitionFromLowerToUpper(identifier, word, index) { var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1)); var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index)); - var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper; + var transition = word + ? (currentIsUpper && !lastIsUpper) + : currentIsUpper; return transition; } })(ts || (ts = {})); @@ -23178,12 +24039,14 @@ var ts; var list = listItemInfo.list; var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos; var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1; + var argumentCount = getCommaBasedArgCount(list); + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: isTypeArgList ? 0 : 1, invocation: callExpression, argumentsSpan: getApplicableSpanForArguments(list), argumentIndex: argumentIndex, - argumentCount: getCommaBasedArgCount(list) + argumentCount: argumentCount }; } } @@ -23214,7 +24077,9 @@ var ts; return undefined; } function getCommaBasedArgCount(argumentsList) { - return argumentsList.getChildCount() === 0 ? 0 : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); + return argumentsList.getChildCount() === 0 + ? 0 + : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); } function getArgumentIndexForTemplatePiece(spanIndex, node) { ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node."); @@ -23227,7 +24092,10 @@ var ts; return spanIndex + 1; } function getArgumentListInfoForTemplate(tagExpression, argumentIndex) { - var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1; + var argumentCount = tagExpression.template.kind === 10 + ? 1 + : tagExpression.template.templateSpans.length + 1; + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: 2, invocation: tagExpression, @@ -23342,6 +24210,7 @@ var ts; if (selectedItemIndex < 0) { selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); } + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { items: items, applicableSpan: applicableSpan, @@ -23511,7 +24380,7 @@ var ts; for (var i = 0, len = children.length; i < len; ++i) { var child = children[i]; var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || - (child.pos === previousToken.end); + (child.pos === previousToken.end); if (shouldDiveInChildNode && nodeHasTokens(child)) { return find(child); } @@ -23589,7 +24458,7 @@ var ts; if (node.kind === 139 || node.kind === 155) { return node.typeArguments; } - if (ts.isAnyFunction(node) || node.kind === 196 || node.kind === 197) { + if (ts.isFunctionLike(node) || node.kind === 196 || node.kind === 197) { return node.typeParameters; } return undefined; @@ -23614,7 +24483,8 @@ var ts; } ts.isPunctuation = isPunctuation; function isInsideTemplateLiteral(node, position) { - return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); + return ts.isTemplateLiteralKind(node.kind) + && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); } ts.isInsideTemplateLiteral = isInsideTemplateLiteral; function compareDataObjects(dst, src) { @@ -23895,7 +24765,13 @@ var ts; token: undefined }; } - var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0; + var expectedScanAction = shouldRescanGreaterThanToken(n) + ? 1 + : shouldRescanSlashToken(n) + ? 2 + : shouldRescanTemplateToken(n) + ? 3 + : 0; if (lastTokenInfo && expectedScanAction === lastScanAction) { return fixTokenKind(lastTokenInfo, n); } @@ -24246,7 +25122,7 @@ var ts; this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([105, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); + this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8)); this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8)); @@ -24254,13 +25130,13 @@ var ts; this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2)); this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 120]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); + this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); - this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(114, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([117, 118]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 115, 76, 77, 78, 116, 103, 84, 104, 117, 107, 109, 120, 110]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 103])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2)); this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); @@ -24272,52 +25148,52 @@ var ts; this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8)); this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8)); this.HighPriorityCommonRules = - [ - this.IgnoreBeforeComment, this.IgnoreAfterLineComment, - this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, - this.NoSpaceAfterQuestionMark, - this.NoSpaceBeforeDot, this.NoSpaceAfterDot, - this.NoSpaceAfterUnaryPrefixOperator, - this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, - this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, - this.SpaceAfterPostincrementWhenFollowedByAdd, - this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, - this.SpaceAfterPostdecrementWhenFollowedBySubtract, - this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, - this.NoSpaceAfterCloseBrace, - this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, - this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, - this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, - this.NoSpaceBetweenReturnAndSemicolon, - this.SpaceAfterCertainKeywords, - this.SpaceAfterLetConstInVariableDeclaration, - this.NoSpaceBeforeOpenParenInFuncCall, - this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, - this.SpaceAfterVoidOperator, - this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, - this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, - this.SpaceAfterModuleName, - this.SpaceAfterArrow, - this.NoSpaceAfterEllipsis, - this.NoSpaceAfterOptionalParameters, - this.NoSpaceBetweenEmptyInterfaceBraceBrackets, - this.NoSpaceBeforeOpenAngularBracket, - this.NoSpaceBetweenCloseParenAndAngularBracket, - this.NoSpaceAfterOpenAngularBracket, - this.NoSpaceBeforeCloseAngularBracket, - this.NoSpaceAfterCloseAngularBracket - ]; + [ + this.IgnoreBeforeComment, this.IgnoreAfterLineComment, + this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, + this.NoSpaceAfterQuestionMark, + this.NoSpaceBeforeDot, this.NoSpaceAfterDot, + this.NoSpaceAfterUnaryPrefixOperator, + this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, + this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, + this.SpaceAfterPostincrementWhenFollowedByAdd, + this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, + this.SpaceAfterPostdecrementWhenFollowedBySubtract, + this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, + this.NoSpaceAfterCloseBrace, + this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, + this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, + this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, + this.NoSpaceBetweenReturnAndSemicolon, + this.SpaceAfterCertainKeywords, + this.SpaceAfterLetConstInVariableDeclaration, + this.NoSpaceBeforeOpenParenInFuncCall, + this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, + this.SpaceAfterVoidOperator, + this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, + this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, + this.SpaceAfterModuleName, + this.SpaceAfterArrow, + this.NoSpaceAfterEllipsis, + this.NoSpaceAfterOptionalParameters, + this.NoSpaceBetweenEmptyInterfaceBraceBrackets, + this.NoSpaceBeforeOpenAngularBracket, + this.NoSpaceBetweenCloseParenAndAngularBracket, + this.NoSpaceAfterOpenAngularBracket, + this.NoSpaceBeforeCloseAngularBracket, + this.NoSpaceAfterCloseAngularBracket + ]; this.LowPriorityCommonRules = - [ - this.NoSpaceBeforeSemicolon, - this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, - this.NoSpaceBeforeComma, - this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, - this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, - this.SpaceAfterSemicolon, - this.NoSpaceBeforeOpenParenInFuncDecl, - this.SpaceBetweenStatements, this.SpaceAfterTryFinally - ]; + [ + this.NoSpaceBeforeSemicolon, + this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, + this.NoSpaceBeforeComma, + this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, + this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, + this.SpaceAfterSemicolon, + this.NoSpaceBeforeOpenParenInFuncDecl, + this.SpaceBetweenStatements, this.SpaceAfterTryFinally + ]; this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); @@ -24645,13 +25521,19 @@ var ts; RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) { var position; if (rule.Operation.Action == 1) { - position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny; + position = specificTokens ? + 0 : + RulesPosition.IgnoreRulesAny; } else if (!rule.Operation.Context.IsAny()) { - position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny; + position = specificTokens ? + RulesPosition.ContextRulesSpecific : + RulesPosition.ContextRulesAny; } else { - position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny; + position = specificTokens ? + RulesPosition.NoContextRulesSpecific : + RulesPosition.NoContextRulesAny; } var state = constructionState[rulesBucketIndex]; if (state === undefined) { @@ -24773,7 +25655,7 @@ var ts; TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]); TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]); TokenRange.Comments = TokenRange.FromTokens([2, 3]); - TokenRange.TypeNames = TokenRange.FromTokens([64, 119, 121, 113, 122, 98, 112]); + TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]); return TokenRange; })(); Shared.TokenRange = TokenRange; @@ -24970,7 +25852,9 @@ var ts; if (!errors.length) { return rangeHasNoErrors; } - var sorted = errors.filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }).sort(function (e1, e2) { return e1.start - e2.start; }); + var sorted = errors + .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }) + .sort(function (e1, e2) { return e1.start - e2.start; }); if (!sorted.length) { return rangeHasNoErrors; } @@ -25340,8 +26224,8 @@ var ts; } } trimTrailingWhitespaces = - (rule.Operation.Action & (4 | 2)) && - rule.Flag !== 1; + (rule.Operation.Action & (4 | 2)) && + rule.Flag !== 1; } else { trimTrailingWhitespaces = true; @@ -25396,7 +26280,9 @@ var ts; var delta = indentation - nonWhitespaceColumnInFirstPart.column; for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) { var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile); - var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); + var nonWhitespaceCharacterAndColumn = i === 0 + ? nonWhitespaceColumnInFirstPart + : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); var newIndentation = nonWhitespaceCharacterAndColumn.column + delta; if (newIndentation > 0) { var indentationString = getIndentationString(newIndentation, options); @@ -25567,6 +26453,10 @@ var ts; (function (formatting) { var SmartIndenter; (function (SmartIndenter) { + var Value; + (function (Value) { + Value[Value["Unknown"] = -1] = "Unknown"; + })(Value || (Value = {})); function getIndentation(position, sourceFile, options) { if (position > sourceFile.text.length) { return 0; @@ -25576,11 +26466,11 @@ var ts; return 0; } var precedingTokenIsLiteral = precedingToken.kind === 8 || - precedingToken.kind === 9 || - precedingToken.kind === 10 || - precedingToken.kind === 11 || - precedingToken.kind === 12 || - precedingToken.kind === 13; + precedingToken.kind === 9 || + precedingToken.kind === 10 || + precedingToken.kind === 11 || + precedingToken.kind === 12 || + precedingToken.kind === 13; if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) { return 0; } @@ -25641,7 +26531,7 @@ var ts; } parentStart = getParentStart(parent, current, sourceFile); var parentAndChildShareLine = parentStart.line === currentStart.line || - childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); + childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); if (useActualIndentation) { var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options); if (actualIndentation !== -1) { @@ -25666,12 +26556,16 @@ var ts; } function getActualIndentationForListItemBeforeComma(commaToken, sourceFile, options) { var commaItemInfo = ts.findListItemInfo(commaToken); - ts.Debug.assert(commaItemInfo && commaItemInfo.listItemIndex > 0); - return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + if (commaItemInfo && commaItemInfo.listItemIndex > 0) { + return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + } + else { + return -1; + } } function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) { var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && - (parent.kind === 220 || !parentAndChildShareLine); + (parent.kind === 220 || !parentAndChildShareLine); if (!useActualIndentation) { return -1; } @@ -25998,13 +26892,13 @@ var ts; while (pos < end) { var token = scanner.scan(); var textPos = scanner.getTextPos(); - nodes.push(createNode(token, pos, textPos, 512, this)); + nodes.push(createNode(token, pos, textPos, 1024, this)); pos = textPos; } return pos; }; NodeObject.prototype.createSyntaxList = function (nodes) { - var list = createNode(221, nodes.pos, nodes.end, 512, this); + var list = createNode(221, nodes.pos, nodes.end, 1024, this); list._children = []; var pos = nodes.pos; for (var i = 0, len = nodes.length; i < len; i++) { @@ -26426,7 +27320,9 @@ var ts; case 131: var functionDeclaration = node; if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) { - var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined; + var lastDeclaration = namedDeclarations.length > 0 ? + namedDeclarations[namedDeclarations.length - 1] : + undefined; if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) { if (functionDeclaration.body && !lastDeclaration.body) { namedDeclarations[namedDeclarations.length - 1] = functionDeclaration; @@ -26444,6 +27340,11 @@ var ts; case 199: case 200: case 202: + case 211: + case 207: + case 202: + case 204: + case 205: case 134: case 135: case 143: @@ -26478,6 +27379,27 @@ var ts; case 129: namedDeclarations.push(node); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + namedDeclarations.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + namedDeclarations.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; } }); this.namedDeclarations = namedDeclarations; @@ -26798,7 +27720,7 @@ var ts; var entry = entries[i]; sourceFiles.push({ name: i, - refCount: entry.refCount, + refCount: entry.languageServiceRefCount, references: entry.owners.slice(0) }); } @@ -26811,34 +27733,40 @@ var ts; return JSON.stringify(bucketInfoArray, null, 2); } function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, true); + } + function updateDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, false); + } + function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) { var bucket = getBucketForCompilationSettings(compilationSettings, true); var entry = ts.lookUp(bucket, fileName); if (!entry) { + ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false); bucket[fileName] = entry = { sourceFile: sourceFile, - refCount: 0, + languageServiceRefCount: 0, owners: [] }; } - entry.refCount++; - return entry.sourceFile; - } - function updateDocument(sourceFile, fileName, compilationSettings, scriptSnapshot, version, textChangeRange) { - var bucket = getBucketForCompilationSettings(compilationSettings, false); - ts.Debug.assert(bucket !== undefined); - var entry = ts.lookUp(bucket, fileName); - ts.Debug.assert(entry !== undefined); - entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, textChangeRange); + else { + if (entry.sourceFile.version !== version) { + entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot)); + } + } + if (acquiring) { + entry.languageServiceRefCount++; + } return entry.sourceFile; } function releaseDocument(fileName, compilationSettings) { var bucket = getBucketForCompilationSettings(compilationSettings, false); ts.Debug.assert(bucket !== undefined); var entry = ts.lookUp(bucket, fileName); - entry.refCount--; - ts.Debug.assert(entry.refCount >= 0); - if (entry.refCount === 0) { + entry.languageServiceRefCount--; + ts.Debug.assert(entry.languageServiceRefCount >= 0); + if (entry.languageServiceRefCount === 0) { delete bucket[fileName]; } } @@ -26869,31 +27797,111 @@ var ts; } }); } + function recordModuleName() { + var importPath = scanner.getTokenValue(); + var pos = scanner.getTokenPos(); + importedFiles.push({ + fileName: importPath, + pos: pos, + end: pos + importPath.length + }); + } function processImport() { scanner.setText(sourceText); var token = scanner.scan(); while (token !== 1) { if (token === 84) { token = scanner.scan(); - if (token === 64) { - token = scanner.scan(); - if (token === 52) { + if (token === 8) { + recordModuleName(); + continue; + } + else { + if (token === 64) { token = scanner.scan(); - if (token === 118) { + if (token === 123) { token = scanner.scan(); - if (token === 16) { + if (token === 8) { + recordModuleName(); + continue; + } + } + else if (token === 52) { + token = scanner.scan(); + if (token === 117) { token = scanner.scan(); - if (token === 8) { - var importPath = scanner.getTokenValue(); - var pos = scanner.getTokenPos(); - importedFiles.push({ - fileName: importPath, - pos: pos, - end: pos + importPath.length - }); + if (token === 16) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + continue; + } } } } + else if (token === 23) { + token = scanner.scan(); + } + else { + continue; + } + } + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 101) { + token = scanner.scan(); + if (token === 64) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + } + } + } + else if (token === 77) { + token = scanner.scan(); + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } } } } @@ -26961,7 +27969,7 @@ var ts; } function isNameOfFunctionDeclaration(node) { return node.kind === 64 && - ts.isAnyFunction(node.parent) && node.parent.name === node; + ts.isFunctionLike(node.parent) && node.parent.name === node; } function isNameOfPropertyAssignment(node) { return (node.kind === 64 || node.kind === 8 || node.kind === 7) && @@ -27071,7 +28079,11 @@ var ts; case 198: return ScriptElementKind.typeElement; case 199: return ScriptElementKind.enumElement; case 193: - return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement; + return ts.isConst(node) + ? ScriptElementKind.constElement + : ts.isLet(node) + ? ScriptElementKind.letElement + : ScriptElementKind.variableElement; case 195: return ScriptElementKind.functionElement; case 134: return ScriptElementKind.memberGetAccessorElement; case 135: return ScriptElementKind.memberSetAccessorElement; @@ -27088,6 +28100,12 @@ var ts; case 127: return ScriptElementKind.typeParameterElement; case 219: return ScriptElementKind.variableElement; case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement; + case 202: + case 207: + case 204: + case 211: + case 205: + return ScriptElementKind.alias; } return ScriptElementKind.unknown; } @@ -27165,11 +28183,7 @@ var ts; if (!changesInCompilationSettingsAffectSyntax) { var oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { - if (sourceFileUpToDate(oldSourceFile)) { - return oldSourceFile; - } - var textChangeRange = hostFileInformation.scriptSnapshot.getChangeRange(oldSourceFile.scriptSnapshot); - return documentRegistry.updateDocument(oldSourceFile, fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, textChangeRange); + return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); } } return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); @@ -27204,7 +28218,9 @@ var ts; } function dispose() { if (program) { - ts.forEach(program.getSourceFiles(), function (f) { documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); }); + ts.forEach(program.getSourceFiles(), function (f) { + return documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); + }); } } function getSyntacticDiagnostics(fileName) { @@ -27349,6 +28365,17 @@ var ts; getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession); } } + else if (ts.getAncestor(previousToken, 204)) { + isMemberCompletion = true; + isNewIdentifierLocation = true; + if (showCompletionsInImportsClause(previousToken)) { + var importDeclaration = ts.getAncestor(previousToken, 203); + ts.Debug.assert(importDeclaration !== undefined); + var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration); + var filteredExports = filterModuleExports(exports, importDeclaration); + getCompletionEntriesFromSymbols(filteredExports, activeCompletionSession); + } + } else { isMemberCompletion = false; isNewIdentifierLocation = isNewIdentifierDefinitionLocation(previousToken); @@ -27389,31 +28416,47 @@ var ts; log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start)); return result; } + function showCompletionsInImportsClause(node) { + if (node) { + if (node.kind === 14 || node.kind === 23) { + return node.parent.kind === 206; + } + } + return false; + } function isNewIdentifierDefinitionLocation(previousToken) { if (previousToken) { var containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case 23: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 151 + || containingNodeKind === 167; case 16: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 159; case 18: return containingNodeKind === 151; - case 117: + case 116: return true; case 20: return containingNodeKind === 200; case 14: return containingNodeKind === 196; case 52: - return containingNodeKind === 193 || containingNodeKind === 167; + return containingNodeKind === 193 + || containingNodeKind === 167; case 11: return containingNodeKind === 169; case 12: return containingNodeKind === 173; - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 130; } switch (previousToken.getText()) { @@ -27426,7 +28469,9 @@ var ts; return false; } function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) { - if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) { + if (previousToken.kind === 8 + || previousToken.kind === 9 + || ts.isTemplateLiteralKind(previousToken.kind)) { var start = previousToken.getStart(); var end = previousToken.getEnd(); if (start < position && position < end) { @@ -27504,27 +28549,27 @@ var ts; containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind); - case 110: + case 109: return containingNodeKind === 130; case 21: return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149); - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 128; case 68: case 76: - case 104: + case 103: case 82: case 97: - case 116: - case 120: + case 115: + case 119: case 84: - case 105: + case 104: case 69: - case 111: + case 110: return true; } switch (previousToken.getText()) { @@ -27549,6 +28594,23 @@ var ts; } return false; } + function filterModuleExports(exports, importDeclaration) { + var exisingImports = {}; + if (!importDeclaration.importClause) { + return exports; + } + if (importDeclaration.importClause.namedBindings && + importDeclaration.importClause.namedBindings.kind === 206) { + ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) { + var name = el.propertyName || el.name; + exisingImports[name.text] = true; + }); + } + if (ts.isEmpty(exisingImports)) { + return exports; + } + return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); }); + } function filterContextualMembersList(contextualMemberSymbols, existingMembers) { if (!existingMembers || existingMembers.length === 0) { return contextualMemberSymbols; @@ -27695,7 +28757,9 @@ var ts; return ScriptElementKind.unknown; } function getSymbolModifiers(symbol) { - return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none; + return symbol && symbol.declarations && symbol.declarations.length > 0 + ? ts.getNodeModifiers(symbol.declarations[0]) + : ScriptElementKindModifier.none; } function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) { if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); } @@ -27779,7 +28843,7 @@ var ts; } } else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || - (location.kind === 114 && location.parent.kind === 133)) { + (location.kind === 113 && location.parent.kind === 133)) { var signature; var functionDeclaration = location.parent; var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures(); @@ -27810,14 +28874,14 @@ var ts; } if ((symbolFlags & 64) && (semanticMeaning & 2)) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(104)); + displayParts.push(ts.keywordPart(103)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); writeTypeParametersOfSymbol(symbol, sourceFile); } if (symbolFlags & 524288) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(123)); + displayParts.push(ts.keywordPart(122)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); displayParts.push(ts.spacePart()); @@ -27837,7 +28901,7 @@ var ts; } if (symbolFlags & 1536) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(117)); + displayParts.push(ts.keywordPart(116)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); } @@ -27893,7 +28957,7 @@ var ts; displayParts.push(ts.spacePart()); displayParts.push(ts.operatorPart(52)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(118)); + displayParts.push(ts.keywordPart(117)); displayParts.push(ts.punctuationPart(16)); displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), 8)); displayParts.push(ts.punctuationPart(17)); @@ -28056,6 +29120,12 @@ var ts; if (!symbol) { return undefined; } + if (symbol.flags & 8388608) { + var declaration = symbol.declarations[0]; + if (node.kind === 64 && node.parent === declaration) { + symbol = typeInfoResolver.getAliasedSymbol(symbol); + } + } var result = []; if (node.parent.kind === 218) { var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); @@ -28112,7 +29182,7 @@ var ts; return false; } function tryAddConstructSignature(symbol, location, symbolKind, symbolName, containerName, result) { - if (isNewExpressionTarget(location) || location.kind === 114) { + if (isNewExpressionTarget(location) || location.kind === 113) { if (symbol.flags & 32) { var classDeclaration = symbol.getDeclarations()[0]; ts.Debug.assert(classDeclaration && classDeclaration.kind === 196); @@ -28197,13 +29267,13 @@ var ts; return getLoopBreakContinueOccurrences(node.parent); } break; - case 114: + case 113: if (hasKind(node.parent, 133)) { return getConstructorOccurrences(node.parent); } break; - case 116: - case 120: + case 115: + case 119: if (hasKind(node.parent, 134) || hasKind(node.parent, 135)) { return getGetAndSetOccurrences(node.parent); } @@ -28308,7 +29378,7 @@ var ts; aggregate(tryStatement.finallyBlock); } } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28401,7 +29471,7 @@ var ts; if (node.kind === 185 || node.kind === 184) { statementAccumulator.push(node); } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28428,7 +29498,7 @@ var ts; } break; default: - if (ts.isAnyFunction(node)) { + if (ts.isFunctionLike(node)) { return undefined; } break; @@ -28441,7 +29511,7 @@ var ts; var keywords = []; ts.forEach(declarations, function (declaration) { ts.forEach(declaration.getChildren(), function (token) { - return pushKeywordIf(keywords, token, 114); + return pushKeywordIf(keywords, token, 113); }); }); return ts.map(keywords, getReferenceEntryFromNode); @@ -28454,7 +29524,7 @@ var ts; function tryPushAccessorKeyword(accessorSymbol, accessorKind) { var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { - ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 116, 120); }); + ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); }); } } } @@ -28512,17 +29582,17 @@ var ts; return ts.map(keywords, getReferenceEntryFromNode); function getFlagFromModifier(modifier) { switch (modifier) { - case 109: - return 16; - case 107: - return 32; case 108: + return 16; + case 106: + return 32; + case 107: return 64; - case 110: + case 109: return 128; case 77: return 1; - case 115: + case 114: return 2; default: ts.Debug.fail(); @@ -28568,24 +29638,6 @@ var ts; ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8); return getReferencesForNode(node, program.getSourceFiles(), false, findInStrings, findInComments); } - function initializeNameTable(sourceFile) { - var nameTable = {}; - walk(sourceFile); - sourceFile.nameTable = nameTable; - function walk(node) { - switch (node.kind) { - case 64: - nameTable[node.text] = node.text; - break; - case 8: - case 7: - nameTable[node.text] = node.text; - break; - default: - ts.forEachChild(node, walk); - } - } - } function getReferencesForNode(node, sourceFiles, searchOnlyInCurrentFile, findInStrings, findInComments) { if (isLabelName(node)) { if (isJumpStatementTarget(node)) { @@ -28612,7 +29664,7 @@ var ts; } var result; var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); - var declaredName = getDeclaredName(symbol); + var declaredName = getDeclaredName(symbol, node); var scope = getSymbolScope(symbol); if (scope) { result = []; @@ -28625,14 +29677,11 @@ var ts; getReferencesInNode(sourceFiles[0], symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } else { - var internedName = getInternedName(symbol, declarations); + var internedName = getInternedName(symbol, node, declarations); ts.forEach(sourceFiles, function (sourceFile) { cancellationToken.throwIfCancellationRequested(); - if (!sourceFile.nameTable) { - initializeNameTable(sourceFile); - } - ts.Debug.assert(sourceFile.nameTable !== undefined); - if (ts.lookUp(sourceFile.nameTable, internedName)) { + var nameTable = getNameTable(sourceFile); + if (ts.lookUp(nameTable, internedName)) { result = result || []; getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } @@ -28640,11 +29689,31 @@ var ts; } } return result; - function getDeclaredName(symbol) { + function isImportOrExportSpecifierName(location) { + return location.parent && + (location.parent.kind === 207 || location.parent.kind === 211) && + location.parent.propertyName === location; + } + function isImportOrExportSpecifierImportSymbol(symbol) { + return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) { + return declaration.kind === 207 || declaration.kind === 211; + }); + } + function getDeclaredName(symbol, location) { + var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; }); + if (functionExpression && functionExpression.name) { + var name = functionExpression.name.text; + } + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var name = typeInfoResolver.symbolToString(symbol); return stripQuotes(name); } - function getInternedName(symbol, declarations) { + function getInternedName(symbol, location, declarations) { + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; }); if (functionExpression && functionExpression.name) { var name = functionExpression.name.text; @@ -28663,13 +29732,16 @@ var ts; return name; } function getSymbolScope(symbol) { - if (symbol.getFlags() && (4 | 8192)) { + if (symbol.flags & (4 | 8192)) { var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; }); if (privateDeclaration) { return ts.getAncestor(privateDeclaration, 196); } } - if (symbol.parent || (symbol.getFlags() & 268435456)) { + if (symbol.flags & 8388608) { + return undefined; + } + if (symbol.parent || (symbol.flags & 268435456)) { return undefined; } var scope = undefined; @@ -28920,6 +29992,9 @@ var ts; } function populateSearchSymbolSet(symbol, location) { var result = [symbol]; + if (isImportOrExportSpecifierImportSymbol(symbol)) { + result.push(typeInfoResolver.getAliasedSymbol(symbol)); + } if (isNameOfPropertyAssignment(location)) { ts.forEach(getPropertySymbolsFromContextualType(location), function (contextualSymbol) { result.push.apply(result, typeInfoResolver.getRootSymbols(contextualSymbol)); @@ -28969,6 +30044,10 @@ var ts; if (searchSymbols.indexOf(referenceSymbol) >= 0) { return true; } + if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && + searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) { + return true; + } if (isNameOfPropertyAssignment(referenceLocation)) { return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) { return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; }); @@ -29047,7 +30126,7 @@ var ts; }; } function isWriteAccess(node) { - if (node.kind === 64 && ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (node.kind === 64 && ts.isDeclarationName(node)) { return true; } var parent = node.parent; @@ -29124,11 +30203,17 @@ var ts; else { return 4; } + case 206: + case 207: case 202: + case 203: + case 208: + case 209: return 1 | 2 | 4; case 220: return 4 | 1; } + return 1 | 2 | 4; ts.Debug.fail("Unknown declaration type"); } function isTypeReference(node) { @@ -29169,7 +30254,7 @@ var ts; else if (isInRightSideOfImport(node)) { return getMeaningFromRightHandSideOfImportEquals(node); } - else if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + else if (ts.isDeclarationName(node)) { return getMeaningFromDeclaration(node.parent); } else if (isTypeReference(node)) { @@ -29678,6 +30763,41 @@ var ts; }; } ts.createLanguageService = createLanguageService; + function getNameTable(sourceFile) { + if (!sourceFile.nameTable) { + initializeNameTable(sourceFile); + } + return sourceFile.nameTable; + } + ts.getNameTable = getNameTable; + function initializeNameTable(sourceFile) { + var nameTable = {}; + walk(sourceFile); + sourceFile.nameTable = nameTable; + function walk(node) { + switch (node.kind) { + case 64: + nameTable[node.text] = node.text; + break; + case 8: + case 7: + if (ts.isDeclarationName(node) || + node.parent.kind === 212 || + isArgumentOfElementAccessExpression(node)) { + nameTable[node.text] = node.text; + } + break; + default: + ts.forEachChild(node, walk); + } + } + } + function isArgumentOfElementAccessExpression(node) { + return node && + node.parent && + node.parent.kind === 154 && + node.parent.argumentExpression === node; + } function createClassifier() { var scanner = ts.createScanner(2, false); var noRegexTable = []; @@ -29696,19 +30816,19 @@ var ts; var templateStack = []; function isAccessibilityModifier(kind) { switch (kind) { - case 109: - case 107: case 108: + case 106: + case 107: return true; } return false; } function canFollow(keyword1, keyword2) { if (isAccessibilityModifier(keyword1)) { - if (keyword2 === 116 || - keyword2 === 120 || - keyword2 === 114 || - keyword2 === 110) { + if (keyword2 === 115 || + keyword2 === 119 || + keyword2 === 113 || + keyword2 === 109) { return true; } return false; @@ -29773,11 +30893,11 @@ var ts; else if (token === 25 && angleBracketStack > 0) { angleBracketStack--; } - else if (token === 112 || - token === 121 || - token === 119 || - token === 113 || - token === 122) { + else if (token === 111 || + token === 120 || + token === 118 || + token === 112 || + token === 121) { if (angleBracketStack > 0 && !syntacticClassifierAbsent) { token = 64; } @@ -29828,7 +30948,9 @@ var ts; } if (numBackslashes & 1) { var quoteChar = tokenText.charCodeAt(0); - result.finalLexState = quoteChar === 34 ? 3 : 2; + result.finalLexState = quoteChar === 34 + ? 3 + : 2; } } } @@ -29991,7 +31113,7 @@ var ts; var BreakpointResolver; (function (BreakpointResolver) { function spanInSourceFileAtLocation(sourceFile, position) { - if (sourceFile.flags & 1024) { + if (sourceFile.flags & 2048) { return undefined; } var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position); @@ -30095,9 +31217,13 @@ var ts; case 190: return textSpan(node, node.expression); case 208: - return textSpan(node, node.exportName); + return textSpan(node, node.expression); case 202: return textSpan(node, node.moduleReference); + case 203: + return textSpan(node, node.moduleSpecifier); + case 209: + return textSpan(node, node.moduleSpecifier); case 200: if (ts.getModuleInstanceState(node) !== 1) { return undefined; @@ -30144,7 +31270,7 @@ var ts; if (node.parent.kind === 158 && node.parent.type === node) { return spanInNode(node.parent.expression); } - if (ts.isAnyFunction(node.parent) && node.parent.type === node) { + if (ts.isFunctionLike(node.parent) && node.parent.type === node) { return spanInPreviousNode(node); } return spanInNode(node.parent); @@ -30157,7 +31283,11 @@ var ts; } var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175; var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration); - var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined; + var declarations = isParentVariableStatement + ? variableDeclaration.parent.parent.declarationList.declarations + : isDeclarationOfForStatement + ? variableDeclaration.parent.parent.initializer.declarations + : undefined; if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) { if (declarations && declarations[0] === variableDeclaration) { if (isParentVariableStatement) { @@ -30317,7 +31447,7 @@ var ts; return spanInNode(node.parent); } function spanInColonToken(node) { - if (ts.isAnyFunction(node.parent) || node.parent.kind === 217) { + if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) { return spanInPreviousNode(node); } return spanInNode(node.parent); diff --git a/bin/typescriptServices.d.ts b/bin/typescriptServices.d.ts index 81c5bac2d03..bffa14b5875 100644 --- a/bin/typescriptServices.d.ts +++ b/bin/typescriptServices.d.ts @@ -124,28 +124,28 @@ declare module ts { WhileKeyword = 99, WithKeyword = 100, AsKeyword = 101, - FromKeyword = 102, - ImplementsKeyword = 103, - InterfaceKeyword = 104, - LetKeyword = 105, - PackageKeyword = 106, - PrivateKeyword = 107, - ProtectedKeyword = 108, - PublicKeyword = 109, - StaticKeyword = 110, - YieldKeyword = 111, - AnyKeyword = 112, - BooleanKeyword = 113, - ConstructorKeyword = 114, - DeclareKeyword = 115, - GetKeyword = 116, - ModuleKeyword = 117, - RequireKeyword = 118, - NumberKeyword = 119, - SetKeyword = 120, - StringKeyword = 121, - SymbolKeyword = 122, - TypeKeyword = 123, + ImplementsKeyword = 102, + InterfaceKeyword = 103, + LetKeyword = 104, + PackageKeyword = 105, + PrivateKeyword = 106, + ProtectedKeyword = 107, + PublicKeyword = 108, + StaticKeyword = 109, + YieldKeyword = 110, + AnyKeyword = 111, + BooleanKeyword = 112, + ConstructorKeyword = 113, + DeclareKeyword = 114, + GetKeyword = 115, + ModuleKeyword = 116, + RequireKeyword = 117, + NumberKeyword = 118, + SetKeyword = 119, + StringKeyword = 120, + SymbolKeyword = 121, + TypeKeyword = 122, + FromKeyword = 123, OfKeyword = 124, QualifiedName = 125, ComputedPropertyName = 126, @@ -251,8 +251,8 @@ declare module ts { LastReservedWord = 100, FirstKeyword = 65, LastKeyword = 124, - FirstFutureReservedWord = 103, - LastFutureReservedWord = 111, + FirstFutureReservedWord = 102, + LastFutureReservedWord = 110, FirstTypeNode = 139, LastTypeNode = 147, FirstPunctuation = 14, @@ -276,15 +276,16 @@ declare module ts { Private = 32, Protected = 64, Static = 128, - MultiLine = 256, - Synthetic = 512, - DeclarationFile = 1024, - Let = 2048, - Const = 4096, - OctalLiteral = 8192, - Modifier = 243, + Default = 256, + MultiLine = 512, + Synthetic = 1024, + DeclarationFile = 2048, + Let = 4096, + Const = 8192, + OctalLiteral = 16384, + Modifier = 499, AccessibilityModifier = 112, - BlockScoped = 6144, + BlockScoped = 12288, } const enum ParserContextFlags { StrictMode = 1, @@ -412,7 +413,7 @@ declare module ts { body?: Block | Expression; } interface FunctionDeclaration extends FunctionLikeDeclaration, Statement { - name: Identifier; + name?: Identifier; body?: Block; } interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement { @@ -505,7 +506,9 @@ declare module ts { } interface ConditionalExpression extends Expression { condition: Expression; + questionToken: Node; whenTrue: Expression; + colonToken: Node; whenFalse: Expression; } interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { @@ -515,6 +518,7 @@ declare module ts { interface LiteralExpression extends PrimaryExpression { text: string; isUnterminated?: boolean; + hasExtendedUnicodeEscape?: boolean; } interface StringLiteralExpression extends LiteralExpression { _stringLiteralExpressionBrand: any; @@ -541,6 +545,7 @@ declare module ts { } interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; + dotToken: Node; name: Identifier; } interface ElementAccessExpression extends MemberExpression { @@ -636,16 +641,15 @@ declare module ts { catchClause?: CatchClause; finallyBlock?: Block; } - interface CatchClause extends Declaration { - name: Identifier; - type?: TypeNode; + interface CatchClause extends Node { + variableDeclaration: VariableDeclaration; block: Block; } interface ModuleElement extends Node { _moduleElementBrand: any; } interface ClassDeclaration extends Declaration, ModuleElement { - name: Identifier; + name?: Identifier; typeParameters?: NodeArray; heritageClauses?: NodeArray; members: NodeArray; @@ -675,10 +679,7 @@ declare module ts { name: Identifier; members: NodeArray; } - interface ExportContainer { - exportStars?: ExportDeclaration[]; - } - interface ModuleDeclaration extends Declaration, ModuleElement, ExportContainer { + interface ModuleDeclaration extends Declaration, ModuleElement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } @@ -703,7 +704,7 @@ declare module ts { interface NamespaceImport extends Declaration { name: Identifier; } - interface ExportDeclaration extends Statement, ModuleElement { + interface ExportDeclaration extends Declaration, ModuleElement { exportClause?: NamedExports; moduleSpecifier?: Expression; } @@ -718,8 +719,9 @@ declare module ts { } type ImportSpecifier = ImportOrExportSpecifier; type ExportSpecifier = ImportOrExportSpecifier; - interface ExportAssignment extends Statement, ModuleElement { - exportName: Identifier; + interface ExportAssignment extends Declaration, ModuleElement { + isExportEquals?: boolean; + expression: Expression; } interface FileReference extends TextRange { fileName: string; @@ -727,7 +729,7 @@ declare module ts { interface CommentRange extends TextRange { hasTrailingNewLine?: boolean; } - interface SourceFile extends Declaration, ExportContainer { + interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; fileName: string; @@ -832,6 +834,7 @@ declare module ts { getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean; getAliasedSymbol(symbol: Symbol): Symbol; + getExportsOfExternalModule(node: ImportDeclaration): Symbol[]; } interface SymbolDisplayBuilder { buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void; @@ -889,10 +892,10 @@ declare module ts { errorModuleName?: string; } interface EmitResolver { - getGeneratedNameForNode(node: ModuleDeclaration | EnumDeclaration | ImportDeclaration | ExportDeclaration): string; + getGeneratedNameForNode(node: Node): string; getExpressionNameSubstitution(node: Identifier): string; - getExportAssignmentName(node: SourceFile): string; - isReferencedImportDeclaration(node: Node): boolean; + hasExportDefaultValue(node: SourceFile): boolean; + isReferencedAliasDeclaration(node: Node): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; @@ -903,6 +906,7 @@ declare module ts { isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult; getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; isUnknownIdentifier(location: Node, name: string): boolean; + getBlockScopedVariableId(node: Identifier): number; } const enum SymbolFlags { FunctionScopedVariable = 1, @@ -928,13 +932,14 @@ declare module ts { ExportValue = 1048576, ExportType = 2097152, ExportNamespace = 4194304, - Import = 8388608, + Alias = 8388608, Instantiated = 16777216, Merged = 33554432, Transient = 67108864, Prototype = 134217728, UnionProperty = 268435456, Optional = 536870912, + ExportStar = 1073741824, Enum = 384, Variable = 3, Value = 107455, @@ -959,7 +964,7 @@ declare module ts { SetAccessorExcludes = 74687, TypeParameterExcludes = 530912, TypeAliasExcludes = 793056, - ImportExcludes = 8388608, + AliasExcludes = 8388608, ModuleMember = 8914931, ExportHasLocal = 944, HasLocals = 255504, @@ -988,10 +993,9 @@ declare module ts { declaredType?: Type; mapper?: TypeMapper; referenced?: boolean; - exportAssignmentChecked?: boolean; - exportAssignmentSymbol?: Symbol; unionType?: UnionType; resolvedExports?: SymbolTable; + exportsChecked?: boolean; } interface TransientSymbol extends Symbol, SymbolLinks { } @@ -1007,6 +1011,7 @@ declare module ts { SuperStatic = 32, ContextChecked = 64, EnumValuesComputed = 128, + BlockScopedBindingInLoop = 256, } interface NodeLinks { resolvedType?: Type; @@ -1383,6 +1388,7 @@ declare module ts { getTokenPos(): number; getTokenText(): string; getTokenValue(): string; + hasExtendedUnicodeEscape(): boolean; hasPrecedingLineBreak(): boolean; isIdentifier(): boolean; isReservedWord(): boolean; @@ -1479,9 +1485,6 @@ declare module ts { getDocumentationComment(): SymbolDisplayPart[]; } interface SourceFile { - version: string; - scriptSnapshot: IScriptSnapshot; - nameTable: Map; getNamedDeclarations(): Declaration[]; getLineAndCharacterOfPosition(pos: number): LineAndCharacter; getLineStarts(): number[]; @@ -1835,25 +1838,17 @@ declare module ts { acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile; /** * Request an updated version of an already existing SourceFile with a given fileName - * and compilationSettings. The update will intern call updateLanguageServiceSourceFile + * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile * to get an updated SourceFile. * - * Note: It is not allowed to call update on a SourceFile that was not acquired from this - * registry originally. - * - * @param sourceFile The original sourceFile object to update * @param fileName The name of the file requested * @param compilationSettings Some compilation settings like target affects the * shape of a the resulting SourceFile. This allows the DocumentRegistry to store * multiple copies of the same file for different compilation settings. - * @parm scriptSnapshot Text of the file. Only used if the file was not found - * in the registry and a new one was created. - * @parm version Current version of the file. Only used if the file was not found - * in the registry and a new one was created. - * @parm textChangeRange Change ranges since the last snapshot. Only used if the file - * was not found in the registry and a new one was created. + * @param scriptSnapshot Text of the file. + * @param version Current version of the file. */ - updateDocument(sourceFile: SourceFile, fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange): SourceFile; + updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile; /** * Informs the DocumentRegistry that a file is not needed any longer. * diff --git a/bin/typescriptServices.js b/bin/typescriptServices.js index 4ee694a8f19..f3c487b2079 100644 --- a/bin/typescriptServices.js +++ b/bin/typescriptServices.js @@ -118,28 +118,28 @@ var ts; SyntaxKind[SyntaxKind["WhileKeyword"] = 99] = "WhileKeyword"; SyntaxKind[SyntaxKind["WithKeyword"] = 100] = "WithKeyword"; SyntaxKind[SyntaxKind["AsKeyword"] = 101] = "AsKeyword"; - SyntaxKind[SyntaxKind["FromKeyword"] = 102] = "FromKeyword"; - SyntaxKind[SyntaxKind["ImplementsKeyword"] = 103] = "ImplementsKeyword"; - SyntaxKind[SyntaxKind["InterfaceKeyword"] = 104] = "InterfaceKeyword"; - SyntaxKind[SyntaxKind["LetKeyword"] = 105] = "LetKeyword"; - SyntaxKind[SyntaxKind["PackageKeyword"] = 106] = "PackageKeyword"; - SyntaxKind[SyntaxKind["PrivateKeyword"] = 107] = "PrivateKeyword"; - SyntaxKind[SyntaxKind["ProtectedKeyword"] = 108] = "ProtectedKeyword"; - SyntaxKind[SyntaxKind["PublicKeyword"] = 109] = "PublicKeyword"; - SyntaxKind[SyntaxKind["StaticKeyword"] = 110] = "StaticKeyword"; - SyntaxKind[SyntaxKind["YieldKeyword"] = 111] = "YieldKeyword"; - SyntaxKind[SyntaxKind["AnyKeyword"] = 112] = "AnyKeyword"; - SyntaxKind[SyntaxKind["BooleanKeyword"] = 113] = "BooleanKeyword"; - SyntaxKind[SyntaxKind["ConstructorKeyword"] = 114] = "ConstructorKeyword"; - SyntaxKind[SyntaxKind["DeclareKeyword"] = 115] = "DeclareKeyword"; - SyntaxKind[SyntaxKind["GetKeyword"] = 116] = "GetKeyword"; - SyntaxKind[SyntaxKind["ModuleKeyword"] = 117] = "ModuleKeyword"; - SyntaxKind[SyntaxKind["RequireKeyword"] = 118] = "RequireKeyword"; - SyntaxKind[SyntaxKind["NumberKeyword"] = 119] = "NumberKeyword"; - SyntaxKind[SyntaxKind["SetKeyword"] = 120] = "SetKeyword"; - SyntaxKind[SyntaxKind["StringKeyword"] = 121] = "StringKeyword"; - SyntaxKind[SyntaxKind["SymbolKeyword"] = 122] = "SymbolKeyword"; - SyntaxKind[SyntaxKind["TypeKeyword"] = 123] = "TypeKeyword"; + SyntaxKind[SyntaxKind["ImplementsKeyword"] = 102] = "ImplementsKeyword"; + SyntaxKind[SyntaxKind["InterfaceKeyword"] = 103] = "InterfaceKeyword"; + SyntaxKind[SyntaxKind["LetKeyword"] = 104] = "LetKeyword"; + SyntaxKind[SyntaxKind["PackageKeyword"] = 105] = "PackageKeyword"; + SyntaxKind[SyntaxKind["PrivateKeyword"] = 106] = "PrivateKeyword"; + SyntaxKind[SyntaxKind["ProtectedKeyword"] = 107] = "ProtectedKeyword"; + SyntaxKind[SyntaxKind["PublicKeyword"] = 108] = "PublicKeyword"; + SyntaxKind[SyntaxKind["StaticKeyword"] = 109] = "StaticKeyword"; + SyntaxKind[SyntaxKind["YieldKeyword"] = 110] = "YieldKeyword"; + SyntaxKind[SyntaxKind["AnyKeyword"] = 111] = "AnyKeyword"; + SyntaxKind[SyntaxKind["BooleanKeyword"] = 112] = "BooleanKeyword"; + SyntaxKind[SyntaxKind["ConstructorKeyword"] = 113] = "ConstructorKeyword"; + SyntaxKind[SyntaxKind["DeclareKeyword"] = 114] = "DeclareKeyword"; + SyntaxKind[SyntaxKind["GetKeyword"] = 115] = "GetKeyword"; + SyntaxKind[SyntaxKind["ModuleKeyword"] = 116] = "ModuleKeyword"; + SyntaxKind[SyntaxKind["RequireKeyword"] = 117] = "RequireKeyword"; + SyntaxKind[SyntaxKind["NumberKeyword"] = 118] = "NumberKeyword"; + SyntaxKind[SyntaxKind["SetKeyword"] = 119] = "SetKeyword"; + SyntaxKind[SyntaxKind["StringKeyword"] = 120] = "StringKeyword"; + SyntaxKind[SyntaxKind["SymbolKeyword"] = 121] = "SymbolKeyword"; + SyntaxKind[SyntaxKind["TypeKeyword"] = 122] = "TypeKeyword"; + SyntaxKind[SyntaxKind["FromKeyword"] = 123] = "FromKeyword"; SyntaxKind[SyntaxKind["OfKeyword"] = 124] = "OfKeyword"; SyntaxKind[SyntaxKind["QualifiedName"] = 125] = "QualifiedName"; SyntaxKind[SyntaxKind["ComputedPropertyName"] = 126] = "ComputedPropertyName"; @@ -245,8 +245,8 @@ var ts; SyntaxKind[SyntaxKind["LastReservedWord"] = 100] = "LastReservedWord"; SyntaxKind[SyntaxKind["FirstKeyword"] = 65] = "FirstKeyword"; SyntaxKind[SyntaxKind["LastKeyword"] = 124] = "LastKeyword"; - SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 103] = "FirstFutureReservedWord"; - SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 111] = "LastFutureReservedWord"; + SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 102] = "FirstFutureReservedWord"; + SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 110] = "LastFutureReservedWord"; SyntaxKind[SyntaxKind["FirstTypeNode"] = 139] = "FirstTypeNode"; SyntaxKind[SyntaxKind["LastTypeNode"] = 147] = "LastTypeNode"; SyntaxKind[SyntaxKind["FirstPunctuation"] = 14] = "FirstPunctuation"; @@ -271,15 +271,16 @@ var ts; NodeFlags[NodeFlags["Private"] = 32] = "Private"; NodeFlags[NodeFlags["Protected"] = 64] = "Protected"; NodeFlags[NodeFlags["Static"] = 128] = "Static"; - NodeFlags[NodeFlags["MultiLine"] = 256] = "MultiLine"; - NodeFlags[NodeFlags["Synthetic"] = 512] = "Synthetic"; - NodeFlags[NodeFlags["DeclarationFile"] = 1024] = "DeclarationFile"; - NodeFlags[NodeFlags["Let"] = 2048] = "Let"; - NodeFlags[NodeFlags["Const"] = 4096] = "Const"; - NodeFlags[NodeFlags["OctalLiteral"] = 8192] = "OctalLiteral"; - NodeFlags[NodeFlags["Modifier"] = 243] = "Modifier"; + NodeFlags[NodeFlags["Default"] = 256] = "Default"; + NodeFlags[NodeFlags["MultiLine"] = 512] = "MultiLine"; + NodeFlags[NodeFlags["Synthetic"] = 1024] = "Synthetic"; + NodeFlags[NodeFlags["DeclarationFile"] = 2048] = "DeclarationFile"; + NodeFlags[NodeFlags["Let"] = 4096] = "Let"; + NodeFlags[NodeFlags["Const"] = 8192] = "Const"; + NodeFlags[NodeFlags["OctalLiteral"] = 16384] = "OctalLiteral"; + NodeFlags[NodeFlags["Modifier"] = 499] = "Modifier"; NodeFlags[NodeFlags["AccessibilityModifier"] = 112] = "AccessibilityModifier"; - NodeFlags[NodeFlags["BlockScoped"] = 6144] = "BlockScoped"; + NodeFlags[NodeFlags["BlockScoped"] = 12288] = "BlockScoped"; })(ts.NodeFlags || (ts.NodeFlags = {})); var NodeFlags = ts.NodeFlags; (function (ParserContextFlags) { @@ -353,13 +354,14 @@ var ts; SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue"; SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType"; SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace"; - SymbolFlags[SymbolFlags["Import"] = 8388608] = "Import"; + SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias"; SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated"; SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged"; SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient"; SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype"; SymbolFlags[SymbolFlags["UnionProperty"] = 268435456] = "UnionProperty"; SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional"; + SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar"; SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum"; SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable"; SymbolFlags[SymbolFlags["Value"] = 107455] = "Value"; @@ -384,7 +386,7 @@ var ts; SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes"; SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530912] = "TypeParameterExcludes"; SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793056] = "TypeAliasExcludes"; - SymbolFlags[SymbolFlags["ImportExcludes"] = 8388608] = "ImportExcludes"; + SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes"; SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember"; SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal"; SymbolFlags[SymbolFlags["HasLocals"] = 255504] = "HasLocals"; @@ -404,6 +406,7 @@ var ts; NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 32] = "SuperStatic"; NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 64] = "ContextChecked"; NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 128] = "EnumValuesComputed"; + NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 256] = "BlockScopedBindingInLoop"; })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {})); var NodeCheckFlags = ts.NodeCheckFlags; (function (TypeFlags) { @@ -825,7 +828,9 @@ var ts; } ts.localizedDiagnosticMessages = undefined; function getLocaleSpecificMessage(message) { - return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message; + return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] + ? ts.localizedDiagnosticMessages[message] + : message; } ts.getLocaleSpecificMessage = getLocaleSpecificMessage; function createFileDiagnostic(file, start, length, message) { @@ -973,7 +978,9 @@ var ts; normalized.pop(); } else { - normalized.push(part); + if (part) { + normalized.push(part); + } } } } @@ -1116,7 +1123,7 @@ var ts; } ts.removeFileExtension = removeFileExtension; var backslashOrDoubleQuote = /[\"\\]/g; - var escapedCharsRegExp = /[\0-\19\t\v\f\b\0\r\n\u2028\u2029\u0085]/g; + var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; var escapedCharsMap = { "\0": "\\0", "\t": "\\t", @@ -1131,20 +1138,6 @@ var ts; "\u2029": "\\u2029", "\u0085": "\\u0085" }; - function escapeString(s) { - s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s; - s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; - return s; - function getReplacement(c) { - return escapedCharsMap[c] || unicodeEscape(c); - } - function unicodeEscape(c) { - var hexCharCode = c.charCodeAt(0).toString(16); - var paddedHexCode = ("0000" + hexCharCode).slice(-4); - return "\\u" + paddedHexCode; - } - } - ts.escapeString = escapeString; function getDefaultLibFileName(options) { return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; } @@ -1464,7 +1457,6 @@ var ts; Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." }, Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." }, Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." }, - Catch_clause_parameter_cannot_have_a_type_annotation: { code: 1013, category: 1, key: "Catch clause parameter cannot have a type annotation." }, A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." }, Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." }, A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." }, @@ -1572,7 +1564,6 @@ var ts; const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" }, const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." }, let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." }, - Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1159, category: 1, key: "Tagged templates are only available when targeting ECMAScript 6 and higher." }, Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." }, Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." }, An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." }, @@ -1609,6 +1600,11 @@ var ts; External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." }, An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." }, Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." }, + Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." }, + Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." }, + Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." }, + An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." }, + Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." }, Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." }, Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." }, Static_members_cannot_reference_class_type_parameters: { code: 2302, category: 1, key: "Static members cannot reference class type parameters." }, @@ -1782,6 +1778,14 @@ var ts; for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." }, The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." }, Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" }, + The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." }, + Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." }, + The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." }, + The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." }, + The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." }, + The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." }, + Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" }, Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, @@ -1851,6 +1855,7 @@ var ts; Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." }, + Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." }, The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." }, Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" }, @@ -1926,25 +1931,24 @@ var ts; You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." }, yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." }, Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." }, - The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }, - for_of_statements_are_not_currently_supported: { code: 9003, category: 1, key: "'for...of' statements are not currently supported." } + The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." } }; })(ts || (ts = {})); var ts; (function (ts) { var textToToken = { - "any": 112, + "any": 111, "as": 101, - "boolean": 113, + "boolean": 112, "break": 65, "case": 66, "catch": 67, "class": 68, "continue": 70, "const": 69, - "constructor": 114, + "constructor": 113, "debugger": 71, - "declare": 115, + "declare": 114, "default": 72, "delete": 73, "do": 74, @@ -1955,43 +1959,43 @@ var ts; "false": 79, "finally": 80, "for": 81, - "from": 102, + "from": 123, "function": 82, - "get": 116, + "get": 115, "if": 83, - "implements": 103, + "implements": 102, "import": 84, "in": 85, "instanceof": 86, - "interface": 104, - "let": 105, - "module": 117, + "interface": 103, + "let": 104, + "module": 116, "new": 87, "null": 88, - "number": 119, - "package": 106, - "private": 107, - "protected": 108, - "public": 109, - "require": 118, + "number": 118, + "package": 105, + "private": 106, + "protected": 107, + "public": 108, + "require": 117, "return": 89, - "set": 120, - "static": 110, - "string": 121, + "set": 119, + "static": 109, + "string": 120, "super": 90, "switch": 91, - "symbol": 122, + "symbol": 121, "this": 92, "throw": 93, "true": 94, "try": 95, - "type": 123, + "type": 122, "typeof": 96, "var": 97, "void": 98, "while": 99, "with": 100, - "yield": 111, + "yield": 110, "of": 124, "{": 14, "}": 15, @@ -2071,11 +2075,15 @@ var ts; return false; } function isUnicodeIdentifierStart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierStart) : + lookupInUnicodeMap(code, unicodeES3IdentifierStart); } ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart; function isUnicodeIdentifierPart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierPart) : + lookupInUnicodeMap(code, unicodeES3IdentifierPart); } function makeReverseMap(source) { var result = []; @@ -2364,6 +2372,7 @@ var ts; var token; var tokenValue; var precedingLineBreak; + var hasExtendedUnicodeEscape; var tokenIsUnterminated; function error(message, length) { if (onError) { @@ -2413,10 +2422,16 @@ var ts; } return +(text.substring(start, pos)); } - function scanHexDigits(count, mustMatchCount) { + function scanExactNumberOfHexDigits(count) { + return scanHexDigits(count, false); + } + function scanMinimumNumberOfHexDigits(count) { + return scanHexDigits(count, true); + } + function scanHexDigits(minCount, scanAsManyAsPossible) { var digits = 0; var value = 0; - while (digits < count || !mustMatchCount) { + while (digits < minCount || scanAsManyAsPossible) { var ch = text.charCodeAt(pos); if (ch >= 48 && ch <= 57) { value = value * 16 + ch - 48; @@ -2433,7 +2448,7 @@ var ts; pos++; digits++; } - if (digits < count) { + if (digits < minCount) { value = -1; } return value; @@ -2546,16 +2561,15 @@ var ts; return "\'"; case 34: return "\""; - case 120: case 117: - var ch = scanHexDigits(ch === 120 ? 2 : 4, true); - if (ch >= 0) { - return String.fromCharCode(ch); - } - else { - error(ts.Diagnostics.Hexadecimal_digit_expected); - return ""; + if (pos < len && text.charCodeAt(pos) === 123) { + hasExtendedUnicodeEscape = true; + pos++; + return scanExtendedUnicodeEscape(); } + return scanHexadecimalEscape(4); + case 120: + return scanHexadecimalEscape(2); case 13: if (pos < len && text.charCodeAt(pos) === 10) { pos++; @@ -2568,11 +2582,57 @@ var ts; return String.fromCharCode(ch); } } + function scanHexadecimalEscape(numDigits) { + var escapedValue = scanExactNumberOfHexDigits(numDigits); + if (escapedValue >= 0) { + return String.fromCharCode(escapedValue); + } + else { + error(ts.Diagnostics.Hexadecimal_digit_expected); + return ""; + } + } + function scanExtendedUnicodeEscape() { + var escapedValue = scanMinimumNumberOfHexDigits(1); + var isInvalidExtendedEscape = false; + if (escapedValue < 0) { + error(ts.Diagnostics.Hexadecimal_digit_expected); + isInvalidExtendedEscape = true; + } + else if (escapedValue > 0x10FFFF) { + error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive); + isInvalidExtendedEscape = true; + } + if (pos >= len) { + error(ts.Diagnostics.Unexpected_end_of_text); + isInvalidExtendedEscape = true; + } + else if (text.charCodeAt(pos) == 125) { + pos++; + } + else { + error(ts.Diagnostics.Unterminated_Unicode_escape_sequence); + isInvalidExtendedEscape = true; + } + if (isInvalidExtendedEscape) { + return ""; + } + return utf16EncodeAsString(escapedValue); + } + function utf16EncodeAsString(codePoint) { + ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF); + if (codePoint <= 65535) { + return String.fromCharCode(codePoint); + } + var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800; + var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00; + return String.fromCharCode(codeUnit1, codeUnit2); + } function peekUnicodeEscape() { if (pos + 5 < len && text.charCodeAt(pos + 1) === 117) { var start = pos; pos += 2; - var value = scanHexDigits(4, true); + var value = scanExactNumberOfHexDigits(4); pos = start; return value; } @@ -2634,6 +2694,7 @@ var ts; } function scan() { startPos = pos; + hasExtendedUnicodeEscape = false; precedingLineBreak = false; tokenIsUnterminated = false; while (true) { @@ -2785,7 +2846,7 @@ var ts; case 48: if (pos + 2 < len && (text.charCodeAt(pos + 1) === 88 || text.charCodeAt(pos + 1) === 120)) { pos += 2; - var value = scanHexDigits(1, false); + var value = scanMinimumNumberOfHexDigits(1); if (value < 0) { error(ts.Diagnostics.Hexadecimal_digit_expected); value = 0; @@ -3055,6 +3116,7 @@ var ts; getTokenPos: function () { return tokenPos; }, getTokenText: function () { return text.substring(tokenPos, pos); }, getTokenValue: function () { return tokenValue; }, + hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; }, hasPrecedingLineBreak: function () { return precedingLineBreak; }, isIdentifier: function () { return token === 64 || token > 100; }, isReservedWord: function () { return token >= 65 && token <= 100; }, @@ -3203,35 +3265,51 @@ var ts; return ts.getBaseFileName(moduleName).replace(/\W/g, "_"); } ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 12288) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + function isCatchClauseVariableDeclaration(declaration) { + return declaration && + declaration.kind === 193 && + declaration.parent && + declaration.parent.kind === 216; + } + ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; function declarationNameToString(name) { return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); } ts.declarationNameToString = declarationNameToString; function createDiagnosticForNode(node, message, arg0, arg1, arg2) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = getTokenPosOfNode(node, file); - var length = node.end - start; - return ts.createFileDiagnostic(file, start, length, message, arg0, arg1, arg2); + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); } ts.createDiagnosticForNode = createDiagnosticForNode; function createDiagnosticForNodeFromMessageChain(node, messageChain) { - node = getErrorSpanForNode(node); - var file = getSourceFileOfNode(node); - var start = ts.skipTrivia(file.text, node.pos); - var length = node.end - start; + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); return { - file: file, - start: start, - length: length, + file: sourceFile, + start: span.start, + length: span.length, code: messageChain.code, category: messageChain.category, messageText: messageChain.next ? messageChain : messageChain.messageText }; } ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; - function getErrorSpanForNode(node) { - var errorSpan; + function getSpanOfTokenAtPosition(sourceFile, pos) { + var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.text); + scanner.setTextPos(pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return createTextSpanFromBounds(start, scanner.getTextPos()); + } + ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; + function getErrorSpanForNode(sourceFile, node) { + var errorNode = node; switch (node.kind) { case 193: case 150: @@ -3240,10 +3318,18 @@ var ts; case 200: case 199: case 219: - errorSpan = node.name; + case 195: + case 160: + errorNode = node.name; break; } - return errorSpan && errorSpan.pos < errorSpan.end ? errorSpan : node; + if (errorNode === undefined) { + return getSpanOfTokenAtPosition(sourceFile, node.pos); + } + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : ts.skipTrivia(sourceFile.text, errorNode.pos); + return createTextSpanFromBounds(pos, errorNode.end); } ts.getErrorSpanForNode = getErrorSpanForNode; function isExternalModule(file) { @@ -3251,7 +3337,7 @@ var ts; } ts.isExternalModule = isExternalModule; function isDeclarationFile(file) { - return (file.flags & 1024) !== 0; + return (file.flags & 2048) !== 0; } ts.isDeclarationFile = isDeclarationFile; function isConstEnumDeclaration(node) { @@ -3281,11 +3367,11 @@ var ts; } ts.getCombinedNodeFlags = getCombinedNodeFlags; function isConst(node) { - return !!(getCombinedNodeFlags(node) & 4096); + return !!(getCombinedNodeFlags(node) & 8192); } ts.isConst = isConst; function isLet(node) { - return !!(getCombinedNodeFlags(node) & 2048); + return !!(getCombinedNodeFlags(node) & 4096); } ts.isLet = isLet; function isPrologueDirective(node) { @@ -3337,7 +3423,24 @@ var ts; } } ts.forEachReturnStatement = forEachReturnStatement; - function isAnyFunction(node) { + function isVariableLike(node) { + if (node) { + switch (node.kind) { + case 150: + case 219: + case 128: + case 217: + case 130: + case 129: + case 218: + case 193: + return true; + } + } + return false; + } + ts.isVariableLike = isVariableLike; + function isFunctionLike(node) { if (node) { switch (node.kind) { case 133: @@ -3361,9 +3464,9 @@ var ts; } return false; } - ts.isAnyFunction = isAnyFunction; + ts.isFunctionLike = isFunctionLike; function isFunctionBlock(node) { - return node && node.kind === 174 && isAnyFunction(node.parent); + return node && node.kind === 174 && isFunctionLike(node.parent); } ts.isFunctionBlock = isFunctionBlock; function isObjectLiteralMethod(node) { @@ -3373,7 +3476,7 @@ var ts; function getContainingFunction(node) { while (true) { node = node.parent; - if (!node || isAnyFunction(node)) { + if (!node || isFunctionLike(node)) { return node; } } @@ -3611,12 +3714,12 @@ var ts; } ts.isTemplateLiteralKind = isTemplateLiteralKind; function isBindingPattern(node) { - return node.kind === 149 || node.kind === 148; + return !!node && (node.kind === 149 || node.kind === 148); } ts.isBindingPattern = isBindingPattern; function isInAmbientContext(node) { while (node) { - if (node.flags & (2 | 1024)) { + if (node.flags & (2 | 2048)) { return true; } node = node.parent; @@ -3626,31 +3729,33 @@ var ts; ts.isInAmbientContext = isInAmbientContext; function isDeclaration(node) { switch (node.kind) { - case 127: - case 128: - case 193: + case 161: case 150: - case 130: - case 129: - case 217: - case 218: + case 196: + case 133: + case 199: case 219: + case 211: + case 195: + case 160: + case 134: + case 204: + case 202: + case 207: + case 197: case 132: case 131: - case 195: - case 134: - case 135: - case 133: - case 196: - case 197: - case 198: - case 199: case 200: - case 202: - case 204: - case 207: case 205: - case 211: + case 128: + case 217: + case 130: + case 129: + case 135: + case 218: + case 198: + case 127: + case 193: return true; } return false; @@ -3683,27 +3788,29 @@ var ts; } } ts.isStatement = isStatement; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name) { + function isDeclarationName(name) { if (name.kind !== 64 && name.kind !== 8 && name.kind !== 7) { return false; } var parent = name.parent; - if (isDeclaration(parent) || parent.kind === 160) { - return parent.name === name; + if (parent.kind === 207 || parent.kind === 211) { + if (parent.propertyName) { + return true; + } } - if (parent.kind === 216) { + if (isDeclaration(parent)) { return parent.name === name; } return false; } - ts.isDeclarationOrFunctionExpressionOrCatchVariableName = isDeclarationOrFunctionExpressionOrCatchVariableName; + ts.isDeclarationName = isDeclarationName; function getClassBaseTypeNode(node) { var heritageClause = getHeritageClause(node.heritageClauses, 78); return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; } ts.getClassBaseTypeNode = getClassBaseTypeNode; function getClassImplementedTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 103); + var heritageClause = getHeritageClause(node.heritageClauses, 102); return heritageClause ? heritageClause.types : undefined; } ts.getClassImplementedTypeNodes = getClassImplementedTypeNodes; @@ -3817,13 +3924,14 @@ var ts; ts.isESSymbolIdentifier = isESSymbolIdentifier; function isModifier(token) { switch (token) { - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: case 77: - case 115: + case 114: case 69: + case 72: return true; } return false; @@ -3938,6 +4046,42 @@ var ts; return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); } ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; + function nodeStartsNewLexicalEnvironment(n) { + return isFunctionLike(n) || n.kind === 200 || n.kind === 220; + } + ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; + function nodeIsSynthesized(node) { + return node.pos === -1 && node.end === -1; + } + ts.nodeIsSynthesized = nodeIsSynthesized; + function createSynthesizedNode(kind, startsOnNewLine) { + var node = ts.createNode(kind); + node.pos = -1; + node.end = -1; + node.startsOnNewLine = startsOnNewLine; + return node; + } + ts.createSynthesizedNode = createSynthesizedNode; + function generateUniqueName(baseName, isExistingName) { + if (baseName.charCodeAt(0) !== 95) { + var baseName = "_" + baseName; + if (!isExistingName(baseName)) { + return baseName; + } + } + if (baseName.charCodeAt(baseName.length - 1) !== 95) { + baseName += "_"; + } + var i = 1; + while (true) { + var name = baseName + i; + if (!isExistingName(name)) { + return name; + } + i++; + } + } + ts.generateUniqueName = generateUniqueName; function createDiagnosticCollection() { var nonFileDiagnostics = []; var fileDiagnostics = {}; @@ -4003,6 +4147,41 @@ var ts; } } ts.createDiagnosticCollection = createDiagnosticCollection; + var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; + var escapedCharsMap = { + "\0": "\\0", + "\t": "\\t", + "\v": "\\v", + "\f": "\\f", + "\b": "\\b", + "\r": "\\r", + "\n": "\\n", + "\\": "\\\\", + "\"": "\\\"", + "\u2028": "\\u2028", + "\u2029": "\\u2029", + "\u0085": "\\u0085" + }; + function escapeString(s) { + s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; + return s; + function getReplacement(c) { + return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); + } + } + ts.escapeString = escapeString; + function get16BitUnicodeEscapeSequence(charCode) { + var hexCharCode = charCode.toString(16).toUpperCase(); + var paddedHexCode = ("0000" + hexCharCode).slice(-4); + return "\\u" + paddedHexCode; + } + var nonAsciiCharacters = /[^\u0000-\u007F]/g; + function escapeNonAsciiCharacters(s) { + return nonAsciiCharacters.test(s) ? + s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : + s; + } + ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; })(ts || (ts = {})); var ts; (function (ts) { @@ -4113,6 +4292,7 @@ var ts; return visitNodes(cbNodes, node.properties); case 153: return visitNode(cbNode, node.expression) || + visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name); case 154: return visitNode(cbNode, node.expression) || @@ -4149,7 +4329,9 @@ var ts; visitNode(cbNode, node.right); case 168: return visitNode(cbNode, node.condition) || + visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || + visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse); case 171: return visitNode(cbNode, node.expression); @@ -4215,8 +4397,7 @@ var ts; visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock); case 216: - return visitNode(cbNode, node.name) || - visitNode(cbNode, node.type) || + return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block); case 196: return visitNodes(cbNodes, node.modifiers) || @@ -4271,7 +4452,7 @@ var ts; visitNode(cbNode, node.name); case 208: return visitNodes(cbNodes, node.modifiers) || - visitNode(cbNode, node.exportName); + visitNode(cbNode, node.expression); case 169: return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans); case 173: @@ -4344,13 +4525,14 @@ var ts; ; function modifierToFlag(token) { switch (token) { - case 110: return 128; - case 109: return 16; - case 108: return 64; - case 107: return 32; + case 109: return 128; + case 108: return 16; + case 107: return 64; + case 106: return 32; case 77: return 1; - case 115: return 2; - case 69: return 4096; + case 114: return 2; + case 69: return 8192; + case 72: return 256; } return 0; } @@ -4676,7 +4858,7 @@ var ts; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); - sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 1024 : 0; + sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 2048 : 0; var contextFlags = 0; var parseErrorBeforeNextFinishedNode = false; var scanner = ts.createScanner(languageVersion, true, sourceText, scanError); @@ -4804,7 +4986,9 @@ var ts; var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length; var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode; var saveContextFlags = contextFlags; - var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback); + var result = isLookAhead + ? scanner.lookAhead(callback) + : scanner.tryScan(callback); ts.Debug.assert(saveContextFlags === contextFlags); if (!result || isLookAhead) { token = saveToken; @@ -4823,10 +5007,10 @@ var ts; if (token === 64) { return true; } - if (token === 111 && inYieldContext()) { + if (token === 110 && inYieldContext()) { return false; } - return inStrictModeContext() ? token > 111 : token > 100; + return inStrictModeContext() ? token > 110 : token > 100; } function parseExpected(kind, diagnosticMessage) { if (token === kind) { @@ -4850,12 +5034,14 @@ var ts; } function parseOptionalToken(t) { if (token === t) { - var node = createNode(t); - nextToken(); - return finishNode(node); + return parseTokenNode(); } return undefined; } + function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) { + return parseOptionalToken(t) || + createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0); + } function parseTokenNode() { var node = createNode(token); nextToken(); @@ -4974,13 +5160,26 @@ var ts; } if (token === 77) { nextToken(); + if (token === 72) { + return lookAhead(nextTokenIsClassOrFunction); + } return token !== 35 && token !== 14 && canFollowModifier(); } + if (token === 72) { + return nextTokenIsClassOrFunction(); + } nextToken(); return canFollowModifier(); } function canFollowModifier() { - return token === 18 || token === 14 || token === 35 || isLiteralPropertyName(); + return token === 18 + || token === 14 + || token === 35 + || isLiteralPropertyName(); + } + function nextTokenIsClassOrFunction() { + nextToken(); + return token === 68 || token === 82; } function isListElement(parsingContext, inErrorRecovery) { var node = currentNode(parsingContext); @@ -5034,7 +5233,7 @@ var ts; return isIdentifier(); } function isNotHeritageClauseTypeName() { - if (token === 103 || + if (token === 102 || token === 78) { return lookAhead(nextTokenIsIdentifier); } @@ -5058,11 +5257,11 @@ var ts; case 4: return token === 15 || token === 66 || token === 72; case 8: - return token === 14 || token === 78 || token === 103; + return token === 14 || token === 78 || token === 102; case 9: return isVariableDeclaratorListTerminator(); case 16: - return token === 25 || token === 16 || token === 14 || token === 78 || token === 103; + return token === 25 || token === 16 || token === 14 || token === 78 || token === 102; case 12: return token === 17 || token === 22; case 14: @@ -5398,7 +5597,7 @@ var ts; literal = parseLiteralNode(); } else { - literal = createMissingNode(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); + literal = parseExpectedToken(13, false, ts.Diagnostics._0_expected, ts.tokenToString(15)); } span.literal = literal; return finishNode(span); @@ -5407,14 +5606,19 @@ var ts; var node = createNode(token); var text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; + if (scanner.hasExtendedUnicodeEscape()) { + node.hasExtendedUnicodeEscape = true; + } if (scanner.isUnterminated()) { node.isUnterminated = true; } var tokenPos = scanner.getTokenPos(); nextToken(); finishNode(node); - if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= 8192; + if (node.kind === 7 + && sourceText.charCodeAt(tokenPos) === 48 + && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { + node.flags |= 16384; } return node; } @@ -5452,7 +5656,9 @@ var ts; } function parseParameterType() { if (parseOptional(51)) { - return token === 8 ? parseLiteralNode(true) : parseType(); + return token === 8 + ? parseLiteralNode(true) + : parseType(); } return undefined; } @@ -5622,7 +5828,9 @@ var ts; case 24: return parseSignatureMember(136); case 18: - return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature(); + return isIndexSignature() + ? parseIndexSignatureDeclaration(undefined) + : parsePropertyOrMethodSignature(); case 87: if (lookAhead(isStartOfConstructSignature)) { return parseSignatureMember(137); @@ -5644,7 +5852,9 @@ var ts; } function parseIndexSignatureWithModifiers() { var modifiers = parseModifiers(); - return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined; + return isIndexSignature() + ? parseIndexSignatureDeclaration(modifiers) + : undefined; } function isStartOfConstructSignature() { nextToken(); @@ -5692,11 +5902,11 @@ var ts; } function parseNonArrayType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReference(); case 98: @@ -5715,11 +5925,11 @@ var ts; } function isStartOfType() { switch (token) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 96: case 14: @@ -5840,7 +6050,7 @@ var ts; case 39: case 24: case 64: - case 111: + case 110: return true; default: if (isBinaryOperator()) { @@ -5887,7 +6097,7 @@ var ts; return parseConditionalExpressionRest(expr); } function isYieldExpression() { - if (token === 111) { + if (token === 110) { if (inYieldContext()) { return true; } @@ -5933,7 +6143,9 @@ var ts; if (triState === 0) { return undefined; } - var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); + var arrowFunction = triState === 1 + ? parseParenthesizedArrowFunctionExpressionHead(true) + : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); if (!arrowFunction) { return undefined; } @@ -6012,13 +6224,15 @@ var ts; return parseAssignmentExpressionOrHigher(); } function parseConditionalExpressionRest(leftOperand) { - if (!parseOptional(50)) { + var questionToken = parseOptionalToken(50); + if (!questionToken) { return leftOperand; } var node = createNode(168, leftOperand.pos); node.condition = leftOperand; + node.questionToken = questionToken; node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(51); + node.colonToken = parseExpectedToken(51, false, ts.Diagnostics._0_expected, ts.tokenToString(51)); node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } @@ -6153,7 +6367,9 @@ var ts; return expression; } function parseLeftHandSideExpressionOrHigher() { - var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher(); + var expression = token === 90 + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); return parseCallExpressionRest(expression); } function parseMemberExpressionOrHigher() { @@ -6167,7 +6383,7 @@ var ts; } var node = createNode(153, expression.pos); node.expression = expression; - parseExpected(20, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.dotToken = parseExpectedToken(20, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); node.name = parseRightSideOfDot(true); return finishNode(node); } @@ -6181,10 +6397,11 @@ var ts; } function parseMemberExpressionRest(expression) { while (true) { - var dotOrBracketStart = scanner.getTokenPos(); - if (parseOptional(20)) { + var dotToken = parseOptionalToken(20); + if (dotToken) { var propertyAccess = createNode(153, expression.pos); propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; propertyAccess.name = parseRightSideOfDot(true); expression = finishNode(propertyAccess); continue; @@ -6206,7 +6423,9 @@ var ts; if (token === 10 || token === 11) { var tagExpression = createNode(157, expression.pos); tagExpression.tag = expression; - tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression(); + tagExpression.template = token === 10 + ? parseLiteralNode() + : parseTemplateExpression(); expression = finishNode(tagExpression); continue; } @@ -6252,7 +6471,9 @@ var ts; if (!parseExpected(25)) { return undefined; } - return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined; + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } function canFollowTypeArgumentsInExpression() { switch (token) { @@ -6327,7 +6548,9 @@ var ts; return finishNode(node); } function parseArgumentOrArrayLiteralElement() { - return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher(); + return token === 21 ? parseSpreadElement() : + token === 23 ? createNode(172) : + parseAssignmentExpressionOrHigher(); } function parseArgumentExpression() { return allowInAnd(parseArgumentOrArrayLiteralElement); @@ -6336,16 +6559,16 @@ var ts; var node = createNode(151); parseExpected(18); if (scanner.hasPrecedingLineBreak()) - node.flags |= 256; + node.flags |= 512; node.elements = parseDelimitedList(14, parseArgumentOrArrayLiteralElement); parseExpected(19); return finishNode(node); } function tryParseAccessorDeclaration(fullStart, modifiers) { - if (parseContextualModifier(116)) { + if (parseContextualModifier(115)) { return parseAccessorDeclaration(134, fullStart, modifiers); } - else if (parseContextualModifier(120)) { + else if (parseContextualModifier(119)) { return parseAccessorDeclaration(135, fullStart, modifiers); } return undefined; @@ -6384,7 +6607,7 @@ var ts; var node = createNode(152); parseExpected(14); if (scanner.hasPrecedingLineBreak()) { - node.flags |= 256; + node.flags |= 512; } node.properties = parseDelimitedList(13, parseObjectLiteralElement, true); parseExpected(15); @@ -6471,7 +6694,7 @@ var ts; parseExpected(16); var initializer = undefined; if (token !== 22) { - if (token === 97 || token === 105 || token === 69) { + if (token === 97 || token === 104 || token === 69) { initializer = parseVariableDeclarationList(true); } else { @@ -6587,9 +6810,9 @@ var ts; function parseCatchClause() { var result = createNode(216); parseExpected(67); - parseExpected(16); - result.name = parseIdentifier(); - result.type = parseTypeAnnotation(); + if (parseExpected(16)) { + result.variableDeclaration = parseVariableDeclaration(); + } parseExpected(17); result.block = parseBlock(false, false); return finishNode(result); @@ -6628,7 +6851,7 @@ var ts; return !inErrorRecovery; case 14: case 97: - case 105: + case 104: case 82: case 83: case 74: @@ -6648,18 +6871,18 @@ var ts; case 69: var isConstEnum = lookAhead(nextTokenIsEnumKeyword); return !isConstEnum; - case 104: + case 103: case 68: - case 117: + case 116: case 76: - case 123: + case 122: if (isDeclarationStart()) { return false; } - case 109: - case 107: case 108: - case 110: + case 106: + case 107: + case 109: if (lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine)) { return false; } @@ -6712,7 +6935,7 @@ var ts; return parseTryStatement(); case 71: return parseDebuggerStatement(); - case 105: + case 104: if (isLetDeclaration()) { return parseVariableStatement(scanner.getStartPos(), undefined); } @@ -6736,7 +6959,7 @@ var ts; return undefined; } return parseVariableStatement(start, modifiers); - case 105: + case 104: if (!isLetDeclaration()) { return undefined; } @@ -6819,11 +7042,11 @@ var ts; switch (token) { case 97: break; - case 105: - node.flags |= 2048; + case 104: + node.flags |= 4096; break; case 69: - node.flags |= 4096; + node.flags |= 8192; break; default: ts.Debug.fail(); @@ -6855,7 +7078,7 @@ var ts; setModifiers(node, modifiers); parseExpected(82); node.asteriskToken = parseOptionalToken(35); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); fillSignature(51, !!node.asteriskToken, false, node); node.body = parseFunctionBlockOrSemicolon(!!node.asteriskToken, ts.Diagnostics.or_expected); return finishNode(node); @@ -6863,7 +7086,7 @@ var ts; function parseConstructorDeclaration(pos, modifiers) { var node = createNode(133, pos); setModifiers(node, modifiers); - parseExpected(114); + parseExpected(113); fillSignature(51, false, false, node); node.body = parseFunctionBlockOrSemicolon(false, ts.Diagnostics.or_expected); return finishNode(node); @@ -6924,7 +7147,7 @@ var ts; return true; } if (idToken !== undefined) { - if (!ts.isKeyword(idToken) || idToken === 120 || idToken === 116) { + if (!ts.isKeyword(idToken) || idToken === 119 || idToken === 115) { return true; } switch (token) { @@ -6969,7 +7192,7 @@ var ts; if (accessor) { return accessor; } - if (token === 114) { + if (token === 113) { return parseConstructorDeclaration(fullStart, modifiers); } if (isIndexSignature()) { @@ -6988,11 +7211,13 @@ var ts; var node = createNode(196, fullStart); setModifiers(node, modifiers); parseExpected(68); - node.name = parseIdentifier(); + node.name = node.flags & 256 ? parseOptionalIdentifier() : parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(true); if (parseExpected(14)) { - node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers(); + node.members = inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseClassMembers) + : parseClassMembers(); parseExpected(15); } else { @@ -7002,7 +7227,9 @@ var ts; } function parseHeritageClauses(isClassHeritageClause) { if (isHeritageClause()) { - return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker(); + return isClassHeritageClause && inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseHeritageClausesWorker) + : parseHeritageClausesWorker(); } return undefined; } @@ -7010,7 +7237,7 @@ var ts; return parseList(19, false, parseHeritageClause); } function parseHeritageClause() { - if (token === 78 || token === 103) { + if (token === 78 || token === 102) { var node = createNode(215); node.token = token; nextToken(); @@ -7020,7 +7247,7 @@ var ts; return undefined; } function isHeritageClause() { - return token === 78 || token === 103; + return token === 78 || token === 102; } function parseClassMembers() { return parseList(6, false, parseClassElement); @@ -7028,7 +7255,7 @@ var ts; function parseInterfaceDeclaration(fullStart, modifiers) { var node = createNode(197, fullStart); setModifiers(node, modifiers); - parseExpected(104); + parseExpected(103); node.name = parseIdentifier(); node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(false); @@ -7038,7 +7265,7 @@ var ts; function parseTypeAliasDeclaration(fullStart, modifiers) { var node = createNode(198, fullStart); setModifiers(node, modifiers); - parseExpected(123); + parseExpected(122); node.name = parseIdentifier(); parseExpected(52); node.type = parseType(); @@ -7081,7 +7308,9 @@ var ts; setModifiers(node, modifiers); node.flags |= flags; node.name = parseIdentifier(); - node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock(); + node.body = parseOptional(20) + ? parseInternalModuleTail(getNodePos(), undefined, 1) + : parseModuleBlock(); return finishNode(node); } function parseAmbientExternalModuleDeclaration(fullStart, modifiers) { @@ -7092,11 +7321,13 @@ var ts; return finishNode(node); } function parseModuleDeclaration(fullStart, modifiers) { - parseExpected(117); - return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); + parseExpected(116); + return token === 8 + ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) + : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); } function isExternalModuleReference() { - return token === 118 && + return token === 117 && lookAhead(nextTokenIsOpenParen); } function nextTokenIsOpenParen() { @@ -7105,7 +7336,7 @@ var ts; function nextTokenIsCommaOrFromKeyword() { nextToken(); return token === 23 || - token === 102; + token === 123; } function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) { parseExpected(84); @@ -7113,7 +7344,7 @@ var ts; var identifier; if (isIdentifier()) { identifier = parseIdentifier(); - if (token !== 23 && token !== 102) { + if (token !== 23 && token !== 123) { var importEqualsDeclaration = createNode(202, fullStart); setModifiers(importEqualsDeclaration, modifiers); importEqualsDeclaration.name = identifier; @@ -7129,7 +7360,7 @@ var ts; token === 35 || token === 14) { importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(102); + parseExpected(123); } importDeclaration.moduleSpecifier = parseModuleSpecifier(); parseSemicolon(); @@ -7147,11 +7378,13 @@ var ts; return finishNode(importClause); } function parseModuleReference() { - return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false); + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(false); } function parseExternalModuleReference() { var node = createNode(212); - parseExpected(118); + parseExpected(117); parseExpected(16); node.expression = parseModuleSpecifier(); parseExpected(17); @@ -7209,22 +7442,28 @@ var ts; var node = createNode(209, fullStart); setModifiers(node, modifiers); if (parseOptional(35)) { - parseExpected(102); + parseExpected(123); node.moduleSpecifier = parseModuleSpecifier(); } else { node.exportClause = parseNamedImportsOrExports(210); - if (parseOptional(102)) { + if (parseOptional(123)) { node.moduleSpecifier = parseModuleSpecifier(); } } parseSemicolon(); return finishNode(node); } - function parseExportAssignmentTail(fullStart, modifiers) { + function parseExportAssignment(fullStart, modifiers) { var node = createNode(208, fullStart); setModifiers(node, modifiers); - node.exportName = parseIdentifier(); + if (parseOptional(52)) { + node.isExportEquals = true; + } + else { + parseExpected(72); + } + node.expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); return finishNode(node); } @@ -7237,24 +7476,24 @@ var ts; case 69: case 82: return true; - case 105: + case 104: return isLetDeclaration(); case 68: - case 104: + case 103: case 76: - case 123: + case 122: return lookAhead(nextTokenIsIdentifierOrKeyword); case 84: return lookAhead(nextTokenCanFollowImportKeyword); - case 117: + case 116: return lookAhead(nextTokenIsIdentifierOrKeywordOrStringLiteral); case 77: return lookAhead(nextTokenCanFollowExportKeyword); - case 115: - case 109: - case 107: + case 114: case 108: - case 110: + case 106: + case 107: + case 109: return lookAhead(nextTokenIsDeclarationStart); } } @@ -7277,7 +7516,7 @@ var ts; function nextTokenCanFollowExportKeyword() { nextToken(); return token === 52 || token === 35 || - token === 14 || isDeclarationStart(); + token === 14 || token === 72 || isDeclarationStart(); } function nextTokenIsDeclarationStart() { nextToken(); @@ -7291,8 +7530,8 @@ var ts; var modifiers = parseModifiers(); if (token === 77) { nextToken(); - if (parseOptional(52)) { - return parseExportAssignmentTail(fullStart, modifiers); + if (token === 72 || token === 52) { + return parseExportAssignment(fullStart, modifiers); } if (token === 35 || token === 14) { return parseExportDeclaration(fullStart, modifiers); @@ -7300,20 +7539,20 @@ var ts; } switch (token) { case 97: - case 105: + case 104: case 69: return parseVariableStatement(fullStart, modifiers); case 82: return parseFunctionDeclaration(fullStart, modifiers); case 68: return parseClassDeclaration(fullStart, modifiers); - case 104: + case 103: return parseInterfaceDeclaration(fullStart, modifiers); - case 123: + case 122: return parseTypeAliasDeclaration(fullStart, modifiers); case 76: return parseEnumDeclaration(fullStart, modifiers); - case 117: + case 116: return parseModuleDeclaration(fullStart, modifiers); case 84: return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers); @@ -7331,7 +7570,9 @@ var ts; return parseSourceElementOrModuleElement(); } function parseSourceElementOrModuleElement() { - return isDeclarationStart() ? parseDeclaration() : parseStatement(); + return isDeclarationStart() + ? parseDeclaration() + : parseStatement(); } function processReferenceComments(sourceFile) { var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText); @@ -7389,7 +7630,13 @@ var ts; } function setExternalModuleIndicator(sourceFile) { sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) { - return node.flags & 1 || node.kind === 202 && node.moduleReference.kind === 212 || node.kind === 203 || node.kind === 208 || node.kind === 209 ? node : undefined; + return node.flags & 1 + || node.kind === 202 && node.moduleReference.kind === 212 + || node.kind === 203 + || node.kind === 208 + || node.kind === 209 + ? node + : undefined; }); } } @@ -7485,7 +7732,8 @@ var ts; var Symbol = ts.objectAllocator.getSymbolConstructor(); if (!file.locals) { file.locals = {}; - container = blockScopeContainer = file; + container = file; + setBlockScopeContainer(file, false); bind(file); file.symbolCount = symbolCount; } @@ -7493,6 +7741,12 @@ var ts; symbolCount++; return new Symbol(flags, name); } + function setBlockScopeContainer(node, cleanLocals) { + blockScopeContainer = node; + if (cleanLocals) { + blockScopeContainer.locals = undefined; + } + } function addDeclarationToSymbol(symbol, node, symbolKind) { symbol.flags |= symbolKind; if (!symbol.declarations) @@ -7529,6 +7783,13 @@ var ts; return "__new"; case 138: return "__index"; + case 209: + return "__export"; + case 208: + return "default"; + case 195: + case 196: + return node.flags & 256 ? "default" : undefined; } } function getDisplayName(node) { @@ -7536,18 +7797,20 @@ var ts; } function declareSymbol(symbols, parent, node, includes, excludes) { ts.Debug.assert(!ts.hasDynamicName(node)); - var name = getDeclarationName(node); + var name = node.flags & 256 && parent ? "default" : getDeclarationName(node); if (name !== undefined) { var symbol = ts.hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name)); if (symbol.flags & excludes) { if (node.name) { node.name.parent = node; } - var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = symbol.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 + : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name, message, getDisplayName(declaration))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name, message, getDisplayName(node))); + file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); symbol = createSymbol(0, name); } } @@ -7617,7 +7880,7 @@ var ts; lastContainer = container; } if (isBlockScopeContainer) { - blockScopeContainer = node; + setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220); } ts.forEachChild(node, bind); container = saveContainer; @@ -7685,12 +7948,6 @@ var ts; } } } - function bindExportDeclaration(node) { - if (!node.exportClause) { - (container.exportStars || (container.exportStars = [])).push(node); - } - bindChildren(node, 0, false); - } function bindFunctionOrConstructorType(node) { var symbol = createSymbol(131072, getDeclarationName(node)); addDeclarationToSymbol(symbol, node, 131072); @@ -7706,14 +7963,7 @@ var ts; bindChildren(node, symbolKind, isBlockScopeContainer); } function bindCatchVariableDeclaration(node) { - var symbol = createSymbol(1, node.name.text || "__missing"); - addDeclarationToSymbol(symbol, node, 1); - var saveParent = parent; - var savedBlockScopeContainer = blockScopeContainer; - parent = blockScopeContainer = node; - ts.forEachChild(node, bind); - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; + bindChildren(node, 0, true); } function bindBlockScopedVariableDeclaration(node) { switch (blockScopeContainer.kind) { @@ -7750,7 +8000,7 @@ var ts; if (ts.isBindingPattern(node.name)) { bindChildren(node, 0, false); } - else if (ts.getCombinedNodeFlags(node) & 6144) { + else if (ts.isBlockOrCatchScoped(node)) { bindBlockScopedVariableDeclaration(node); } else { @@ -7832,9 +8082,6 @@ var ts; case 211: bindDeclaration(node, 8388608, 8388608, false); break; - case 209: - bindExportDeclaration(node); - break; case 204: if (node.name) { bindDeclaration(node, 8388608, 8388608, false); @@ -7843,13 +8090,28 @@ var ts; bindChildren(node, 0, false); } break; + case 209: + if (!node.exportClause) { + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); + } + bindChildren(node, 0, false); + break; + case 208: + if (node.expression.kind === 64) { + declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608); + } + else { + declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455); + } + bindChildren(node, 0, false); + break; case 220: if (ts.isExternalModule(node)) { bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true); break; } case 174: - bindChildren(node, 0, !ts.isAnyFunction(node.parent)); + bindChildren(node, 0, !ts.isFunctionLike(node.parent)); break; case 216: case 181: @@ -7937,8 +8199,9 @@ var ts; isValidPropertyAccess: isValidPropertyAccess, getSignatureFromDeclaration: getSignatureFromDeclaration, isImplementationOfOverload: isImplementationOfOverload, - getAliasedSymbol: resolveImport, - getEmitResolver: getEmitResolver + getAliasedSymbol: resolveAlias, + getEmitResolver: getEmitResolver, + getExportsOfExternalModule: getExportsOfExternalModule }; var undefinedSymbol = createSymbol(4 | 67108864, "undefined"); var argumentsSymbol = createSymbol(4 | 67108864, "arguments"); @@ -7972,6 +8235,7 @@ var ts; var globalRegExpType; var globalTemplateStringsArrayType; var globalESSymbolType; + var globalIterableType; var anyArrayType; var tupleTypes = {}; var unionTypes = {}; @@ -8005,7 +8269,9 @@ var ts; return emitResolver; } function error(location, message, arg0, arg1, arg2) { - var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); + var diagnostic = location + ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) + : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); diagnostics.add(diagnostic); } function createSymbol(flags, name) { @@ -8091,7 +8357,8 @@ var ts; recordMergedSymbol(target, source); } else { - var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = target.flags & 2 || source.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(source.declarations, function (node) { error(node.name ? node.name : node, message, symbolToString(source)); }); @@ -8125,13 +8392,6 @@ var ts; } } } - function extendSymbolTable(target, source) { - for (var id in source) { - if (!ts.hasProperty(target, id)) { - target[id] = source[id]; - } - } - } function getSymbolLinks(symbol) { if (symbol.flags & 67108864) return symbol; @@ -8158,7 +8418,7 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target === unknownSymbol || target.flags & meaning) { return symbol; } @@ -8194,7 +8454,7 @@ var ts; break; case 200: if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) { - if (!(result.flags & 8388608 && getDeclarationOfImportSymbol(result).kind === 211)) { + if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) { break loop; } result = undefined; @@ -8258,13 +8518,6 @@ var ts; break loop; } break; - case 216: - var id = location.name; - if (name === id.text) { - result = location.symbol; - break loop; - } - break; } lastLocation = location; location = location.parent; @@ -8285,7 +8538,7 @@ var ts; return undefined; } if (result.flags & 2) { - var declaration = ts.forEach(result.declarations, function (d) { return ts.getCombinedNodeFlags(d) & 6144 ? d : undefined; }); + var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; }); ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); if (!isDefinedBefore(declaration, errorLocation)) { error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name)); @@ -8294,15 +8547,16 @@ var ts; } return result; } - function isImportSymbolDeclaration(node) { + function isAliasSymbolDeclaration(node) { return node.kind === 202 || node.kind === 204 && !!node.name || node.kind === 205 || node.kind === 207 || - node.kind === 211; + node.kind === 211 || + node.kind === 208; } - function getDeclarationOfImportSymbol(symbol) { - return ts.forEach(symbol.declarations, function (d) { return isImportSymbolDeclaration(d) ? d : undefined; }); + function getDeclarationOfAliasSymbol(symbol) { + return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; }); } function getTargetOfImportEqualsDeclaration(node) { if (node.moduleReference.kind === 212) { @@ -8335,7 +8589,7 @@ var ts; error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name)); return; } - return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveImport(symbol); + return symbol.flags & (107455 | 793056 | 1536) ? symbol : resolveAlias(symbol); } } } @@ -8343,7 +8597,12 @@ var ts; return getExternalModuleMember(node.parent.parent.parent, node); } function getTargetOfExportSpecifier(node) { - return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node, node.propertyName || node.name, 107455 | 793056 | 1536); + return node.parent.parent.moduleSpecifier ? + getExternalModuleMember(node.parent.parent, node) : + resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); + } + function getTargetOfExportAssignment(node) { + return resolveEntityName(node.expression, 107455 | 793056 | 1536); } function getTargetOfImportDeclaration(node) { switch (node.kind) { @@ -8357,14 +8616,16 @@ var ts; return getTargetOfImportSpecifier(node); case 211: return getTargetOfExportSpecifier(node); + case 208: + return getTargetOfExportAssignment(node); } } - function resolveImport(symbol) { - ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Imports here."); + function resolveAlias(symbol) { + ts.Debug.assert((symbol.flags & 8388608) !== 0, "Should only get Alias here."); var links = getSymbolLinks(symbol); if (!links.target) { links.target = resolvingSymbol; - var node = getDeclarationOfImportSymbol(symbol); + var node = getDeclarationOfAliasSymbol(symbol); var target = getTargetOfImportDeclaration(node); if (links.target === resolvingSymbol) { links.target = target || unknownSymbol; @@ -8378,6 +8639,29 @@ var ts; } return links.target; } + function markExportAsReferenced(node) { + var symbol = getSymbolOfNode(node); + var target = resolveAlias(symbol); + if (target && target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target)) { + markAliasSymbolAsReferenced(symbol); + } + } + function markAliasSymbolAsReferenced(symbol) { + var links = getSymbolLinks(symbol); + if (!links.referenced) { + links.referenced = true; + var node = getDeclarationOfAliasSymbol(symbol); + if (node.kind === 208) { + checkExpressionCached(node.expression); + } + else if (node.kind === 211) { + checkExpressionCached(node.propertyName || node.name); + } + else if (ts.isInternalModuleImportEqualsDeclaration(node)) { + checkExpressionCached(node.moduleReference); + } + } + } function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) { if (!importDeclaration) { importDeclaration = ts.getAncestor(entityName, 202); @@ -8387,38 +8671,40 @@ var ts; entityName = entityName.parent; } if (entityName.kind === 64 || entityName.parent.kind === 125) { - return resolveEntityName(importDeclaration, entityName, 1536); + return resolveEntityName(entityName, 1536); } else { ts.Debug.assert(entityName.parent.kind === 202); - return resolveEntityName(importDeclaration, entityName, 107455 | 793056 | 1536); + return resolveEntityName(entityName, 107455 | 793056 | 1536); } } function getFullyQualifiedName(symbol) { return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol); } - function resolveEntityName(location, name, meaning) { + function resolveEntityName(name, meaning) { if (ts.getFullWidth(name) === 0) { return undefined; } if (name.kind === 64) { - var symbol = resolveName(location, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); + var symbol = resolveName(name, name.text, meaning, ts.Diagnostics.Cannot_find_name_0, name); if (!symbol) { - return; + return undefined; } } else if (name.kind === 125) { - var namespace = resolveEntityName(location, name.left, 1536); - if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) - return; - var symbol = getSymbol(getExportsOfSymbol(namespace), name.right.text, meaning); + var namespace = resolveEntityName(name.left, 1536); + if (!namespace || namespace === unknownSymbol || ts.getFullWidth(name.right) === 0) { + return undefined; + } + var right = name.right; + var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning); if (!symbol) { - error(location, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(name.right)); - return; + error(right, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right)); + return undefined; } } ts.Debug.assert((symbol.flags & 16777216) === 0, "Should never get an instantiated symbol here."); - return symbol.flags & meaning ? symbol : resolveImport(symbol); + return symbol.flags & meaning ? symbol : resolveAlias(symbol); } function isExternalModuleNameRelative(moduleName) { return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; @@ -8458,6 +8744,9 @@ var ts; } error(moduleReferenceLiteral, ts.Diagnostics.Cannot_find_external_module_0, moduleName); } + function getExportAssignmentSymbol(moduleSymbol) { + return moduleSymbol.exports["default"]; + } function getResolvedExportAssignmentSymbol(moduleSymbol) { var symbol = getExportAssignmentSymbol(moduleSymbol); if (symbol) { @@ -8465,82 +8754,52 @@ var ts; return symbol; } if (symbol.flags & 8388608) { - return resolveImport(symbol); + return resolveAlias(symbol); } } } - function getExportAssignmentSymbol(symbol) { - checkTypeOfExportAssignmentSymbol(symbol); - return getSymbolLinks(symbol).exportAssignmentSymbol; - } - function checkTypeOfExportAssignmentSymbol(containerSymbol) { - var symbolLinks = getSymbolLinks(containerSymbol); - if (!symbolLinks.exportAssignmentChecked) { - var exportInformation = collectExportInformationForSourceFileOrModule(containerSymbol); - if (exportInformation.exportAssignments.length) { - if (exportInformation.exportAssignments.length > 1) { - ts.forEach(exportInformation.exportAssignments, function (node) { return error(node, ts.Diagnostics.A_module_cannot_have_more_than_one_export_assignment); }); - } - var node = exportInformation.exportAssignments[0]; - if (exportInformation.hasExportedMember) { - error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); - } - if (node.exportName.text) { - var meaning = 107455 | 793056 | 1536; - var exportSymbol = resolveName(node, node.exportName.text, meaning, ts.Diagnostics.Cannot_find_name_0, node.exportName); - } - symbolLinks.exportAssignmentSymbol = exportSymbol || unknownSymbol; - } - symbolLinks.exportAssignmentChecked = true; - } - } - function collectExportInformationForSourceFileOrModule(symbol) { - var seenExportedMember = false; - var result = []; - ts.forEach(symbol.declarations, function (declaration) { - var block = (declaration.kind === 220 ? declaration : declaration.body); - ts.forEach(block.statements, function (node) { - if (node.kind === 208) { - result.push(node); - } - else { - seenExportedMember = seenExportedMember || (node.flags & 1) !== 0; - } - }); - }); - return { - hasExportedMember: seenExportedMember, - exportAssignments: result - }; - } function getExportsOfSymbol(symbol) { return symbol.flags & 1536 ? getExportsOfModule(symbol) : symbol.exports; } - function getExportsOfModule(symbol) { - var links = getSymbolLinks(symbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(symbol)); + function getExportsOfModule(moduleSymbol) { + var links = getSymbolLinks(moduleSymbol); + return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); } - function getExportsForModule(symbol) { + function extendExportSymbols(target, source) { + for (var id in source) { + if (id !== "default" && !ts.hasProperty(target, id)) { + target[id] = source[id]; + } + } + } + function getExportsForModule(moduleSymbol) { + if (compilerOptions.target < 2) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + return { + "default": defaultSymbol + }; + } + } var result; var visitedSymbols = []; - visit(symbol); - return result; + visit(moduleSymbol); + return result || moduleSymbol.exports; function visit(symbol) { if (!ts.contains(visitedSymbols, symbol)) { visitedSymbols.push(symbol); - if (!result) { - result = symbol.exports; - } - else { - extendSymbolTable(result, symbol.exports); - } - ts.forEach(symbol.declarations, function (node) { - if (node.kind === 220 || node.kind === 200) { - ts.forEach(node.exportStars, function (exportStar) { - visit(resolveExternalModuleName(exportStar, exportStar.moduleSpecifier)); - }); + if (symbol !== moduleSymbol) { + if (!result) { + result = cloneSymbolTable(moduleSymbol.exports); } - }); + extendExportSymbols(result, symbol.exports); + } + var exportStars = symbol.exports["__export"]; + if (exportStars) { + ts.forEach(exportStars.declarations, function (node) { + visit(resolveExternalModuleName(node, node.moduleSpecifier)); + }); + } } } } @@ -8555,7 +8814,9 @@ var ts; return getMergedSymbol(symbol.parent); } function getExportSymbolOfValueSymbolIfExported(symbol) { - return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol; + return symbol && (symbol.flags & 1048576) !== 0 + ? getMergedSymbol(symbol.exportSymbol) + : symbol; } function symbolIsValue(symbol) { if (symbol.flags & 16777216) { @@ -8565,7 +8826,7 @@ var ts; return true; } if (symbol.flags & 8388608) { - return (resolveImport(symbol).flags & 107455) !== 0; + return (resolveAlias(symbol).flags & 107455) !== 0; } return false; } @@ -8682,8 +8943,8 @@ var ts; if (symbolFromSymbolTable.flags & 8388608) { if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) { - var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); - if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); + if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) { return [symbolFromSymbolTable]; } var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined; @@ -8708,7 +8969,7 @@ var ts; if (symbolFromSymbolTable === symbol) { return true; } - symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -8999,7 +9260,7 @@ var ts; buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, 793056, 0, flags); } else { - writeKeyword(writer, 112); + writeKeyword(writer, 111); } } else { @@ -9090,7 +9351,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 0, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 121); + writeKeyword(writer, 120); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -9103,7 +9364,7 @@ var ts; writer.writeParameter(getIndexerParameterName(resolved, 1, "x")); writePunctuation(writer, 51); writeSpace(writer); - writeKeyword(writer, 119); + writeKeyword(writer, 118); writePunctuation(writer, 19); writePunctuation(writer, 51); writeSpace(writer); @@ -9268,7 +9529,7 @@ var ts; return true; } if (symbolOfNode.flags & 8388608) { - return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); } } function isSymbolUsedInExportAssignment(symbol) { @@ -9276,7 +9537,7 @@ var ts; return true; } if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & 8388608)) { - resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); if (resolvedExportSymbol === symbol) { return true; } @@ -9410,6 +9671,9 @@ var ts; if (declaration.parent.parent.kind === 182) { return anyType; } + if (declaration.parent.parent.kind === 183) { + return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent); + } if (ts.isBindingPattern(declaration.parent)) { return getTypeForBindingElement(declaration); } @@ -9469,7 +9733,9 @@ var ts; return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes); } function getTypeFromBindingPattern(pattern) { - return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern); + return pattern.kind === 148 + ? getTypeFromObjectBindingPattern(pattern) + : getTypeFromArrayBindingPattern(pattern); } function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) { var type = getTypeForVariableLikeDeclaration(declaration); @@ -9498,9 +9764,12 @@ var ts; return links.type = getTypeOfPrototypeProperty(symbol); } var declaration = symbol.valueDeclaration; - if (declaration.kind === 216) { + if (declaration.parent.kind === 216) { return links.type = anyType; } + if (declaration.kind === 208) { + return links.type = checkExpression(declaration.expression); + } links.type = resolvingType; var type = getWidenedTypeForVariableLikeDeclaration(declaration, true); if (links.type === resolvingType) { @@ -9510,7 +9779,9 @@ var ts; else if (links.type === resolvingType) { links.type = anyType; if (compilerOptions.noImplicitAny) { - var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; + var diagnostic = symbol.valueDeclaration.type ? + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; error(symbol.valueDeclaration, diagnostic, symbolToString(symbol)); } } @@ -9590,10 +9861,10 @@ var ts; } return links.type; } - function getTypeOfImport(symbol) { + function getTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.type) { - links.type = getTypeOfSymbol(resolveImport(symbol)); + links.type = getTypeOfSymbol(resolveAlias(symbol)); } return links.type; } @@ -9621,7 +9892,7 @@ var ts; return getTypeOfAccessors(symbol); } if (symbol.flags & 8388608) { - return getTypeOfImport(symbol); + return getTypeOfAlias(symbol); } return unknownType; } @@ -9775,10 +10046,10 @@ var ts; } return links.declaredType; } - function getDeclaredTypeOfImport(symbol) { + function getDeclaredTypeOfAlias(symbol) { var links = getSymbolLinks(symbol); if (!links.declaredType) { - links.declaredType = getDeclaredTypeOfSymbol(resolveImport(symbol)); + links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)); } return links.declaredType; } @@ -9800,7 +10071,7 @@ var ts; return getDeclaredTypeOfTypeParameter(symbol); } if (symbol.flags & 8388608) { - return getDeclaredTypeOfImport(symbol); + return getDeclaredTypeOfAlias(symbol); } return unknownType; } @@ -9890,7 +10161,8 @@ var ts; var baseType = classType.baseTypes[0]; var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1); return ts.map(baseSignatures, function (baseSignature) { - var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); + var signature = baseType.flags & 4096 ? + getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); signature.typeParameters = classType.typeParameters; signature.resolvedReturnType = classType; return signature; @@ -10171,11 +10443,22 @@ var ts; }); return result; } + function getExportsOfExternalModule(node) { + if (!node.moduleSpecifier) { + return emptyArray; + } + var module = resolveExternalModuleName(node, node.moduleSpecifier); + if (!module || !module.exports) { + return emptyArray; + } + return ts.mapToArray(getExportsOfModule(module)); + } function getSignatureFromDeclaration(declaration) { var links = getNodeLinks(declaration); if (!links.resolvedSignature) { var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined; - var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; + var typeParameters = classType ? classType.typeParameters : + declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; var parameters = []; var hasStringLiterals = false; var minArgumentCount = -1; @@ -10316,7 +10599,7 @@ var ts; return symbol.members["__index"]; } function getIndexDeclarationOfSymbol(symbol, kind) { - var syntaxKind = kind === 1 ? 119 : 121; + var syntaxKind = kind === 1 ? 118 : 120; var indexSymbol = getIndexSymbol(symbol); if (indexSymbol) { var len = indexSymbol.declarations.length; @@ -10334,7 +10617,9 @@ var ts; } function getIndexTypeOfSymbol(symbol, kind) { var declaration = getIndexDeclarationOfSymbol(symbol, kind); - return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined; + return declaration + ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType + : undefined; } function getConstraintOfTypeParameter(type) { if (!type.constraint) { @@ -10419,7 +10704,7 @@ var ts; function getTypeFromTypeReferenceNode(node) { var links = getNodeLinks(node); if (!links.resolvedType) { - var symbol = resolveEntityName(node, node.typeName, 793056); + var symbol = resolveEntityName(node.typeName, 793056); if (symbol) { var type; if ((symbol.flags & 262144) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { @@ -10492,8 +10777,9 @@ var ts; function getGlobalSymbol(name, meaning, diagnostic) { return resolveName(undefined, name, meaning, diagnostic, name); } - function getGlobalType(name) { - return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), 0); + function getGlobalType(name, arity) { + if (arity === void 0) { arity = 0; } + return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity); } function getGlobalESSymbolConstructorSymbol() { return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol")); @@ -10637,15 +10923,15 @@ var ts; } function getTypeFromTypeNode(node) { switch (node.kind) { - case 112: + case 111: return anyType; - case 121: + case 120: return stringType; - case 119: + case 118: return numberType; - case 113: + case 112: return booleanType; - case 122: + case 121: return esSymbolType; case 98: return voidType; @@ -10797,7 +11083,8 @@ var ts; return mapper(type); } if (type.flags & 32768) { - return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type; + return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? + instantiateAnonymousType(type, mapper) : type; } if (type.flags & 4096) { return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType)); @@ -10826,7 +11113,7 @@ var ts; isContextSensitive(node.whenFalse); case 167: return node.operatorToken.kind === 49 && - (isContextSensitive(node.left) || isContextSensitive(node.right)); + (isContextSensitive(node.left) || isContextSensitive(node.right)); case 217: return isContextSensitive(node.initializer); case 132: @@ -11596,7 +11883,9 @@ var ts; var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type; break; case 128: - var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; + var diagnostic = declaration.dotDotDotToken ? + ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : + ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; break; case 195: case 132: @@ -11697,7 +11986,9 @@ var ts; for (var i = 0; i < typeParameters.length; i++) { if (target === typeParameters[i]) { var inferences = context.inferences[i]; - var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []); + var candidates = inferiority ? + inferences.secondary || (inferences.secondary = []) : + inferences.primary || (inferences.primary = []); if (!ts.contains(candidates, source)) candidates.push(source); break; @@ -12106,46 +12397,56 @@ var ts; return type; } } - function markLinkedImportsAsReferenced(node) { - if (node) { - var nodeLinks = getNodeLinks(node); - while (nodeLinks.importOnRightSide) { - var rightSide = nodeLinks.importOnRightSide; - nodeLinks.importOnRightSide = undefined; - getSymbolLinks(rightSide).referenced = true; - ts.Debug.assert((rightSide.flags & 8388608) !== 0); - nodeLinks = getNodeLinks(ts.getDeclarationOfKind(rightSide, 202)); - } - } - } function checkIdentifier(node) { var symbol = getResolvedSymbol(node); if (symbol === argumentsSymbol && ts.getContainingFunction(node).kind === 161) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression); } - if (symbol.flags & 8388608) { - var symbolLinks = getSymbolLinks(symbol); - if (!symbolLinks.referenced) { - var importOrExportAssignment = getLeftSideOfImportEqualsOrExportAssignment(node); - if (!importOrExportAssignment || - (importOrExportAssignment.flags & 1) || - (importOrExportAssignment.kind === 208)) { - symbolLinks.referenced = !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveImport(symbol)); - } - else { - var nodeLinks = getNodeLinks(importOrExportAssignment); - ts.Debug.assert(!nodeLinks.importOnRightSide); - nodeLinks.importOnRightSide = symbol; - } - } - if (symbolLinks.referenced) { - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) { + markAliasSymbolAsReferenced(symbol); } checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); + checkBlockScopedBindingCapturedInLoop(node, symbol); return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); } + function isInsideFunction(node, threshold) { + var current = node; + while (current && current !== threshold) { + if (ts.isFunctionLike(current)) { + return true; + } + current = current.parent; + } + return false; + } + function checkBlockScopedBindingCapturedInLoop(node, symbol) { + if (languageVersion >= 2 || + (symbol.flags & 2) === 0 || + symbol.valueDeclaration.parent.kind === 216) { + return; + } + var container = symbol.valueDeclaration; + while (container.kind !== 194) { + container = container.parent; + } + container = container.parent; + if (container.kind === 175) { + container = container.parent; + } + var inFunction = isInsideFunction(node.parent, container); + var current = container; + while (current && !ts.nodeStartsNewLexicalEnvironment(current)) { + if (isIterationStatement(current, false)) { + if (inFunction) { + grammarErrorOnFirstToken(current, ts.Diagnostics.Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher, ts.declarationNameToString(node)); + } + getNodeLinks(symbol.valueDeclaration).flags |= 256; + break; + } + current = current.parent; + } + } function captureLexicalThis(node, container) { var classNode = container.parent && container.parent.kind === 196 ? container.parent : undefined; getNodeLinks(node).flags |= 2; @@ -12231,19 +12532,19 @@ var ts; if (container.flags & 128) { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135; + container.kind === 131 || + container.kind === 134 || + container.kind === 135; } else { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135 || - container.kind === 130 || - container.kind === 129 || - container.kind === 133; + container.kind === 131 || + container.kind === 134 || + container.kind === 135 || + container.kind === 130 || + container.kind === 129 || + container.kind === 133; } } } @@ -12428,7 +12729,9 @@ var ts; var type = getContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); - return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1); + return getTypeOfPropertyOfContextualType(type, "" + index) + || getIndexTypeOfContextualType(type, 1) + || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); } return undefined; } @@ -12492,7 +12795,9 @@ var ts; } function getContextualSignature(node) { ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node)); - var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node); + var type = ts.isObjectLiteralMethod(node) + ? getContextualTypeForObjectLiteralMethod(node) + : getContextualType(node); if (!type) { return undefined; } @@ -12618,7 +12923,9 @@ var ts; } else { ts.Debug.assert(memberDecl.kind === 218); - var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper); + var type = memberDecl.name.kind === 126 + ? unknownType + : checkExpression(memberDecl.name, contextualMapper); } typeFlags |= type.flags; var prop = createSymbol(4 | 67108864 | member.flags, member.name); @@ -12734,7 +13041,9 @@ var ts; return anyType; } function isValidPropertyAccess(node, propertyName) { - var left = node.kind === 153 ? node.expression : node.left; + var left = node.kind === 153 + ? node.expression + : node.left; var type = checkExpressionOrQualifiedName(left); if (type !== unknownType && type !== anyType) { var prop = getPropertyOfType(getWidenedType(type), propertyName); @@ -13028,7 +13337,9 @@ var ts; var arg = args[i]; if (arg.kind !== 172) { var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i); - var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); + var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : + arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : + checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) { return false; } @@ -13305,9 +13616,6 @@ var ts; return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { - if (languageVersion < 2) { - grammarErrorOnFirstToken(node.template, ts.Diagnostics.Tagged_templates_are_only_available_when_targeting_ECMAScript_6_and_higher); - } return getReturnTypeOfSignature(getResolvedSignature(node)); } function checkTypeAssertion(node) { @@ -13323,9 +13631,13 @@ var ts; } function getTypeAtPosition(signature, pos) { if (pos >= 0) { - return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; + return signature.hasRestParameter ? + pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; } - return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType; + return signature.hasRestParameter ? + getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : + anyArrayType; } function assignContextualParameterTypes(signature, context, mapper) { var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0); @@ -13466,7 +13778,7 @@ var ts; } return true; } - function checkReferenceExpression(n, invalidReferenceMessage, constantVarianleMessage) { + function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) { function findSymbol(n) { var symbol = getNodeLinks(n).resolvedSymbol; return symbol && getExportSymbolOfValueSymbolIfExported(symbol); @@ -13492,14 +13804,14 @@ var ts; case 64: case 153: var symbol = findSymbol(n); - return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 4096) !== 0; + return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 8192) !== 0; case 154: var index = n.argumentExpression; var symbol = findSymbol(n.expression); if (symbol && index && index.kind === 8) { var name = index.text; var prop = getPropertyOfType(getTypeOfSymbol(symbol), name); - return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 4096) !== 0; + return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 8192) !== 0; } return false; case 159: @@ -13513,7 +13825,7 @@ var ts; return false; } if (isConstVariableReference(n)) { - error(n, constantVarianleMessage); + error(n, constantVariableMessage); return false; } return true; @@ -13627,9 +13939,10 @@ var ts; var p = properties[i]; if (p.kind === 217 || p.kind === 218) { var name = p.name; - var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || - getIndexTypeOfType(sourceType, 0); + var type = sourceType.flags & 1 ? sourceType : + getTypeOfPropertyOfType(sourceType, name.text) || + isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || + getIndexTypeOfType(sourceType, 0); if (type) { checkDestructuringAssignment(p.initializer || name, type); } @@ -13654,7 +13967,9 @@ var ts; if (e.kind !== 172) { if (e.kind !== 171) { var propName = "" + i; - var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1); + var type = sourceType.flags & 1 ? sourceType : + isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : + getIndexTypeOfType(sourceType, 1); if (type) { checkDestructuringAssignment(e, type, contextualMapper); } @@ -13802,7 +14117,9 @@ var ts; return rightType; } function checkForDisallowedESSymbolOperand(operator) { - var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined; + var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : + someConstituentTypeHasKind(rightType, 1048576) ? node.right : + undefined; if (offendingSymbolOperand) { error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator)); return false; @@ -13913,8 +14230,8 @@ var ts; } if (isConstEnumObjectType(type)) { var ok = (node.parent.kind === 153 && node.parent.expression === node) || - (node.parent.kind === 154 && node.parent.expression === node) || - ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); + (node.parent.kind === 154 && node.parent.expression === node) || + ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); if (!ok) { error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment); } @@ -14064,7 +14381,7 @@ var ts; var declaration = indexSymbol.declarations[i]; if (declaration.parameters.length === 1 && declaration.parameters[0].type) { switch (declaration.parameters[0].type.kind) { - case 121: + case 120: if (!seenStringIndexer) { seenStringIndexer = true; } @@ -14072,7 +14389,7 @@ var ts; error(declaration, ts.Diagnostics.Duplicate_string_index_signature); } break; - case 119: + case 118: if (!seenNumericIndexer) { seenNumericIndexer = true; } @@ -14139,7 +14456,7 @@ var ts; if (ts.getClassBaseTypeNode(node.parent)) { if (containsSuperCall(node.body)) { var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || - ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); + ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); if (superCallShouldBeFirst) { var statements = node.body.statements; if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) { @@ -14461,13 +14778,15 @@ var ts; case 197: return 2097152; case 200: - return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304; + return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 + ? 4194304 | 1048576 + : 4194304; case 196: case 199: return 2097152 | 1048576; case 202: var result = 0; - var target = resolveImport(getSymbolOfNode(d)); + var target = resolveAlias(getSymbolOfNode(d)); ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); }); return result; default: @@ -14488,7 +14807,7 @@ var ts; } function checkFunctionLikeDeclaration(node) { checkSignatureDeclaration(node); - if (node.name.kind === 126) { + if (node.name && node.name.kind === 126) { checkComputedPropertyName(node.name); } if (!ts.hasDynamicName(node)) { @@ -14604,24 +14923,24 @@ var ts; } } function checkVarDeclaredNamesNotShadowed(node) { - if (node.initializer && (ts.getCombinedNodeFlags(node) & 6144) === 0) { + if (node.initializer && (ts.getCombinedNodeFlags(node) & 12288) === 0) { var symbol = getSymbolOfNode(node); if (symbol.flags & 1) { var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined); if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) { - if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 6144) { + if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) { var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194); var container = varDeclList.parent.kind === 175 && - varDeclList.parent.parent; + varDeclList.parent.parent; var namesShareScope = container && - (container.kind === 174 && ts.isAnyFunction(container.parent) || - (container.kind === 201 && container.kind === 200) || - container.kind === 220); + (container.kind === 174 && ts.isFunctionLike(container.parent) || + (container.kind === 201 && container.kind === 200) || + container.kind === 220); if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); - error(ts.getErrorSpanForNode(node), ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); + error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); } } } @@ -14777,33 +15096,127 @@ var ts; checkSourceElement(node.statement); } function checkForOfStatement(node) { - checkGrammarForOfStatement(node); + if (languageVersion < 2) { + grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); + return; + } + checkGrammarForInOrForOfStatement(node); + if (node.initializer.kind === 194) { + checkForInOrForOfVariableDeclaration(node); + } + else { + var varExpr = node.initializer; + var rightType = checkExpression(node.expression); + var iteratedType = checkIteratedType(rightType, node.expression); + if (varExpr.kind === 151 || varExpr.kind === 152) { + checkDestructuringAssignment(varExpr, iteratedType || unknownType); + } + else { + var leftType = checkExpression(varExpr); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant); + if (iteratedType) { + checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined); + } + } + } + checkSourceElement(node.statement); } function checkForInStatement(node) { checkGrammarForInOrForOfStatement(node); if (node.initializer.kind === 194) { - var variableDeclarationList = node.initializer; - if (variableDeclarationList.declarations.length >= 1) { - var decl = variableDeclarationList.declarations[0]; - checkVariableDeclaration(decl); + var variable = node.initializer.declarations[0]; + if (variable && ts.isBindingPattern(variable.name)) { + error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); } + checkForInOrForOfVariableDeclaration(node); } else { var varExpr = node.initializer; - var exprType = checkExpression(varExpr); - if (!allConstituentTypesHaveKind(exprType, 1 | 258)) { + var leftType = checkExpression(varExpr); + if (varExpr.kind === 151 || varExpr.kind === 152) { + error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); + } + else if (!allConstituentTypesHaveKind(leftType, 1 | 258)) { error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any); } else { - checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant); + checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant); } } - var exprType = checkExpression(node.expression); - if (!allConstituentTypesHaveKind(exprType, 1 | 48128 | 512)) { + var rightType = checkExpression(node.expression); + if (!allConstituentTypesHaveKind(rightType, 1 | 48128 | 512)) { error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter); } checkSourceElement(node.statement); } + function checkForInOrForOfVariableDeclaration(iterationStatement) { + var variableDeclarationList = iterationStatement.initializer; + if (variableDeclarationList.declarations.length >= 1) { + var decl = variableDeclarationList.declarations[0]; + checkVariableDeclaration(decl); + } + } + function getTypeForVariableDeclarationInForOfStatement(forOfStatement) { + if (languageVersion < 2) { + return anyType; + } + var expressionType = getTypeOfExpression(forOfStatement.expression); + return checkIteratedType(expressionType, forOfStatement.expression) || anyType; + } + function checkIteratedType(iterable, expressionForError) { + ts.Debug.assert(languageVersion >= 2); + var iteratedType = getIteratedType(iterable, expressionForError); + if (expressionForError && iteratedType) { + var completeIterableType = globalIterableType !== emptyObjectType + ? createTypeReference(globalIterableType, [iteratedType]) + : emptyObjectType; + checkTypeAssignableTo(iterable, completeIterableType, expressionForError); + } + return iteratedType; + function getIteratedType(iterable, expressionForError) { + if (allConstituentTypesHaveKind(iterable, 1)) { + return undefined; + } + var iteratorFunction = getTypeOfPropertyOfType(iterable, ts.getPropertyNameForKnownSymbolName("iterator")); + if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, 1)) { + return undefined; + } + var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, 0) : emptyArray; + if (iteratorFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator); + } + return undefined; + } + var iterator = getUnionType(ts.map(iteratorFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iterator, 1)) { + return undefined; + } + var iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next"); + if (iteratorNextFunction && allConstituentTypesHaveKind(iteratorNextFunction, 1)) { + return undefined; + } + var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, 0) : emptyArray; + if (iteratorNextFunctionSignatures.length === 0) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method); + } + return undefined; + } + var iteratorNextResult = getUnionType(ts.map(iteratorNextFunctionSignatures, getReturnTypeOfSignature)); + if (allConstituentTypesHaveKind(iteratorNextResult, 1)) { + return undefined; + } + var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value"); + if (!iteratorNextValue) { + if (expressionForError) { + error(expressionForError, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property); + } + return undefined; + } + return iteratorNextValue; + } + } function checkBreakOrContinueStatement(node) { checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node); } @@ -14879,7 +15292,7 @@ var ts; if (!checkGrammarStatementInAmbientContext(node)) { var current = node.parent; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { break; } if (current.kind === 189 && current.label.text === node.label.text) { @@ -14907,16 +15320,33 @@ var ts; checkBlock(node.tryBlock); var catchClause = node.catchClause; if (catchClause) { - if (catchClause.type) { - var sourceFile = ts.getSourceFileOfNode(node); - var colonStart = ts.skipTrivia(sourceFile.text, catchClause.name.end); - grammarErrorAtPos(sourceFile, colonStart, ":".length, ts.Diagnostics.Catch_clause_parameter_cannot_have_a_type_annotation); + if (catchClause.variableDeclaration) { + if (catchClause.variableDeclaration.name.kind !== 64) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier); + } + else if (catchClause.variableDeclaration.type) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation); + } + else if (catchClause.variableDeclaration.initializer) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer); + } + else { + var identifierName = catchClause.variableDeclaration.name.text; + var locals = catchClause.block.locals; + if (locals && ts.hasProperty(locals, identifierName)) { + var localSymbol = locals[identifierName]; + if (localSymbol && (localSymbol.flags & 2) !== 0) { + grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName); + } + } + checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.variableDeclaration.name); + } } - checkGrammarEvalOrArgumentsInStrictMode(node, catchClause.name); checkBlock(catchClause.block); } - if (node.finallyBlock) + if (node.finallyBlock) { checkBlock(node.finallyBlock); + } } function checkIndexConstraints(type) { var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1); @@ -14971,7 +15401,9 @@ var ts; errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0]; } if (errorNode && !isTypeAssignableTo(propertyType, indexType)) { - var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; + var errorMessage = indexKind === 0 + ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 + : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType)); } } @@ -15004,10 +15436,12 @@ var ts; } function checkClassDeclaration(node) { checkGrammarClassDeclarationHeritageClauses(node); - checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + if (node.name) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + } checkTypeParameters(node.typeParameters); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); var type = getDeclaredTypeOfSymbol(symbol); @@ -15020,10 +15454,10 @@ var ts; if (type.baseTypes.length) { if (produceDiagnostics) { var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); + checkTypeAssignableTo(type, baseType, node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1); var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, baseTypeNode.typeName, 107455)) { + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); + if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, 107455)) { error(baseTypeNode, ts.Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); } checkKindsOfPropertyMemberOverrides(type, baseType); @@ -15039,7 +15473,7 @@ var ts; if (t !== unknownType) { var declaredType = (t.flags & 4096) ? t.target : t; if (declaredType.flags & (1024 | 2048)) { - checkTypeAssignableTo(type, t, node.name, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); + checkTypeAssignableTo(type, t, node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1); } else { error(typeRefNode, ts.Diagnostics.A_class_may_only_implement_another_class_or_interface); @@ -15387,21 +15821,15 @@ var ts; if (!ts.isInAmbientContext(node) && node.name.kind === 8) { grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names); } - else if (node.name.kind === 64 && node.body.kind === 201) { - var statements = node.body.statements; - for (var i = 0, n = statements.length; i < n; i++) { - var statement = statements[i]; - if (statement.kind === 208) { - grammarErrorOnNode(statement, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); - } - } - } } checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); - if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { + if (symbol.flags & 512 + && symbol.declarations.length > 1 + && !ts.isInAmbientContext(node) + && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); if (classOrFunc) { if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) { @@ -15437,7 +15865,9 @@ var ts; } var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8; if (node.parent.kind !== 220 && !inAmbientExternalModule) { - error(moduleName, node.kind === 209 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); + error(moduleName, node.kind === 209 ? + ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : + ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); return false; } if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) { @@ -15446,15 +15876,17 @@ var ts; } return true; } - function checkImportSymbol(node) { + function checkAliasSymbol(node) { var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); + var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | - (symbol.flags & 793056 ? 793056 : 0) | - (symbol.flags & 1536 ? 1536 : 0); + (symbol.flags & 793056 ? 793056 : 0) | + (symbol.flags & 1536 ? 1536 : 0); if (target.flags & excludedMeanings) { - var message = node.kind === 211 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; + var message = node.kind === 211 ? + ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : + ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; error(node, message, symbolToString(symbol)); } } @@ -15462,10 +15894,10 @@ var ts; function checkImportBinding(node) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); - checkImportSymbol(node); + checkAliasSymbol(node); } function checkImportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers); } if (checkExternalImportOrExportDeclaration(node)) { @@ -15487,50 +15919,107 @@ var ts; } function checkImportEqualsDeclaration(node) { checkGrammarModifiers(node); - if (ts.isInternalModuleImportEqualsDeclaration(node)) { + if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - var symbol = getSymbolOfNode(node); - var target = resolveImport(symbol); - if (target !== unknownSymbol) { - if (target.flags & 107455) { - var moduleName = getFirstIdentifier(node.moduleReference); - if (resolveEntityName(node, moduleName, 107455 | 1536).flags & 1536) { - checkExpressionOrQualifiedName(node.moduleReference); - } - else { - error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); - } - } - if (target.flags & 793056) { - checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); - } + if (node.flags & 1) { + markExportAsReferenced(node); } - } - else { - if (checkExternalImportOrExportDeclaration(node)) { - checkImportBinding(node); + if (ts.isInternalModuleImportEqualsDeclaration(node)) { + var target = resolveAlias(getSymbolOfNode(node)); + if (target !== unknownSymbol) { + if (target.flags & 107455) { + var moduleName = getFirstIdentifier(node.moduleReference); + if (!(resolveEntityName(moduleName, 107455 | 1536).flags & 1536)) { + error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName)); + } + } + if (target.flags & 793056) { + checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0); + } + } } } } function checkExportDeclaration(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers); } if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { if (node.exportClause) { - ts.forEach(node.exportClause.elements, checkImportSymbol); + ts.forEach(node.exportClause.elements, checkExportSpecifier); } } } + function checkExportSpecifier(node) { + checkAliasSymbol(node); + if (!node.parent.parent.moduleSpecifier) { + markExportAsReferenced(node); + } + } function checkExportAssignment(node) { - if (!checkGrammarModifiers(node) && (node.flags & 243)) { + var container = node.parent.kind === 220 ? node.parent : node.parent.parent; + if (container.kind === 200 && container.name.kind === 64) { + error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module); + return; + } + if (!checkGrammarModifiers(node) && (node.flags & 499)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers); } - var container = node.parent; - if (container.kind !== 220) { - container = container.parent; + if (node.expression.kind === 64) { + markExportAsReferenced(node); + } + else { + checkExpressionCached(node.expression); + } + checkExternalModuleExports(container); + } + function getModuleStatements(node) { + if (node.kind === 220) { + return node.statements; + } + if (node.kind === 200 && node.body.kind === 201) { + return node.body.statements; + } + return emptyArray; + } + function hasExportedMembers(moduleSymbol) { + var declarations = moduleSymbol.declarations; + for (var i = 0; i < declarations.length; i++) { + var statements = getModuleStatements(declarations[i]); + for (var j = 0; j < statements.length; j++) { + var node = statements[j]; + if (node.kind === 209) { + var exportClause = node.exportClause; + if (!exportClause) { + return true; + } + var specifiers = exportClause.elements; + for (var k = 0; k < specifiers.length; k++) { + var specifier = specifiers[k]; + if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) { + return true; + } + } + } + else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) { + return true; + } + } + } + } + function checkExternalModuleExports(node) { + var moduleSymbol = getSymbolOfNode(node); + var links = getSymbolLinks(moduleSymbol); + if (!links.exportsChecked) { + var defaultSymbol = getExportAssignmentSymbol(moduleSymbol); + if (defaultSymbol) { + if (hasExportedMembers(moduleSymbol)) { + var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration; + error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements); + } + } + links.exportsChecked = true; } - checkTypeOfExportAssignmentSymbol(getSymbolOfNode(container)); } function checkSourceElement(node) { if (!node) @@ -15712,6 +16201,7 @@ var ts; case 196: case 199: case 219: + case 208: case 220: ts.forEachChild(node, checkFunctionExpressionBodies); break; @@ -15731,11 +16221,7 @@ var ts; ts.forEach(node.statements, checkSourceElement); checkFunctionExpressionBodies(node); if (ts.isExternalModule(node)) { - var symbol = getExportAssignmentSymbol(node.symbol); - if (symbol && symbol.flags & 8388608) { - getSymbolLinks(symbol).referenced = true; - markLinkedImportsAsReferenced(ts.getDeclarationOfKind(symbol, 202)); - } + checkExternalModuleExports(node); } if (potentialThisCollisions.length) { ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope); @@ -15824,11 +16310,6 @@ var ts; copySymbol(location.symbol, meaning); } break; - case 216: - if (location.name.text) { - copySymbol(location.symbol, meaning); - } - break; } memberFlags = location.flags; location = location.parent; @@ -15862,11 +16343,11 @@ var ts; return true; } switch (node.kind) { + case 111: + case 118: + case 120: case 112: - case 119: case 121: - case 113: - case 122: return true; case 98: return node.parent.kind !== 164; @@ -15925,7 +16406,7 @@ var ts; return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent; } if (nodeOnRightSide.parent.kind === 208) { - return nodeOnRightSide.parent.exportName === nodeOnRightSide && nodeOnRightSide.parent; + return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent; } return undefined; } @@ -15937,11 +16418,11 @@ var ts; (node.parent.kind === 153 && node.parent.name === node); } function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) { - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(entityName)) { + if (ts.isDeclarationName(entityName)) { return getSymbolOfNode(entityName.parent); } if (entityName.parent.kind === 208) { - return resolveEntityName(entityName.parent.parent, entityName, 107455 | 793056 | 1536 | 8388608); + return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608); } if (entityName.kind !== 153) { if (isInRightSideOfImportOrExportAssignment(entityName)) { @@ -15957,7 +16438,7 @@ var ts; } if (entityName.kind === 64) { var meaning = 107455 | 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } else if (entityName.kind === 153) { var symbol = getNodeLinks(entityName).resolvedSymbol; @@ -15977,7 +16458,7 @@ var ts; else if (isTypeReferenceIdentifier(entityName)) { var meaning = entityName.parent.kind === 139 ? 793056 : 1536; meaning |= 8388608; - return resolveEntityName(entityName, entityName, meaning); + return resolveEntityName(entityName, meaning); } return undefined; } @@ -15985,11 +16466,13 @@ var ts; if (isInsideWithStatementBody(node)) { return undefined; } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { return getSymbolOfNode(node.parent); } if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) { - return node.parent.kind === 208 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node); + return node.parent.kind === 208 + ? getSymbolOfEntityNameOrPropertyAccessExpression(node) + : getSymbolOfPartOfRightHandSideOfImportEquals(node); } switch (node.kind) { case 64: @@ -16000,18 +16483,19 @@ var ts; case 90: var type = checkExpression(node); return type.symbol; - case 114: + case 113: var constructorDeclaration = node.parent; if (constructorDeclaration && constructorDeclaration.kind === 133) { return constructorDeclaration.parent.symbol; } return undefined; case 8: - if (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && - ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) { - var importSymbol = getSymbolOfNode(node.parent.parent); - var moduleType = getTypeOfSymbol(importSymbol); - return moduleType ? moduleType.symbol : undefined; + var moduleName; + if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && + ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || + ((node.parent.kind === 203 || node.parent.kind === 209) && + node.parent.moduleSpecifier === node)) { + return resolveExternalModuleName(node, node); } case 7: if (node.parent.kind == 154 && node.parent.argumentExpression === node) { @@ -16029,7 +16513,7 @@ var ts; } function getShorthandAssignmentValueSymbol(location) { if (location && location.kind === 218) { - return resolveEntityName(location, location.name, 107455); + return resolveEntityName(location.name, 107455); } return undefined; } @@ -16055,7 +16539,7 @@ var ts; var symbol = getSymbolOfNode(node); return getTypeOfSymbol(symbol); } - if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (ts.isDeclarationName(node)) { var symbol = getSymbolInfo(node); return symbol && getTypeOfSymbol(symbol); } @@ -16132,6 +16616,10 @@ var ts; return generatedNames; function generateNames(node) { switch (node.kind) { + case 195: + case 196: + generateNameForFunctionOrClassDeclaration(node); + break; case 200: generateNameForModuleOrEnum(node); generateNames(node.body); @@ -16145,6 +16633,9 @@ var ts; case 209: generateNameForExportDeclaration(node); break; + case 208: + generateNameForExportAssignment(node); + break; case 220: case 201: ts.forEach(node.statements, generateNames); @@ -16155,27 +16646,17 @@ var ts; return ts.hasProperty(globals, name) || ts.hasProperty(sourceFile.identifiers, name) || ts.hasProperty(generatedNames, name); } function makeUniqueName(baseName) { - if (baseName.charCodeAt(0) !== 95) { - var baseName = "_" + baseName; - if (!isExistingName(baseName)) { - return generatedNames[baseName] = baseName; - } - } - if (baseName.charCodeAt(baseName.length - 1) !== 95) { - baseName += "_"; - } - var i = 1; - while (true) { - name = baseName + i; - if (!isExistingName(name)) { - return generatedNames[name] = name; - } - i++; - } + var name = ts.generateUniqueName(baseName, isExistingName); + return generatedNames[name] = name; } function assignGeneratedName(node, name) { getNodeLinks(node).generatedName = ts.unescapeIdentifier(name); } + function generateNameForFunctionOrClassDeclaration(node) { + if (!node.name) { + assignGeneratedName(node, makeUniqueName("default")); + } + } function generateNameForModuleOrEnum(node) { if (node.name.kind === 64) { var name = node.name.text; @@ -16184,7 +16665,8 @@ var ts; } function generateNameForImportOrExportDeclaration(node) { var expr = ts.getExternalModuleName(node); - var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; + var baseName = expr.kind === 8 ? + ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; assignGeneratedName(node, makeUniqueName(baseName)); } function generateNameForImportDeclaration(node) { @@ -16197,6 +16679,11 @@ var ts; generateNameForImportOrExportDeclaration(node); } } + function generateNameForExportAssignment(node) { + if (node.expression.kind !== 64) { + assignGeneratedName(node, makeUniqueName("default")); + } + } } function getGeneratedNameForNode(node) { var links = getNodeLinks(node); @@ -16211,8 +16698,8 @@ var ts; function getLocalNameForImportDeclaration(node) { return getGeneratedNameForNode(node); } - function getImportNameSubstitution(symbol) { - var declaration = getDeclarationOfImportSymbol(symbol); + function getAliasNameSubstitution(symbol) { + var declaration = getDeclarationOfAliasSymbol(symbol); if (declaration && declaration.kind === 207) { var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent); var propertyName = declaration.propertyName || declaration.name; @@ -16243,38 +16730,35 @@ var ts; return getExportNameSubstitution(exportSymbol, node.parent); } if (symbol.flags & 8388608) { - return getImportNameSubstitution(symbol); + return getAliasNameSubstitution(symbol); } } } - function getExportAssignmentName(node) { - var symbol = getExportAssignmentSymbol(getSymbolOfNode(node)); - return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol) ? symbolToString(symbol) : undefined; + function hasExportDefaultValue(node) { + var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node)); + return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol); } function isTopLevelValueImportEqualsWithEntityName(node) { if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) { return false; } - return isImportResolvedToValue(getSymbolOfNode(node)); + return isAliasResolvedToValue(getSymbolOfNode(node)); } - function isImportResolvedToValue(symbol) { - var target = resolveImport(symbol); + function isAliasResolvedToValue(symbol) { + var target = resolveAlias(symbol); return target !== unknownSymbol && target.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(target); } function isConstEnumOrConstEnumOnlyModule(s) { return isConstEnumSymbol(s) || s.constEnumOnlyModule; } - function isReferencedImportDeclaration(node) { - if (isImportSymbolDeclaration(node)) { + function isReferencedAliasDeclaration(node) { + if (isAliasSymbolDeclaration(node)) { var symbol = getSymbolOfNode(node); if (getSymbolLinks(symbol).referenced) { return true; } - if (node.kind === 202 && node.flags & 1 && isImportResolvedToValue(symbol)) { - return true; - } } - return ts.forEachChild(node, isReferencedImportDeclaration); + return ts.forEachChild(node, isReferencedAliasDeclaration); } function isImplementationOfOverload(node) { if (ts.nodeIsPresent(node.body)) { @@ -16308,7 +16792,9 @@ var ts; } function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) { var symbol = getSymbolOfNode(declaration); - var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType; + var type = symbol && !(symbol.flags & (2048 | 131072)) + ? getTypeOfSymbol(symbol) + : unknownType; getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) { @@ -16319,12 +16805,38 @@ var ts; return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name); } + function getBlockScopedVariableId(n) { + ts.Debug.assert(!ts.nodeIsSynthesized(n)); + if (n.parent.kind === 153 && + n.parent.name === n) { + return undefined; + } + if (n.parent.kind === 150 && + n.parent.propertyName === n) { + return undefined; + } + var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || + n.parent.kind === 150 + ? getSymbolOfNode(n.parent) + : undefined; + var symbol = declarationSymbol || + getNodeLinks(n).resolvedSymbol || + resolveName(n, n.text, 2 | 8388608, undefined, undefined); + var isLetOrConst = symbol && + (symbol.flags & 2) && + symbol.valueDeclaration.parent.kind !== 216; + if (isLetOrConst) { + getSymbolLinks(symbol); + return symbol.id; + } + return undefined; + } function createResolver() { return { getGeneratedNameForNode: getGeneratedNameForNode, getExpressionNameSubstitution: getExpressionNameSubstitution, - getExportAssignmentName: getExportAssignmentName, - isReferencedImportDeclaration: isReferencedImportDeclaration, + hasExportDefaultValue: hasExportDefaultValue, + isReferencedAliasDeclaration: isReferencedAliasDeclaration, getNodeCheckFlags: getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible: isDeclarationVisible, @@ -16334,7 +16846,8 @@ var ts; isSymbolAccessible: isSymbolAccessible, isEntityNameVisible: isEntityNameVisible, getConstantValue: getConstantValue, - isUnknownIdentifier: isUnknownIdentifier + isUnknownIdentifier: isUnknownIdentifier, + getBlockScopedVariableId: getBlockScopedVariableId }; } function initializeTypeChecker() { @@ -16362,6 +16875,7 @@ var ts; globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray"); globalESSymbolType = getGlobalType("Symbol"); globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"); + globalIterableType = getGlobalType("Iterable", 1); } else { globalTemplateStringsArrayType = unknownType; @@ -16404,14 +16918,14 @@ var ts; for (var i = 0, n = node.modifiers.length; i < n; i++) { var modifier = node.modifiers[i]; switch (modifier.kind) { - case 109: case 108: case 107: + case 106: var text; - if (modifier.kind === 109) { + if (modifier.kind === 108) { text = "public"; } - else if (modifier.kind === 108) { + else if (modifier.kind === 107) { text = "protected"; lastProtected = modifier; } @@ -16430,7 +16944,7 @@ var ts; } flags |= ts.modifierToFlag(modifier.kind); break; - case 110: + case 109: if (flags & 128) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static"); } @@ -16458,7 +16972,7 @@ var ts; } flags |= 1; break; - case 115: + case 114: if (flags & 2) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare"); } @@ -16564,7 +17078,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter); } - if (parameter.flags & 243) { + if (parameter.flags & 499) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier); } if (parameter.questionToken) { @@ -16576,7 +17090,7 @@ var ts; if (!parameter.type) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation); } - if (parameter.type.kind !== 121 && parameter.type.kind !== 119) { + if (parameter.type.kind !== 120 && parameter.type.kind !== 118) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number); } if (!node.type) { @@ -16584,7 +17098,7 @@ var ts; } } function checkGrammarForIndexSignatureModifier(node) { - if (node.flags & 243) { + if (node.flags & 499) { grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members); } } @@ -16649,7 +17163,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); if (seenImplementsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen); } @@ -16672,7 +17186,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 103); + ts.Debug.assert(heritageClause.token === 102); return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause); } checkGrammarHeritageClause(heritageClause); @@ -16769,29 +17283,28 @@ var ts; var variableList = forInOrOfStatement.initializer; if (!checkGrammarVariableDeclarationList(variableList)) { if (variableList.declarations.length > 1) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement + : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic); } var firstDeclaration = variableList.declarations[0]; if (firstDeclaration.initializer) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer + : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; return grammarErrorOnNode(firstDeclaration.name, diagnostic); } if (firstDeclaration.type) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation + : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; return grammarErrorOnNode(firstDeclaration, diagnostic); } } } return false; } - function checkGrammarForOfStatement(forOfStatement) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_not_currently_supported); - if (languageVersion < 2) { - return grammarErrorOnFirstToken(forOfStatement, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher); - } - return checkGrammarForInOrForOfStatement(forOfStatement); - } function checkGrammarAccessor(accessor) { var kind = accessor.kind; if (languageVersion < 1) { @@ -16821,7 +17334,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter); } - else if (parameter.flags & 243) { + else if (parameter.flags & 499) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } else if (parameter.questionToken) { @@ -16886,13 +17399,14 @@ var ts; function checkGrammarBreakOrContinueStatement(node) { var current = node; while (current) { - if (ts.isAnyFunction(current)) { + if (ts.isFunctionLike(current)) { return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary); } switch (current.kind) { case 189: if (node.label && current.label.text === node.label.text) { - var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true); + var isMisplacedContinueLabel = node.kind === 184 + && !isIterationStatement(current.statement, true); if (isMisplacedContinueLabel) { return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement); } @@ -16913,11 +17427,15 @@ var ts; current = current.parent; } if (node.label) { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement + : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } else { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement + : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } } @@ -16934,16 +17452,17 @@ var ts; return checkGrammarEvalOrArgumentsInStrictMode(node, node.name); } function checkGrammarVariableDeclaration(node) { - if (ts.isInAmbientContext(node)) { - if (ts.isBindingPattern(node.name)) { - return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + if (node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) { + if (ts.isInAmbientContext(node)) { + if (ts.isBindingPattern(node.name)) { + return grammarErrorOnNode(node, ts.Diagnostics.Destructuring_declarations_are_not_allowed_in_ambient_contexts); + } + if (node.initializer) { + var equalsTokenLength = "=".length; + return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength, equalsTokenLength, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); + } } - if (node.initializer) { - return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts); - } - } - else { - if (!node.initializer) { + else if (!node.initializer) { if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) { return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer); } @@ -16977,14 +17496,6 @@ var ts; if (!declarationList.declarations.length) { return grammarErrorAtPos(ts.getSourceFileOfNode(declarationList), declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty); } - if (languageVersion < 2) { - if (ts.isLet(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - else if (ts.isConst(declarationList)) { - return grammarErrorOnFirstToken(declarationList, ts.Diagnostics.const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher); - } - } } function allowLetAndConstDeclarations(parent) { switch (parent.kind) { @@ -17024,7 +17535,7 @@ var ts; return false; } function checkGrammarEnumDeclaration(enumDecl) { - var enumIsConst = (enumDecl.flags & 4096) !== 0; + var enumIsConst = (enumDecl.flags & 8192) !== 0; var hasError = false; if (!enumIsConst) { var inConstantEnumMemberSection = true; @@ -17052,18 +17563,11 @@ var ts; function hasParseDiagnostics(sourceFile) { return sourceFile.parseDiagnostics.length > 0; } - function scanToken(scanner, pos) { - scanner.setTextPos(pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return start; - } function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - var start = scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, scanner.getTextPos() - start, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2)); return true; } } @@ -17076,16 +17580,17 @@ var ts; function grammarErrorOnNode(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var span = ts.getErrorSpanForNode(node); - var start = span.end > span.pos ? ts.skipTrivia(sourceFile.text, span.pos) : span.pos; - diagnostics.add(ts.createFileDiagnostic(sourceFile, start, span.end - start, message, arg0, arg1, arg2)); + diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2)); return true; } } - function checkGrammarEvalOrArgumentsInStrictMode(contextNode, identifier) { - if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { - var name = ts.declarationNameToString(identifier); - return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, name); + function checkGrammarEvalOrArgumentsInStrictMode(contextNode, name) { + if (name && name.kind === 64) { + var identifier = name; + if (contextNode && (contextNode.parserContextFlags & 1) && ts.isEvalOrArgumentsIdentifier(identifier)) { + var nameText = ts.declarationNameToString(identifier); + return grammarErrorOnNode(identifier, ts.Diagnostics.Invalid_use_of_0_in_strict_mode, nameText); + } } } function checkGrammarConstructorTypeParameters(node) { @@ -17149,7 +17654,7 @@ var ts; return getNodeLinks(node).hasReportedStatementInAmbientContext = true; } var links = getNodeLinks(node); - if (!links.hasReportedStatementInAmbientContext && ts.isAnyFunction(node.parent)) { + if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) { return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts); } if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) { @@ -17163,7 +17668,7 @@ var ts; } } function checkGrammarNumbericLiteral(node) { - if (node.flags & 8192) { + if (node.flags & 16384) { if (node.parserContextFlags & 1) { return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode); } @@ -17175,9 +17680,8 @@ var ts; function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { - var scanner = ts.createScanner(languageVersion, true, sourceFile.text); - scanToken(scanner, node.pos); - diagnostics.add(ts.createFileDiagnostic(sourceFile, scanner.getTextPos(), 0, message, arg0, arg1, arg2)); + var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); + diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), 0, message, arg0, arg1, arg2)); return true; } } @@ -17306,7 +17810,9 @@ var ts; var lineCount = ts.getLineStarts(currentSourceFile).length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { - var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); + var nextLineStart = (currentLine + 1) === lineCount + ? currentSourceFile.text.length + 1 + : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); if (pos !== comment.pos) { if (firstCommentLineIndent === undefined) { firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); @@ -17384,7 +17890,8 @@ var ts; } else { ts.forEach(declarations, function (member) { - if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) { + if ((member.kind === 134 || member.kind === 135) + && (member.flags & 128) === (accessor.flags & 128)) { var memberName = ts.getPropertyNameForPropertyNameNode(member.name); var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name); if (memberName === accessorName) { @@ -17449,7 +17956,7 @@ var ts; var addedGlobalFileReference = false; ts.forEach(root.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, root, fileReference); - if (referencedFile && ((referencedFile.flags & 1024) || + if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) { writeReferencePath(referencedFile); @@ -17608,11 +18115,11 @@ var ts; } function emitType(type) { switch (type.kind) { + case 111: + case 120: + case 118: case 112: case 121: - case 119: - case 113: - case 122: case 98: case 8: return writeTextOfNode(currentSourceFile, type); @@ -17702,8 +18209,8 @@ var ts; emitLines(node.statements); } function emitExportAssignment(node) { - write("export = "); - writeTextOfNode(currentSourceFile, node.exportName); + write(node.isExportEquals ? "export = " : "export default "); + writeTextOfNode(currentSourceFile, node.expression); write(";"); writeLine(); } @@ -17919,7 +18426,9 @@ var ts; function getHeritageClauseVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.parent.parent.kind === 196) { - diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; + diagnosticMessage = isImplementsList ? + ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : + ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; } else { diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; @@ -18012,17 +18521,31 @@ var ts; function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.kind === 193) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; } else if (node.kind === 130 || node.kind === 129) { if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; } } return diagnosticMessage !== undefined ? { @@ -18084,17 +18607,25 @@ var ts; } function getTypeAnnotationFromAccessor(accessor) { if (accessor) { - return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined; + return accessor.kind === 134 + ? accessor.type + : accessor.parameters.length > 0 + ? accessor.parameters[0].type + : undefined; } } function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (accessorWithTypeAnnotation.kind === 135) { if (accessorWithTypeAnnotation.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; } return { diagnosticMessage: diagnosticMessage, @@ -18104,10 +18635,18 @@ var ts; } else { if (accessorWithTypeAnnotation.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; } return { diagnosticMessage: diagnosticMessage, @@ -18189,28 +18728,48 @@ var ts; var diagnosticMessage; switch (node.kind) { case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 138: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 132: case 131: if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; break; default: ts.Debug.fail("This is unknown kind for signature: " + node.kind); @@ -18249,28 +18808,50 @@ var ts; var diagnosticMessage; switch (node.parent.kind) { case 133: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; break; case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 132: case 131: if (node.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } else if (node.parent.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; break; default: ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind); @@ -18322,7 +18903,11 @@ var ts; } } function writeReferencePath(referencedFile) { - var declFileName = referencedFile.flags & 1024 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var declFileName = referencedFile.flags & 2048 + ? referencedFile.fileName + : shouldEmitToOwnFile(referencedFile, compilerOptions) + ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") + : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false); referencePathsOutput += "/// " + newLine; } @@ -18374,12 +18959,16 @@ var ts; var increaseIndent = writer.increaseIndent; var decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var lastFrame; + var currentScopeNames; + var generatedBlockScopeNames; var extendsEmitted = false; var tempCount = 0; var tempVariables; var tempParameters; var externalImports; var exportSpecifiers; + var exportDefault; var writeEmittedFiles = writeJavaScriptFile; var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments; var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments; @@ -18411,6 +19000,53 @@ var ts; writeLine(); writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); return; + function enterNameScope() { + var names = currentScopeNames; + currentScopeNames = undefined; + if (names) { + lastFrame = { names: names, previous: lastFrame }; + return true; + } + return false; + } + function exitNameScope(popFrame) { + if (popFrame) { + currentScopeNames = lastFrame.names; + lastFrame = lastFrame.previous; + } + else { + currentScopeNames = undefined; + } + } + function generateUniqueNameForLocation(location, baseName) { + var name; + if (!isExistingName(location, baseName)) { + name = baseName; + } + else { + name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); }); + } + if (!currentScopeNames) { + currentScopeNames = {}; + } + return currentScopeNames[name] = name; + } + function isExistingName(location, name) { + if (!resolver.isUnknownIdentifier(location, name)) { + return true; + } + if (currentScopeNames && ts.hasProperty(currentScopeNames, name)) { + return true; + } + var frame = lastFrame; + while (frame) { + if (ts.hasProperty(frame.names, name)) { + return true; + } + frame = frame.previous; + } + return false; + } function initializeEmitterWithSourceMaps() { var sourceMapDir; var sourceMapSourceIndex = -1; @@ -18564,7 +19200,9 @@ var ts; node.kind === 199) { if (node.name) { var name = node.name; - scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text; + scopeName = name.kind === 126 + ? ts.getTextOfNode(name) + : node.name.text; } recordScopeNameStart(scopeName); } @@ -18670,13 +19308,13 @@ var ts; function createTempVariable(location, forLoopVariable) { var name = forLoopVariable ? "_i" : undefined; while (true) { - if (name && resolver.isUnknownIdentifier(location, name)) { + if (name && !isExistingName(location, name)) { break; } name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25); tempCount++; } - var result = ts.createNode(64); + var result = ts.createSynthesizedNode(64); result.text = name; return result; } @@ -18720,7 +19358,7 @@ var ts; emit(node); } } - function emitParenthesized(node, parenthesized) { + function emitParenthesizedIf(node, parenthesized) { if (parenthesized) { write("("); } @@ -18807,37 +19445,109 @@ var ts; emit(nodes[i]); } } - function isBinaryOrOctalIntegerLiteral(text) { - if (text.length <= 0) { - return false; - } - if (text.charCodeAt(1) === 66 || text.charCodeAt(1) === 98 || - text.charCodeAt(1) === 79 || text.charCodeAt(1) === 111) { - return true; + function isBinaryOrOctalIntegerLiteral(node, text) { + if (node.kind === 7 && text.length > 1) { + switch (text.charCodeAt(1)) { + case 98: + case 66: + case 111: + case 79: + return true; + } } return false; } function emitLiteral(node) { - var text = languageVersion < 2 && ts.isTemplateLiteralKind(node.kind) ? getTemplateLiteralAsStringLiteral(node) : node.parent ? ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node) : node.text; + var text = getLiteralText(node); if (compilerOptions.sourceMap && (node.kind === 8 || ts.isTemplateLiteralKind(node.kind))) { writer.writeLiteral(text); } - else if (languageVersion < 2 && node.kind === 7 && isBinaryOrOctalIntegerLiteral(text)) { + else if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) { write(node.text); } else { write(text); } } - function getTemplateLiteralAsStringLiteral(node) { - return '"' + ts.escapeString(node.text) + '"'; + function getLiteralText(node) { + if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) { + return getQuotedEscapedLiteralText('"', node.text, '"'); + } + if (node.parent) { + return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + } + switch (node.kind) { + case 8: + return getQuotedEscapedLiteralText('"', node.text, '"'); + case 10: + return getQuotedEscapedLiteralText('`', node.text, '`'); + case 11: + return getQuotedEscapedLiteralText('`', node.text, '${'); + case 12: + return getQuotedEscapedLiteralText('}', node.text, '${'); + case 13: + return getQuotedEscapedLiteralText('}', node.text, '`'); + case 7: + return node.text; + } + ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for."); + } + function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) { + return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; + } + function emitDownlevelRawTemplateLiteral(node) { + var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var isLast = node.kind === 10 || node.kind === 13; + text = text.substring(1, text.length - (isLast ? 1 : 2)); + text = text.replace(/\r\n?/g, "\n"); + text = ts.escapeString(text); + write('"' + text + '"'); + } + function emitDownlevelTaggedTemplateArray(node, literalEmitter) { + write("["); + if (node.template.kind === 10) { + literalEmitter(node.template); + } + else { + literalEmitter(node.template.head); + ts.forEach(node.template.templateSpans, function (child) { + write(", "); + literalEmitter(child.literal); + }); + } + write("]"); + } + function emitDownlevelTaggedTemplate(node) { + var tempVariable = createAndRecordTempVariable(node); + write("("); + emit(tempVariable); + write(" = "); + emitDownlevelTaggedTemplateArray(node, emit); + write(", "); + emit(tempVariable); + write(".raw = "); + emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral); + write(", "); + emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag)); + write("("); + emit(tempVariable); + if (node.template.kind === 169) { + ts.forEach(node.template.templateSpans, function (templateSpan) { + write(", "); + var needsParens = templateSpan.expression.kind === 167 + && templateSpan.expression.operatorToken.kind === 23; + emitParenthesizedIf(templateSpan.expression, needsParens); + }); + } + write("))"); } function emitTemplateExpression(node) { if (languageVersion >= 2) { ts.forEachChild(node, emit); return; } - var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent); + var emitOuterParens = ts.isExpression(node.parent) + && templateNeedsParens(node, node.parent); if (emitOuterParens) { write("("); } @@ -18848,11 +19558,12 @@ var ts; } for (var i = 0; i < node.templateSpans.length; i++) { var templateSpan = node.templateSpans[i]; - var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; + var needsParens = templateSpan.expression.kind !== 159 + && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; if (i > 0 || headEmitted) { write(" + "); } - emitParenthesized(templateSpan.expression, needsParens); + emitParenthesizedIf(templateSpan.expression, needsParens); if (templateSpan.literal.text.length !== 0) { write(" + "); emitLiteral(templateSpan.literal); @@ -18950,8 +19661,6 @@ var ts; return false; case 189: return node.parent.label === node; - case 216: - return node.parent.name === node; } } function emitExpressionIdentifier(node) { @@ -18963,7 +19672,18 @@ var ts; writeTextOfNode(currentSourceFile, node); } } + function getBlockScopedVariableId(node) { + return !ts.nodeIsSynthesized(node) && resolver.getBlockScopedVariableId(node); + } function emitIdentifier(node) { + var variableId = getBlockScopedVariableId(node); + if (variableId !== undefined && generatedBlockScopeNames) { + var text = generatedBlockScopeNames[variableId]; + if (text) { + write(text); + return; + } + } if (!node.parent) { write(node.text); } @@ -19026,7 +19746,7 @@ var ts; write("..."); emit(node.expression); } - function needsParenthesisForPropertyAccess(node) { + function needsParenthesisForPropertyAccessOrInvocation(node) { switch (node.kind) { case 64: case 151: @@ -19052,7 +19772,7 @@ var ts; var e = elements[pos]; if (e.kind === 171) { e = e.expression; - emitParenthesized(e, group === 0 && needsParenthesisForPropertyAccess(e)); + emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e)); pos++; } else { @@ -19091,24 +19811,18 @@ var ts; write("]"); } else { - emitListWithSpread(elements, (node.flags & 256) !== 0, elements.hasTrailingComma); + emitListWithSpread(elements, (node.flags & 512) !== 0, elements.hasTrailingComma); } } - function createSynthesizedNode(kind) { - var node = ts.createNode(kind); - node.pos = -1; - node.end = -1; - return node; - } function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) { var parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex); return emit(parenthesizedObjectLiteral); } function createDownlevelObjectLiteralWithComputedProperties(originalObjectLiteral, firstComputedPropertyIndex) { var tempVar = createAndRecordTempVariable(originalObjectLiteral); - var initialObjectLiteral = createSynthesizedNode(152); + var initialObjectLiteral = ts.createSynthesizedNode(152); initialObjectLiteral.properties = originalObjectLiteral.properties.slice(0, firstComputedPropertyIndex); - initialObjectLiteral.flags |= 256; + initialObjectLiteral.flags |= 512; var propertyPatches = createBinaryExpression(tempVar, 52, initialObjectLiteral); ts.forEach(originalObjectLiteral.properties, function (property) { var patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property); @@ -19116,7 +19830,7 @@ var ts; propertyPatches = createBinaryExpression(propertyPatches, 23, patchedProperty); } }); - propertyPatches = createBinaryExpression(propertyPatches, 23, tempVar); + propertyPatches = createBinaryExpression(propertyPatches, 23, createIdentifier(tempVar.text, true)); var result = createParenthesizedExpression(propertyPatches); return result; } @@ -19127,7 +19841,7 @@ var ts; function tryCreatePatchingPropertyAssignment(objectLiteral, tempVar, property) { var leftHandSide = createMemberAccessForPropertyName(tempVar, property.name); var maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property); - return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide); + return maybeRightHandSide && createBinaryExpression(leftHandSide, 52, maybeRightHandSide, true); } function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) { switch (property.kind) { @@ -19143,7 +19857,7 @@ var ts; if (firstAccessor !== property) { return undefined; } - var propertyDescriptor = createSynthesizedNode(152); + var propertyDescriptor = ts.createSynthesizedNode(152); var descriptorProperties = []; if (getAccessor) { var getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body)); @@ -19153,7 +19867,7 @@ var ts; var setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body)); descriptorProperties.push(setProperty); } - var trueExpr = createSynthesizedNode(94); + var trueExpr = ts.createSynthesizedNode(94); var enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr); descriptorProperties.push(enumerableTrue); var configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr); @@ -19166,7 +19880,7 @@ var ts; } } function createParenthesizedExpression(expression) { - var result = createSynthesizedNode(159); + var result = ts.createSynthesizedNode(159); result.expression = expression; return result; } @@ -19180,9 +19894,9 @@ var ts; result.end = -1; return result; } - function createBinaryExpression(left, operator, right) { - var result = createSynthesizedNode(167); - result.operatorToken = createSynthesizedNode(operator); + function createBinaryExpression(left, operator, right, startsOnNewLine) { + var result = ts.createSynthesizedNode(167, startsOnNewLine); + result.operatorToken = ts.createSynthesizedNode(operator); result.left = left; result.right = right; return result; @@ -19202,36 +19916,37 @@ var ts; } } function createPropertyAssignment(name, initializer) { - var result = createSynthesizedNode(217); + var result = ts.createSynthesizedNode(217); result.name = name; result.initializer = initializer; return result; } function createFunctionExpression(parameters, body) { - var result = createSynthesizedNode(160); + var result = ts.createSynthesizedNode(160); result.parameters = parameters; result.body = body; return result; } function createPropertyAccessExpression(expression, name) { - var result = createSynthesizedNode(153); + var result = ts.createSynthesizedNode(153); result.expression = expression; + result.dotToken = ts.createSynthesizedNode(20); result.name = name; return result; } function createElementAccessExpression(expression, argumentExpression) { - var result = createSynthesizedNode(154); + var result = ts.createSynthesizedNode(154); result.expression = expression; result.argumentExpression = argumentExpression; return result; } - function createIdentifier(name) { - var result = createSynthesizedNode(64); + function createIdentifier(name, startsOnNewLine) { + var result = ts.createSynthesizedNode(64, startsOnNewLine); result.text = name; return result; } function createCallExpression(invokedExpression, arguments) { - var result = createSynthesizedNode(155); + var result = ts.createSynthesizedNode(155); result.expression = invokedExpression; result.arguments = arguments; return result; @@ -19296,13 +20011,29 @@ var ts; } return false; } + function indentIfOnDifferentLines(parent, node1, node2) { + var isSynthesized = ts.nodeIsSynthesized(parent); + var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { + increaseIndent(); + writeLine(); + return true; + } + return false; + } function emitPropertyAccess(node) { if (tryEmitConstantValue(node)) { return; } emit(node.expression); + var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken); write("."); + indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name); emit(node.name); + if (indented) { + decreaseIndent(); + } } function emitQualifiedName(node) { emit(node.left); @@ -19416,26 +20147,33 @@ var ts; } } function emitTaggedTemplateExpression(node) { - emit(node.tag); - write(" "); - emit(node.template); + if (compilerOptions.target >= 2) { + emit(node.tag); + write(" "); + emit(node.template); + } + else { + emitDownlevelTaggedTemplate(node); + } } function emitParenExpression(node) { - if (node.expression.kind === 158) { - var operand = node.expression.expression; - while (operand.kind == 158) { - operand = operand.expression; - } - if (operand.kind !== 165 && - operand.kind !== 164 && - operand.kind !== 163 && - operand.kind !== 162 && - operand.kind !== 166 && - operand.kind !== 156 && - !(operand.kind === 155 && node.parent.kind === 156) && - !(operand.kind === 160 && node.parent.kind === 155)) { - emit(operand); - return; + if (!node.parent || node.parent.kind !== 161) { + if (node.expression.kind === 158) { + var operand = node.expression.expression; + while (operand.kind == 158) { + operand = operand.expression; + } + if (operand.kind !== 165 && + operand.kind !== 164 && + operand.kind !== 163 && + operand.kind !== 162 && + operand.kind !== 166 && + operand.kind !== 156 && + !(operand.kind === 155 && node.parent.kind === 156) && + !(operand.kind === 160 && node.parent.kind === 155)) { + emit(operand); + return; + } } } write("("); @@ -19481,48 +20219,58 @@ var ts; } else { emit(node.left); - if (node.operatorToken.kind !== 23) { + var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken); + if (!indented1 && node.operatorToken.kind !== 23) { write(" "); } write(ts.tokenToString(node.operatorToken.kind)); - var operatorEnd = ts.getLineAndCharacterOfPosition(currentSourceFile, node.operatorToken.end); - var rightStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.right.pos)); - var onDifferentLine = operatorEnd.line !== rightStart.line; - if (onDifferentLine) { - var exprStart = ts.getLineAndCharacterOfPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); - var firstCharOfExpr = getFirstNonWhitespaceCharacterIndexOnLine(exprStart.line); - var shouldIndent = rightStart.character > firstCharOfExpr; - if (shouldIndent) { - increaseIndent(); - } - writeLine(); + if (!indented1) { + var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right); } - else { + if (!indented2) { write(" "); } emit(node.right); - if (shouldIndent) { + if (indented1 || indented2) { decreaseIndent(); } } } - function getFirstNonWhitespaceCharacterIndexOnLine(line) { - var lineStart = ts.getLineStarts(currentSourceFile)[line]; - var text = currentSourceFile.text; - for (var i = lineStart; i < text.length; i++) { - var ch = text.charCodeAt(i); - if (!ts.isWhiteSpace(text.charCodeAt(i)) || ts.isLineBreak(ch)) { - break; - } - } - return i - lineStart; + function synthesizedNodeStartsOnNewLine(node) { + return ts.nodeIsSynthesized(node) && node.startsOnNewLine; } function emitConditionalExpression(node) { emit(node.condition); - write(" ? "); + var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken); + if (!indent1) { + write(" "); + } + write("?"); + if (!indent1) { + var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue); + } + if (!indent2) { + write(" "); + } emit(node.whenTrue); - write(" : "); + if (indent1 || indent2) { + decreaseIndent(); + } + var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken); + if (!indent3) { + write(" "); + } + write(":"); + if (!indent3) { + var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse); + } + if (!indent4) { + write(" "); + } emit(node.whenFalse); + if (indent3 || indent4) { + decreaseIndent(); + } } function isSingleLineEmptyBlock(node) { if (node && node.kind === 174) { @@ -19566,7 +20314,7 @@ var ts; } } function emitExpressionStatement(node) { - emitParenthesized(node.expression, node.expression.kind === 161); + emitParenthesizedIf(node.expression, node.expression.kind === 161); write(";"); } function emitIfStatement(node) { @@ -19607,6 +20355,30 @@ var ts; write(")"); emitEmbeddedStatement(node.statement); } + function emitStartOfVariableDeclarationList(decl, startPos) { + var tokenKind = 97; + if (decl && languageVersion >= 2) { + if (ts.isLet(decl)) { + tokenKind = 104; + } + else if (ts.isConst(decl)) { + tokenKind = 69; + } + } + if (startPos !== undefined) { + emitToken(tokenKind, startPos); + } + else { + switch (tokenKind) { + case 97: + return write("var "); + case 104: + return write("let "); + case 69: + return write("const "); + } + } + } function emitForStatement(node) { var endPos = emitToken(81, node.pos); write(" "); @@ -19614,17 +20386,9 @@ var ts; if (node.initializer && node.initializer.kind === 194) { var variableDeclarationList = node.initializer; var declarations = variableDeclarationList.declarations; - if (declarations[0] && ts.isLet(declarations[0])) { - emitToken(105, endPos); - } - else if (declarations[0] && ts.isConst(declarations[0])) { - emitToken(69, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(declarations[0], endPos); write(" "); - emitCommaList(variableDeclarationList.declarations); + emitCommaList(declarations); } else if (node.initializer) { emit(node.initializer); @@ -19644,12 +20408,7 @@ var ts; var variableDeclarationList = node.initializer; if (variableDeclarationList.declarations.length >= 1) { var decl = variableDeclarationList.declarations[0]; - if (ts.isLet(decl)) { - emitToken(105, endPos); - } - else { - emitToken(97, endPos); - } + emitStartOfVariableDeclarationList(decl, endPos); write(" "); emit(decl); } @@ -19748,8 +20507,8 @@ var ts; var endPos = emitToken(67, node.pos); write(" "); emitToken(16, endPos); - emit(node.name); - emitToken(17, node.name.end); + emit(node.variableDeclaration); + emitToken(17, node.variableDeclaration ? node.variableDeclaration.end : endPos); write(" "); emitBlock(node.block); } @@ -19781,8 +20540,15 @@ var ts; emitNode(node.name); emitEnd(node.name); } + function createVoidZero() { + var zero = ts.createSynthesizedNode(7); + zero.text = "0"; + var result = ts.createSynthesizedNode(164); + result.expression = zero; + return result; + } function emitExportMemberAssignments(name) { - if (exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { + if (!exportDefault && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) { ts.forEach(exportSpecifiers[name.text], function (specifier) { writeLine(); emitStart(specifier.name); @@ -19809,6 +20575,7 @@ var ts; if (emitCount++) { write(", "); } + renameNonTopLevelLetAndConst(name); if (name.parent && (name.parent.kind === 193 || name.parent.kind === 150)) { emitModuleMemberName(name.parent); } @@ -19829,27 +20596,25 @@ var ts; } return expr; } - function createVoidZero() { - var zero = ts.createNode(7); - zero.text = "0"; - var result = ts.createNode(164); - result.expression = zero; - return result; - } function createDefaultValueCheck(value, defaultValue) { value = ensureIdentifier(value); - var equals = ts.createNode(167); + var equals = ts.createSynthesizedNode(167); equals.left = value; - equals.operatorToken = ts.createNode(30); + equals.operatorToken = ts.createSynthesizedNode(30); equals.right = createVoidZero(); - var cond = ts.createNode(168); - cond.condition = equals; - cond.whenTrue = defaultValue; - cond.whenFalse = value; + return createConditionalExpression(equals, defaultValue, value); + } + function createConditionalExpression(condition, whenTrue, whenFalse) { + var cond = ts.createSynthesizedNode(168); + cond.condition = condition; + cond.questionToken = ts.createSynthesizedNode(50); + cond.whenTrue = whenTrue; + cond.colonToken = ts.createSynthesizedNode(51); + cond.whenFalse = whenFalse; return cond; } function createNumericLiteral(value) { - var node = ts.createNode(7); + var node = ts.createSynthesizedNode(7); node.text = "" + value; return node; } @@ -19857,7 +20622,7 @@ var ts; if (expr.kind === 64 || expr.kind === 153 || expr.kind === 154) { return expr; } - var node = ts.createNode(159); + var node = ts.createSynthesizedNode(159); node.expression = expr; return node; } @@ -19865,13 +20630,10 @@ var ts; if (propName.kind !== 64) { return createElementAccess(object, propName); } - var node = ts.createNode(153); - node.expression = parenthesizeForAccess(object); - node.name = propName; - return node; + return createPropertyAccessExpression(parenthesizeForAccess(object), propName); } function createElementAccess(object, index) { - var node = ts.createNode(154); + var node = ts.createSynthesizedNode(154); node.expression = parenthesizeForAccess(object); node.argumentExpression = index; return node; @@ -19993,8 +20755,19 @@ var ts; } } else { + var isLet = renameNonTopLevelLetAndConst(node.name); emitModuleMemberName(node); - emitOptional(" = ", node.initializer); + var initializer = node.initializer; + if (!initializer && languageVersion < 2) { + var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && + (getCombinedFlagsForIdentifier(node.name) & 4096); + if (isUninitializedLet && + node.parent.parent.kind !== 182 && + node.parent.parent.kind !== 183) { + initializer = createVoidZero(); + } + } + emitOptional(" = ", initializer); } } function emitExportVariableAssignments(node) { @@ -20006,17 +20779,64 @@ var ts; ts.forEach(name.elements, emitExportVariableAssignments); } } + function getEnclosingBlockScopeContainer(node) { + var current = node; + while (current) { + if (ts.isFunctionLike(current)) { + return current; + } + switch (current.kind) { + case 220: + case 91: + case 216: + case 200: + case 181: + case 182: + case 183: + return current; + case 174: + if (!ts.isFunctionLike(current.parent)) { + return current; + } + } + current = current.parent; + } + } + function getCombinedFlagsForIdentifier(node) { + if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return 0; + } + return ts.getCombinedNodeFlags(node.parent); + } + function renameNonTopLevelLetAndConst(node) { + if (languageVersion >= 2 || + ts.nodeIsSynthesized(node) || + node.kind !== 64 || + (node.parent.kind !== 193 && node.parent.kind !== 150)) { + return; + } + var combinedFlags = getCombinedFlagsForIdentifier(node); + if (((combinedFlags & 12288) === 0) || combinedFlags & 1) { + return; + } + var list = ts.getAncestor(node, 194); + if (list.parent.kind === 175 && list.parent.parent.kind === 220) { + return; + } + var blockScopeContainer = getEnclosingBlockScopeContainer(node); + var parent = blockScopeContainer.kind === 220 + ? blockScopeContainer + : blockScopeContainer.parent; + var generatedName = generateUniqueNameForLocation(parent, node.text); + var variableId = resolver.getBlockScopedVariableId(node); + if (!generatedBlockScopeNames) { + generatedBlockScopeNames = []; + } + generatedBlockScopeNames[variableId] = generatedName; + } function emitVariableStatement(node) { if (!(node.flags & 1)) { - if (ts.isLet(node.declarationList)) { - write("let "); - } - else if (ts.isConst(node.declarationList)) { - write("const "); - } - else { - write("var "); - } + emitStartOfVariableDeclarationList(node.declarationList); } emitCommaList(node.declarationList.declarations); write(";"); @@ -20121,6 +20941,14 @@ var ts; function shouldEmitAsArrowFunction(node) { return node.kind === 161 && languageVersion >= 2; } + function emitDeclarationName(node) { + if (node.name) { + emitNode(node.name); + } + else { + write(resolver.getGeneratedNameForNode(node)); + } + } function emitFunctionDeclaration(node) { if (ts.nodeIsMissing(node.body)) { return emitPinnedOrTripleSlashComments(node); @@ -20132,10 +20960,10 @@ var ts; write("function "); } if (node.kind === 195 || (node.kind === 160 && node.name)) { - emit(node.name); + emitDeclarationName(node); } emitSignatureAndBody(node); - if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.kind === 195 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } if (node.kind !== 132 && node.kind !== 131) { @@ -20175,6 +21003,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); if (shouldEmitAsArrowFunction(node)) { emitSignatureParametersForArrow(node); write(" =>"); @@ -20191,15 +21020,16 @@ var ts; else { emitExpressionFunctionBody(node, node.body); } - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20215,7 +21045,11 @@ var ts; return; } write(" "); - emit(body); + var current = body; + while (current.kind === 158) { + current = current.expression; + } + emitParenthesizedIf(body, current.kind === 152); } function emitDownLevelExpressionFunctionBody(node, body) { write(" {"); @@ -20254,45 +21088,15 @@ var ts; scopeEmitEnd(); } function emitBlockFunctionBody(node, body) { - if (body.statements.length === 0 && !anyParameterHasBindingPatternOrInitializer(node)) { - emitFunctionBodyWithNoStatements(node, body); - } - else { - emitFunctionBodyWithStatements(node, body); - } - } - function anyParameterHasBindingPatternOrInitializer(func) { - return ts.forEach(func.parameters, hasBindingPatternOrInitializer); - } - function hasBindingPatternOrInitializer(parameter) { - return parameter.initializer || ts.isBindingPattern(parameter.name); - } - function emitFunctionBodyWithNoStatements(node, body) { - var singleLine = isSingleLineEmptyBlock(node.body); - write(" {"); - if (singleLine) { - write(" "); - } - else { - increaseIndent(); - writeLine(); - } - emitLeadingCommentsOfPosition(body.statements.end); - if (!singleLine) { - decreaseIndent(); - } - emitToken(15, body.statements.end); - } - function emitFunctionBodyWithStatements(node, body) { write(" {"); scopeEmitStart(node); - var outPos = writer.getTextPos(); + var initialTextPos = writer.getTextPos(); increaseIndent(); emitDetachedComments(body.statements); var startIndex = emitDirectivePrologues(body.statements, true); emitFunctionBodyPreamble(node); decreaseIndent(); - var preambleEmitted = writer.getTextPos() !== outPos; + var preambleEmitted = writer.getTextPos() !== initialTextPos; if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { for (var i = 0, n = body.statements.length; i < n; i++) { write(" "); @@ -20365,7 +21169,7 @@ var ts; emitStart(member); emitStart(member.name); if (staticFlag) { - emitNode(node.name); + emitDeclarationName(node); } else { write("this"); @@ -20390,7 +21194,7 @@ var ts; emitLeadingComments(member); emitStart(member); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20411,7 +21215,7 @@ var ts; emitStart(member); write("Object.defineProperty("); emitStart(member.name); - emitNode(node.name); + emitDeclarationName(node); if (!(member.flags & 128)) { write(".prototype"); } @@ -20456,7 +21260,7 @@ var ts; } function emitClassDeclaration(node) { write("var "); - emit(node.name); + emitDeclarationName(node); write(" = (function ("); var baseTypeNode = ts.getClassBaseTypeNode(node); if (baseTypeNode) { @@ -20469,7 +21273,7 @@ var ts; writeLine(); emitStart(baseTypeNode); write("__extends("); - emit(node.name); + emitDeclarationName(node); write(", _super);"); emitEnd(baseTypeNode); } @@ -20478,11 +21282,10 @@ var ts; emitMemberFunctions(node); emitMemberAssignments(node, 128); writeLine(); - function emitClassReturnStatement() { + emitToken(15, node.members.end, function () { write("return "); - emitNode(node.name); - } - emitToken(15, node.members.end, emitClassReturnStatement); + emitDeclarationName(node); + }); write(";"); decreaseIndent(); writeLine(); @@ -20495,16 +21298,16 @@ var ts; } write(");"); emitEnd(node); - if (node.flags & 1) { + if (node.flags & 1 && !(node.flags & 256)) { writeLine(); emitStart(node); emitModuleMemberName(node); write(" = "); - emit(node.name); + emitDeclarationName(node); emitEnd(node); write(";"); } - if (languageVersion < 2 && node.parent === currentSourceFile) { + if (languageVersion < 2 && node.parent === currentSourceFile && node.name) { emitExportMemberAssignments(node.name); } function emitConstructorOfClass() { @@ -20514,6 +21317,7 @@ var ts; tempCount = 0; tempVariables = undefined; tempParameters = undefined; + var popFrame = enterNameScope(); ts.forEach(node.members, function (member) { if (member.kind === 133 && !member.body) { emitPinnedOrTripleSlashComments(member); @@ -20525,7 +21329,7 @@ var ts; } emitStart(ctor || node); write("function "); - emit(node.name); + emitDeclarationName(node); emitSignatureParameters(ctor); write(" {"); scopeEmitStart(node, "constructor"); @@ -20573,6 +21377,7 @@ var ts; if (ctor) { emitTrailingComments(ctor); } + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; tempParameters = saveTempParameters; @@ -20691,7 +21496,9 @@ var ts; var saveTempVariables = tempVariables; tempCount = 0; tempVariables = undefined; + var popFrame = enterNameScope(); emit(node.body); + exitNameScope(popFrame); tempCount = saveTempCount; tempVariables = saveTempVariables; } @@ -20780,7 +21587,7 @@ var ts; emitImportDeclaration(node); return; } - if (resolver.isReferencedImportDeclaration(node) || + if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); @@ -20876,17 +21683,29 @@ var ts; function createExternalModuleInfo(sourceFile) { externalImports = []; exportSpecifiers = {}; + exportDefault = undefined; ts.forEach(sourceFile.statements, function (node) { if (node.kind === 209 && !node.moduleSpecifier) { ts.forEach(node.exportClause.elements, function (specifier) { + if (specifier.name.text === "default") { + exportDefault = exportDefault || specifier; + } var name = (specifier.propertyName || specifier.name).text; (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier); }); } + else if (node.kind === 208) { + exportDefault = exportDefault || node; + } + else if (node.kind === 195 || node.kind === 196) { + if (node.flags & 1 && node.flags & 256) { + exportDefault = exportDefault || node; + } + } else { var info = createExternalImportInfo(node); if (info) { - if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedImportDeclaration(node)) { + if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) { externalImports.push(info); } } @@ -20967,18 +21786,7 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { - writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("return "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); - write(";"); - emitEnd(exportAssignment); - } + emitExportDefault(node, true); decreaseIndent(); writeLine(); write("});"); @@ -20987,17 +21795,24 @@ var ts; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); - var exportName = resolver.getExportAssignmentName(node); - if (exportName) { + emitExportDefault(node, false); + } + function emitExportDefault(sourceFile, emitAsReturn) { + if (exportDefault && resolver.hasExportDefaultValue(sourceFile)) { writeLine(); - var exportAssignment = getFirstExportAssignment(node); - emitStart(exportAssignment); - write("module.exports = "); - emitStart(exportAssignment.exportName); - write(exportName); - emitEnd(exportAssignment.exportName); + emitStart(exportDefault); + write(emitAsReturn ? "return " : "module.exports = "); + if (exportDefault.kind === 208) { + emit(exportDefault.expression); + } + else if (exportDefault.kind === 211) { + emit(exportDefault.propertyName); + } + else { + emitDeclarationName(exportDefault); + } write(";"); - emitEnd(exportAssignment); + emitEnd(exportDefault); } } function emitDirectivePrologues(statements, startWithNewLine) { @@ -21048,6 +21863,7 @@ var ts; else { externalImports = undefined; exportSpecifiers = undefined; + exportDefault = undefined; emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); emitTempDeclarations(true); @@ -21367,6 +22183,7 @@ var ts; var ts; (function (ts) { ts.emitTime = 0; + ts.ioReadTime = 0; function createCompilerHost(options) { var currentDirectory; var existingDirectories = {}; @@ -21376,11 +22193,15 @@ var ts; var unsupportedFileEncodingErrorCode = -2147024809; function getSourceFile(fileName, languageVersion, onError) { try { + var start = new Date().getTime(); var text = ts.sys.readFile(fileName, options.charset); + ts.ioReadTime += new Date().getTime() - start; } catch (e) { if (onError) { - onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message); + onError(e.number === unsupportedFileEncodingErrorCode + ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText + : e.message); } text = ""; } @@ -21513,8 +22334,9 @@ var ts; if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) { return { diagnostics: [], sourceMaps: undefined, emitSkipped: true }; } + var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile); var start = new Date().getTime(); - var emitResult = ts.emitFiles(getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile), getEmitHost(writeFileCallback), sourceFile); + var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile); ts.emitTime += new Date().getTime() - start; return emitResult; } @@ -21703,20 +22525,19 @@ var ts; } return; } - var firstExternalModule = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); - if (firstExternalModule && !options.module) { - var externalModuleErrorSpan = ts.getErrorSpanForNode(firstExternalModule.externalModuleIndicator); - var errorStart = ts.skipTrivia(firstExternalModule.text, externalModuleErrorSpan.pos); - var errorLength = externalModuleErrorSpan.end - errorStart; - diagnostics.add(ts.createFileDiagnostic(firstExternalModule, errorStart, errorLength, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); + var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; }); + if (firstExternalModuleSourceFile && !options.module) { + var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided)); } if (options.outDir || options.sourceRoot || (options.mapRoot && - (!options.out || firstExternalModule !== undefined))) { + (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents; ts.forEach(files, function (sourceFile) { - if (!(sourceFile.flags & 1024) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { + if (!(sourceFile.flags & 2048) + && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory()); sourcePathComponents.pop(); if (commonPathComponents) { @@ -22383,6 +23204,27 @@ var ts; case 149: ts.forEach(node.elements, visit); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + childNodes.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + childNodes.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; case 150: case 193: if (ts.isBindingPattern(node.name)) { @@ -22394,7 +23236,11 @@ var ts; case 197: case 200: case 195: + case 202: + case 207: + case 211: childNodes.push(node); + break; } } ts.forEach(nodes, visit); @@ -22507,7 +23353,7 @@ var ts; if (ts.isBindingPattern(node.name)) { break; } - if ((node.flags & 243) === 0) { + if ((node.flags & 499) === 0) { return undefined; } return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement); @@ -22559,6 +23405,12 @@ var ts; } case 133: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); + case 211: + case 207: + case 202: + case 204: + case 205: + return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias); } return undefined; function createItem(node, name, scriptElementKind) { @@ -22631,10 +23483,15 @@ var ts; return undefined; } hasGlobalNode = true; - var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : ""; + var rootName = ts.isExternalModule(node) + ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" + : ""; return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems); } function createClassItem(node) { + if (!node.name) { + return undefined; + } var childItems; if (node.members) { var constructor = ts.forEach(node.members, function (member) { @@ -22670,7 +23527,9 @@ var ts; return node; } function getNodeSpan(node) { - return node.kind === 220 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); + return node.kind === 220 + ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) + : ts.createTextSpanFromBounds(node.getStart(), node.getEnd()); } function getTextOfNode(node) { return ts.getTextOfNodeFromSourceText(sourceFile.text, node); @@ -23124,7 +23983,9 @@ var ts; function transitionFromLowerToUpper(identifier, word, index) { var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1)); var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index)); - var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper; + var transition = word + ? (currentIsUpper && !lastIsUpper) + : currentIsUpper; return transition; } })(ts || (ts = {})); @@ -23178,12 +24039,14 @@ var ts; var list = listItemInfo.list; var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos; var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1; + var argumentCount = getCommaBasedArgCount(list); + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: isTypeArgList ? 0 : 1, invocation: callExpression, argumentsSpan: getApplicableSpanForArguments(list), argumentIndex: argumentIndex, - argumentCount: getCommaBasedArgCount(list) + argumentCount: argumentCount }; } } @@ -23214,7 +24077,9 @@ var ts; return undefined; } function getCommaBasedArgCount(argumentsList) { - return argumentsList.getChildCount() === 0 ? 0 : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); + return argumentsList.getChildCount() === 0 + ? 0 + : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; }); } function getArgumentIndexForTemplatePiece(spanIndex, node) { ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node."); @@ -23227,7 +24092,10 @@ var ts; return spanIndex + 1; } function getArgumentListInfoForTemplate(tagExpression, argumentIndex) { - var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1; + var argumentCount = tagExpression.template.kind === 10 + ? 1 + : tagExpression.template.templateSpans.length + 1; + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { kind: 2, invocation: tagExpression, @@ -23342,6 +24210,7 @@ var ts; if (selectedItemIndex < 0) { selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); } + ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex); return { items: items, applicableSpan: applicableSpan, @@ -23511,7 +24380,7 @@ var ts; for (var i = 0, len = children.length; i < len; ++i) { var child = children[i]; var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || - (child.pos === previousToken.end); + (child.pos === previousToken.end); if (shouldDiveInChildNode && nodeHasTokens(child)) { return find(child); } @@ -23589,7 +24458,7 @@ var ts; if (node.kind === 139 || node.kind === 155) { return node.typeArguments; } - if (ts.isAnyFunction(node) || node.kind === 196 || node.kind === 197) { + if (ts.isFunctionLike(node) || node.kind === 196 || node.kind === 197) { return node.typeParameters; } return undefined; @@ -23614,7 +24483,8 @@ var ts; } ts.isPunctuation = isPunctuation; function isInsideTemplateLiteral(node, position) { - return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); + return ts.isTemplateLiteralKind(node.kind) + && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd()); } ts.isInsideTemplateLiteral = isInsideTemplateLiteral; function compareDataObjects(dst, src) { @@ -23895,7 +24765,13 @@ var ts; token: undefined }; } - var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0; + var expectedScanAction = shouldRescanGreaterThanToken(n) + ? 1 + : shouldRescanSlashToken(n) + ? 2 + : shouldRescanTemplateToken(n) + ? 3 + : 0; if (lastTokenInfo && expectedScanAction === lastScanAction) { return fixTokenKind(lastTokenInfo, n); } @@ -24246,7 +25122,7 @@ var ts; this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([105, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); + this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2)); this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8)); this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8)); @@ -24254,13 +25130,13 @@ var ts; this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2)); this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 120]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); + this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2)); this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); - this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(114, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([117, 118]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); - this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 115, 76, 77, 78, 116, 103, 84, 104, 117, 107, 109, 120, 110]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); - this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 103])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); + this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); + this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2)); this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); @@ -24272,52 +25148,52 @@ var ts; this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8)); this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8)); this.HighPriorityCommonRules = - [ - this.IgnoreBeforeComment, this.IgnoreAfterLineComment, - this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, - this.NoSpaceAfterQuestionMark, - this.NoSpaceBeforeDot, this.NoSpaceAfterDot, - this.NoSpaceAfterUnaryPrefixOperator, - this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, - this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, - this.SpaceAfterPostincrementWhenFollowedByAdd, - this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, - this.SpaceAfterPostdecrementWhenFollowedBySubtract, - this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, - this.NoSpaceAfterCloseBrace, - this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, - this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, - this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, - this.NoSpaceBetweenReturnAndSemicolon, - this.SpaceAfterCertainKeywords, - this.SpaceAfterLetConstInVariableDeclaration, - this.NoSpaceBeforeOpenParenInFuncCall, - this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, - this.SpaceAfterVoidOperator, - this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, - this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, - this.SpaceAfterModuleName, - this.SpaceAfterArrow, - this.NoSpaceAfterEllipsis, - this.NoSpaceAfterOptionalParameters, - this.NoSpaceBetweenEmptyInterfaceBraceBrackets, - this.NoSpaceBeforeOpenAngularBracket, - this.NoSpaceBetweenCloseParenAndAngularBracket, - this.NoSpaceAfterOpenAngularBracket, - this.NoSpaceBeforeCloseAngularBracket, - this.NoSpaceAfterCloseAngularBracket - ]; + [ + this.IgnoreBeforeComment, this.IgnoreAfterLineComment, + this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, + this.NoSpaceAfterQuestionMark, + this.NoSpaceBeforeDot, this.NoSpaceAfterDot, + this.NoSpaceAfterUnaryPrefixOperator, + this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator, + this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator, + this.SpaceAfterPostincrementWhenFollowedByAdd, + this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement, + this.SpaceAfterPostdecrementWhenFollowedBySubtract, + this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement, + this.NoSpaceAfterCloseBrace, + this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext, + this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets, + this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember, + this.NoSpaceBetweenReturnAndSemicolon, + this.SpaceAfterCertainKeywords, + this.SpaceAfterLetConstInVariableDeclaration, + this.NoSpaceBeforeOpenParenInFuncCall, + this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator, + this.SpaceAfterVoidOperator, + this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, + this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, + this.SpaceAfterModuleName, + this.SpaceAfterArrow, + this.NoSpaceAfterEllipsis, + this.NoSpaceAfterOptionalParameters, + this.NoSpaceBetweenEmptyInterfaceBraceBrackets, + this.NoSpaceBeforeOpenAngularBracket, + this.NoSpaceBetweenCloseParenAndAngularBracket, + this.NoSpaceAfterOpenAngularBracket, + this.NoSpaceBeforeCloseAngularBracket, + this.NoSpaceAfterCloseAngularBracket + ]; this.LowPriorityCommonRules = - [ - this.NoSpaceBeforeSemicolon, - this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, - this.NoSpaceBeforeComma, - this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, - this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, - this.SpaceAfterSemicolon, - this.NoSpaceBeforeOpenParenInFuncDecl, - this.SpaceBetweenStatements, this.SpaceAfterTryFinally - ]; + [ + this.NoSpaceBeforeSemicolon, + this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, + this.NoSpaceBeforeComma, + this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket, + this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket, + this.SpaceAfterSemicolon, + this.NoSpaceBeforeOpenParenInFuncDecl, + this.SpaceBetweenStatements, this.SpaceAfterTryFinally + ]; this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2)); this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8)); this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2)); @@ -24645,13 +25521,19 @@ var ts; RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) { var position; if (rule.Operation.Action == 1) { - position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny; + position = specificTokens ? + 0 : + RulesPosition.IgnoreRulesAny; } else if (!rule.Operation.Context.IsAny()) { - position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny; + position = specificTokens ? + RulesPosition.ContextRulesSpecific : + RulesPosition.ContextRulesAny; } else { - position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny; + position = specificTokens ? + RulesPosition.NoContextRulesSpecific : + RulesPosition.NoContextRulesAny; } var state = constructionState[rulesBucketIndex]; if (state === undefined) { @@ -24773,7 +25655,7 @@ var ts; TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]); TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]); TokenRange.Comments = TokenRange.FromTokens([2, 3]); - TokenRange.TypeNames = TokenRange.FromTokens([64, 119, 121, 113, 122, 98, 112]); + TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]); return TokenRange; })(); Shared.TokenRange = TokenRange; @@ -24970,7 +25852,9 @@ var ts; if (!errors.length) { return rangeHasNoErrors; } - var sorted = errors.filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }).sort(function (e1, e2) { return e1.start - e2.start; }); + var sorted = errors + .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }) + .sort(function (e1, e2) { return e1.start - e2.start; }); if (!sorted.length) { return rangeHasNoErrors; } @@ -25340,8 +26224,8 @@ var ts; } } trimTrailingWhitespaces = - (rule.Operation.Action & (4 | 2)) && - rule.Flag !== 1; + (rule.Operation.Action & (4 | 2)) && + rule.Flag !== 1; } else { trimTrailingWhitespaces = true; @@ -25396,7 +26280,9 @@ var ts; var delta = indentation - nonWhitespaceColumnInFirstPart.column; for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) { var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile); - var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); + var nonWhitespaceCharacterAndColumn = i === 0 + ? nonWhitespaceColumnInFirstPart + : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options); var newIndentation = nonWhitespaceCharacterAndColumn.column + delta; if (newIndentation > 0) { var indentationString = getIndentationString(newIndentation, options); @@ -25567,6 +26453,10 @@ var ts; (function (formatting) { var SmartIndenter; (function (SmartIndenter) { + var Value; + (function (Value) { + Value[Value["Unknown"] = -1] = "Unknown"; + })(Value || (Value = {})); function getIndentation(position, sourceFile, options) { if (position > sourceFile.text.length) { return 0; @@ -25576,11 +26466,11 @@ var ts; return 0; } var precedingTokenIsLiteral = precedingToken.kind === 8 || - precedingToken.kind === 9 || - precedingToken.kind === 10 || - precedingToken.kind === 11 || - precedingToken.kind === 12 || - precedingToken.kind === 13; + precedingToken.kind === 9 || + precedingToken.kind === 10 || + precedingToken.kind === 11 || + precedingToken.kind === 12 || + precedingToken.kind === 13; if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) { return 0; } @@ -25641,7 +26531,7 @@ var ts; } parentStart = getParentStart(parent, current, sourceFile); var parentAndChildShareLine = parentStart.line === currentStart.line || - childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); + childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile); if (useActualIndentation) { var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options); if (actualIndentation !== -1) { @@ -25666,12 +26556,16 @@ var ts; } function getActualIndentationForListItemBeforeComma(commaToken, sourceFile, options) { var commaItemInfo = ts.findListItemInfo(commaToken); - ts.Debug.assert(commaItemInfo && commaItemInfo.listItemIndex > 0); - return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + if (commaItemInfo && commaItemInfo.listItemIndex > 0) { + return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options); + } + else { + return -1; + } } function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) { var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && - (parent.kind === 220 || !parentAndChildShareLine); + (parent.kind === 220 || !parentAndChildShareLine); if (!useActualIndentation) { return -1; } @@ -25998,13 +26892,13 @@ var ts; while (pos < end) { var token = scanner.scan(); var textPos = scanner.getTextPos(); - nodes.push(createNode(token, pos, textPos, 512, this)); + nodes.push(createNode(token, pos, textPos, 1024, this)); pos = textPos; } return pos; }; NodeObject.prototype.createSyntaxList = function (nodes) { - var list = createNode(221, nodes.pos, nodes.end, 512, this); + var list = createNode(221, nodes.pos, nodes.end, 1024, this); list._children = []; var pos = nodes.pos; for (var i = 0, len = nodes.length; i < len; i++) { @@ -26426,7 +27320,9 @@ var ts; case 131: var functionDeclaration = node; if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) { - var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined; + var lastDeclaration = namedDeclarations.length > 0 ? + namedDeclarations[namedDeclarations.length - 1] : + undefined; if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) { if (functionDeclaration.body && !lastDeclaration.body) { namedDeclarations[namedDeclarations.length - 1] = functionDeclaration; @@ -26444,6 +27340,11 @@ var ts; case 199: case 200: case 202: + case 211: + case 207: + case 202: + case 204: + case 205: case 134: case 135: case 143: @@ -26478,6 +27379,27 @@ var ts; case 129: namedDeclarations.push(node); break; + case 209: + if (node.exportClause) { + ts.forEach(node.exportClause.elements, visit); + } + break; + case 203: + var importClause = node.importClause; + if (importClause) { + if (importClause.name) { + namedDeclarations.push(importClause); + } + if (importClause.namedBindings) { + if (importClause.namedBindings.kind === 205) { + namedDeclarations.push(importClause.namedBindings); + } + else { + ts.forEach(importClause.namedBindings.elements, visit); + } + } + } + break; } }); this.namedDeclarations = namedDeclarations; @@ -26798,7 +27720,7 @@ var ts; var entry = entries[i]; sourceFiles.push({ name: i, - refCount: entry.refCount, + refCount: entry.languageServiceRefCount, references: entry.owners.slice(0) }); } @@ -26811,34 +27733,40 @@ var ts; return JSON.stringify(bucketInfoArray, null, 2); } function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, true); + } + function updateDocument(fileName, compilationSettings, scriptSnapshot, version) { + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, false); + } + function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) { var bucket = getBucketForCompilationSettings(compilationSettings, true); var entry = ts.lookUp(bucket, fileName); if (!entry) { + ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false); bucket[fileName] = entry = { sourceFile: sourceFile, - refCount: 0, + languageServiceRefCount: 0, owners: [] }; } - entry.refCount++; - return entry.sourceFile; - } - function updateDocument(sourceFile, fileName, compilationSettings, scriptSnapshot, version, textChangeRange) { - var bucket = getBucketForCompilationSettings(compilationSettings, false); - ts.Debug.assert(bucket !== undefined); - var entry = ts.lookUp(bucket, fileName); - ts.Debug.assert(entry !== undefined); - entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, textChangeRange); + else { + if (entry.sourceFile.version !== version) { + entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot)); + } + } + if (acquiring) { + entry.languageServiceRefCount++; + } return entry.sourceFile; } function releaseDocument(fileName, compilationSettings) { var bucket = getBucketForCompilationSettings(compilationSettings, false); ts.Debug.assert(bucket !== undefined); var entry = ts.lookUp(bucket, fileName); - entry.refCount--; - ts.Debug.assert(entry.refCount >= 0); - if (entry.refCount === 0) { + entry.languageServiceRefCount--; + ts.Debug.assert(entry.languageServiceRefCount >= 0); + if (entry.languageServiceRefCount === 0) { delete bucket[fileName]; } } @@ -26869,31 +27797,111 @@ var ts; } }); } + function recordModuleName() { + var importPath = scanner.getTokenValue(); + var pos = scanner.getTokenPos(); + importedFiles.push({ + fileName: importPath, + pos: pos, + end: pos + importPath.length + }); + } function processImport() { scanner.setText(sourceText); var token = scanner.scan(); while (token !== 1) { if (token === 84) { token = scanner.scan(); - if (token === 64) { - token = scanner.scan(); - if (token === 52) { + if (token === 8) { + recordModuleName(); + continue; + } + else { + if (token === 64) { token = scanner.scan(); - if (token === 118) { + if (token === 123) { token = scanner.scan(); - if (token === 16) { + if (token === 8) { + recordModuleName(); + continue; + } + } + else if (token === 52) { + token = scanner.scan(); + if (token === 117) { token = scanner.scan(); - if (token === 8) { - var importPath = scanner.getTokenValue(); - var pos = scanner.getTokenPos(); - importedFiles.push({ - fileName: importPath, - pos: pos, - end: pos + importPath.length - }); + if (token === 16) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + continue; + } } } } + else if (token === 23) { + token = scanner.scan(); + } + else { + continue; + } + } + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 101) { + token = scanner.scan(); + if (token === 64) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + } + } + } + else if (token === 77) { + token = scanner.scan(); + if (token === 14) { + token = scanner.scan(); + while (token !== 15) { + token = scanner.scan(); + } + if (token === 15) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } + } + } + } + else if (token === 35) { + token = scanner.scan(); + if (token === 123) { + token = scanner.scan(); + if (token === 8) { + recordModuleName(); + } } } } @@ -26961,7 +27969,7 @@ var ts; } function isNameOfFunctionDeclaration(node) { return node.kind === 64 && - ts.isAnyFunction(node.parent) && node.parent.name === node; + ts.isFunctionLike(node.parent) && node.parent.name === node; } function isNameOfPropertyAssignment(node) { return (node.kind === 64 || node.kind === 8 || node.kind === 7) && @@ -27071,7 +28079,11 @@ var ts; case 198: return ScriptElementKind.typeElement; case 199: return ScriptElementKind.enumElement; case 193: - return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement; + return ts.isConst(node) + ? ScriptElementKind.constElement + : ts.isLet(node) + ? ScriptElementKind.letElement + : ScriptElementKind.variableElement; case 195: return ScriptElementKind.functionElement; case 134: return ScriptElementKind.memberGetAccessorElement; case 135: return ScriptElementKind.memberSetAccessorElement; @@ -27088,6 +28100,12 @@ var ts; case 127: return ScriptElementKind.typeParameterElement; case 219: return ScriptElementKind.variableElement; case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement; + case 202: + case 207: + case 204: + case 211: + case 205: + return ScriptElementKind.alias; } return ScriptElementKind.unknown; } @@ -27165,11 +28183,7 @@ var ts; if (!changesInCompilationSettingsAffectSyntax) { var oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { - if (sourceFileUpToDate(oldSourceFile)) { - return oldSourceFile; - } - var textChangeRange = hostFileInformation.scriptSnapshot.getChangeRange(oldSourceFile.scriptSnapshot); - return documentRegistry.updateDocument(oldSourceFile, fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, textChangeRange); + return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); } } return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version); @@ -27204,7 +28218,9 @@ var ts; } function dispose() { if (program) { - ts.forEach(program.getSourceFiles(), function (f) { documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); }); + ts.forEach(program.getSourceFiles(), function (f) { + return documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions()); + }); } } function getSyntacticDiagnostics(fileName) { @@ -27349,6 +28365,17 @@ var ts; getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession); } } + else if (ts.getAncestor(previousToken, 204)) { + isMemberCompletion = true; + isNewIdentifierLocation = true; + if (showCompletionsInImportsClause(previousToken)) { + var importDeclaration = ts.getAncestor(previousToken, 203); + ts.Debug.assert(importDeclaration !== undefined); + var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration); + var filteredExports = filterModuleExports(exports, importDeclaration); + getCompletionEntriesFromSymbols(filteredExports, activeCompletionSession); + } + } else { isMemberCompletion = false; isNewIdentifierLocation = isNewIdentifierDefinitionLocation(previousToken); @@ -27389,31 +28416,47 @@ var ts; log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start)); return result; } + function showCompletionsInImportsClause(node) { + if (node) { + if (node.kind === 14 || node.kind === 23) { + return node.parent.kind === 206; + } + } + return false; + } function isNewIdentifierDefinitionLocation(previousToken) { if (previousToken) { var containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case 23: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 151 + || containingNodeKind === 167; case 16: - return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159; + return containingNodeKind === 155 + || containingNodeKind === 133 + || containingNodeKind === 156 + || containingNodeKind === 159; case 18: return containingNodeKind === 151; - case 117: + case 116: return true; case 20: return containingNodeKind === 200; case 14: return containingNodeKind === 196; case 52: - return containingNodeKind === 193 || containingNodeKind === 167; + return containingNodeKind === 193 + || containingNodeKind === 167; case 11: return containingNodeKind === 169; case 12: return containingNodeKind === 173; - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 130; } switch (previousToken.getText()) { @@ -27426,7 +28469,9 @@ var ts; return false; } function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) { - if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) { + if (previousToken.kind === 8 + || previousToken.kind === 9 + || ts.isTemplateLiteralKind(previousToken.kind)) { var start = previousToken.getStart(); var end = previousToken.getEnd(); if (start < position && position < end) { @@ -27504,27 +28549,27 @@ var ts; containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind); - case 110: + case 109: return containingNodeKind === 130; case 21: return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149); - case 109: - case 107: case 108: + case 106: + case 107: return containingNodeKind === 128; case 68: case 76: - case 104: + case 103: case 82: case 97: - case 116: - case 120: + case 115: + case 119: case 84: - case 105: + case 104: case 69: - case 111: + case 110: return true; } switch (previousToken.getText()) { @@ -27549,6 +28594,23 @@ var ts; } return false; } + function filterModuleExports(exports, importDeclaration) { + var exisingImports = {}; + if (!importDeclaration.importClause) { + return exports; + } + if (importDeclaration.importClause.namedBindings && + importDeclaration.importClause.namedBindings.kind === 206) { + ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) { + var name = el.propertyName || el.name; + exisingImports[name.text] = true; + }); + } + if (ts.isEmpty(exisingImports)) { + return exports; + } + return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); }); + } function filterContextualMembersList(contextualMemberSymbols, existingMembers) { if (!existingMembers || existingMembers.length === 0) { return contextualMemberSymbols; @@ -27695,7 +28757,9 @@ var ts; return ScriptElementKind.unknown; } function getSymbolModifiers(symbol) { - return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none; + return symbol && symbol.declarations && symbol.declarations.length > 0 + ? ts.getNodeModifiers(symbol.declarations[0]) + : ScriptElementKindModifier.none; } function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) { if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); } @@ -27779,7 +28843,7 @@ var ts; } } else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || - (location.kind === 114 && location.parent.kind === 133)) { + (location.kind === 113 && location.parent.kind === 133)) { var signature; var functionDeclaration = location.parent; var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures(); @@ -27810,14 +28874,14 @@ var ts; } if ((symbolFlags & 64) && (semanticMeaning & 2)) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(104)); + displayParts.push(ts.keywordPart(103)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); writeTypeParametersOfSymbol(symbol, sourceFile); } if (symbolFlags & 524288) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(123)); + displayParts.push(ts.keywordPart(122)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); displayParts.push(ts.spacePart()); @@ -27837,7 +28901,7 @@ var ts; } if (symbolFlags & 1536) { addNewLineIfDisplayPartsExist(); - displayParts.push(ts.keywordPart(117)); + displayParts.push(ts.keywordPart(116)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); } @@ -27893,7 +28957,7 @@ var ts; displayParts.push(ts.spacePart()); displayParts.push(ts.operatorPart(52)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(118)); + displayParts.push(ts.keywordPart(117)); displayParts.push(ts.punctuationPart(16)); displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), 8)); displayParts.push(ts.punctuationPart(17)); @@ -28056,6 +29120,12 @@ var ts; if (!symbol) { return undefined; } + if (symbol.flags & 8388608) { + var declaration = symbol.declarations[0]; + if (node.kind === 64 && node.parent === declaration) { + symbol = typeInfoResolver.getAliasedSymbol(symbol); + } + } var result = []; if (node.parent.kind === 218) { var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); @@ -28112,7 +29182,7 @@ var ts; return false; } function tryAddConstructSignature(symbol, location, symbolKind, symbolName, containerName, result) { - if (isNewExpressionTarget(location) || location.kind === 114) { + if (isNewExpressionTarget(location) || location.kind === 113) { if (symbol.flags & 32) { var classDeclaration = symbol.getDeclarations()[0]; ts.Debug.assert(classDeclaration && classDeclaration.kind === 196); @@ -28197,13 +29267,13 @@ var ts; return getLoopBreakContinueOccurrences(node.parent); } break; - case 114: + case 113: if (hasKind(node.parent, 133)) { return getConstructorOccurrences(node.parent); } break; - case 116: - case 120: + case 115: + case 119: if (hasKind(node.parent, 134) || hasKind(node.parent, 135)) { return getGetAndSetOccurrences(node.parent); } @@ -28308,7 +29378,7 @@ var ts; aggregate(tryStatement.finallyBlock); } } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28401,7 +29471,7 @@ var ts; if (node.kind === 185 || node.kind === 184) { statementAccumulator.push(node); } - else if (!ts.isAnyFunction(node)) { + else if (!ts.isFunctionLike(node)) { ts.forEachChild(node, aggregate); } } @@ -28428,7 +29498,7 @@ var ts; } break; default: - if (ts.isAnyFunction(node)) { + if (ts.isFunctionLike(node)) { return undefined; } break; @@ -28441,7 +29511,7 @@ var ts; var keywords = []; ts.forEach(declarations, function (declaration) { ts.forEach(declaration.getChildren(), function (token) { - return pushKeywordIf(keywords, token, 114); + return pushKeywordIf(keywords, token, 113); }); }); return ts.map(keywords, getReferenceEntryFromNode); @@ -28454,7 +29524,7 @@ var ts; function tryPushAccessorKeyword(accessorSymbol, accessorKind) { var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { - ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 116, 120); }); + ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); }); } } } @@ -28512,17 +29582,17 @@ var ts; return ts.map(keywords, getReferenceEntryFromNode); function getFlagFromModifier(modifier) { switch (modifier) { - case 109: - return 16; - case 107: - return 32; case 108: + return 16; + case 106: + return 32; + case 107: return 64; - case 110: + case 109: return 128; case 77: return 1; - case 115: + case 114: return 2; default: ts.Debug.fail(); @@ -28568,24 +29638,6 @@ var ts; ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8); return getReferencesForNode(node, program.getSourceFiles(), false, findInStrings, findInComments); } - function initializeNameTable(sourceFile) { - var nameTable = {}; - walk(sourceFile); - sourceFile.nameTable = nameTable; - function walk(node) { - switch (node.kind) { - case 64: - nameTable[node.text] = node.text; - break; - case 8: - case 7: - nameTable[node.text] = node.text; - break; - default: - ts.forEachChild(node, walk); - } - } - } function getReferencesForNode(node, sourceFiles, searchOnlyInCurrentFile, findInStrings, findInComments) { if (isLabelName(node)) { if (isJumpStatementTarget(node)) { @@ -28612,7 +29664,7 @@ var ts; } var result; var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); - var declaredName = getDeclaredName(symbol); + var declaredName = getDeclaredName(symbol, node); var scope = getSymbolScope(symbol); if (scope) { result = []; @@ -28625,14 +29677,11 @@ var ts; getReferencesInNode(sourceFiles[0], symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } else { - var internedName = getInternedName(symbol, declarations); + var internedName = getInternedName(symbol, node, declarations); ts.forEach(sourceFiles, function (sourceFile) { cancellationToken.throwIfCancellationRequested(); - if (!sourceFile.nameTable) { - initializeNameTable(sourceFile); - } - ts.Debug.assert(sourceFile.nameTable !== undefined); - if (ts.lookUp(sourceFile.nameTable, internedName)) { + var nameTable = getNameTable(sourceFile); + if (ts.lookUp(nameTable, internedName)) { result = result || []; getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result); } @@ -28640,11 +29689,31 @@ var ts; } } return result; - function getDeclaredName(symbol) { + function isImportOrExportSpecifierName(location) { + return location.parent && + (location.parent.kind === 207 || location.parent.kind === 211) && + location.parent.propertyName === location; + } + function isImportOrExportSpecifierImportSymbol(symbol) { + return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) { + return declaration.kind === 207 || declaration.kind === 211; + }); + } + function getDeclaredName(symbol, location) { + var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; }); + if (functionExpression && functionExpression.name) { + var name = functionExpression.name.text; + } + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var name = typeInfoResolver.symbolToString(symbol); return stripQuotes(name); } - function getInternedName(symbol, declarations) { + function getInternedName(symbol, location, declarations) { + if (isImportOrExportSpecifierName(location)) { + return location.getText(); + } var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; }); if (functionExpression && functionExpression.name) { var name = functionExpression.name.text; @@ -28663,13 +29732,16 @@ var ts; return name; } function getSymbolScope(symbol) { - if (symbol.getFlags() && (4 | 8192)) { + if (symbol.flags & (4 | 8192)) { var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; }); if (privateDeclaration) { return ts.getAncestor(privateDeclaration, 196); } } - if (symbol.parent || (symbol.getFlags() & 268435456)) { + if (symbol.flags & 8388608) { + return undefined; + } + if (symbol.parent || (symbol.flags & 268435456)) { return undefined; } var scope = undefined; @@ -28920,6 +29992,9 @@ var ts; } function populateSearchSymbolSet(symbol, location) { var result = [symbol]; + if (isImportOrExportSpecifierImportSymbol(symbol)) { + result.push(typeInfoResolver.getAliasedSymbol(symbol)); + } if (isNameOfPropertyAssignment(location)) { ts.forEach(getPropertySymbolsFromContextualType(location), function (contextualSymbol) { result.push.apply(result, typeInfoResolver.getRootSymbols(contextualSymbol)); @@ -28969,6 +30044,10 @@ var ts; if (searchSymbols.indexOf(referenceSymbol) >= 0) { return true; } + if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && + searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) { + return true; + } if (isNameOfPropertyAssignment(referenceLocation)) { return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) { return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; }); @@ -29047,7 +30126,7 @@ var ts; }; } function isWriteAccess(node) { - if (node.kind === 64 && ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + if (node.kind === 64 && ts.isDeclarationName(node)) { return true; } var parent = node.parent; @@ -29124,11 +30203,17 @@ var ts; else { return 4; } + case 206: + case 207: case 202: + case 203: + case 208: + case 209: return 1 | 2 | 4; case 220: return 4 | 1; } + return 1 | 2 | 4; ts.Debug.fail("Unknown declaration type"); } function isTypeReference(node) { @@ -29169,7 +30254,7 @@ var ts; else if (isInRightSideOfImport(node)) { return getMeaningFromRightHandSideOfImportEquals(node); } - else if (ts.isDeclarationOrFunctionExpressionOrCatchVariableName(node)) { + else if (ts.isDeclarationName(node)) { return getMeaningFromDeclaration(node.parent); } else if (isTypeReference(node)) { @@ -29678,6 +30763,41 @@ var ts; }; } ts.createLanguageService = createLanguageService; + function getNameTable(sourceFile) { + if (!sourceFile.nameTable) { + initializeNameTable(sourceFile); + } + return sourceFile.nameTable; + } + ts.getNameTable = getNameTable; + function initializeNameTable(sourceFile) { + var nameTable = {}; + walk(sourceFile); + sourceFile.nameTable = nameTable; + function walk(node) { + switch (node.kind) { + case 64: + nameTable[node.text] = node.text; + break; + case 8: + case 7: + if (ts.isDeclarationName(node) || + node.parent.kind === 212 || + isArgumentOfElementAccessExpression(node)) { + nameTable[node.text] = node.text; + } + break; + default: + ts.forEachChild(node, walk); + } + } + } + function isArgumentOfElementAccessExpression(node) { + return node && + node.parent && + node.parent.kind === 154 && + node.parent.argumentExpression === node; + } function createClassifier() { var scanner = ts.createScanner(2, false); var noRegexTable = []; @@ -29696,19 +30816,19 @@ var ts; var templateStack = []; function isAccessibilityModifier(kind) { switch (kind) { - case 109: - case 107: case 108: + case 106: + case 107: return true; } return false; } function canFollow(keyword1, keyword2) { if (isAccessibilityModifier(keyword1)) { - if (keyword2 === 116 || - keyword2 === 120 || - keyword2 === 114 || - keyword2 === 110) { + if (keyword2 === 115 || + keyword2 === 119 || + keyword2 === 113 || + keyword2 === 109) { return true; } return false; @@ -29773,11 +30893,11 @@ var ts; else if (token === 25 && angleBracketStack > 0) { angleBracketStack--; } - else if (token === 112 || - token === 121 || - token === 119 || - token === 113 || - token === 122) { + else if (token === 111 || + token === 120 || + token === 118 || + token === 112 || + token === 121) { if (angleBracketStack > 0 && !syntacticClassifierAbsent) { token = 64; } @@ -29828,7 +30948,9 @@ var ts; } if (numBackslashes & 1) { var quoteChar = tokenText.charCodeAt(0); - result.finalLexState = quoteChar === 34 ? 3 : 2; + result.finalLexState = quoteChar === 34 + ? 3 + : 2; } } } @@ -29991,7 +31113,7 @@ var ts; var BreakpointResolver; (function (BreakpointResolver) { function spanInSourceFileAtLocation(sourceFile, position) { - if (sourceFile.flags & 1024) { + if (sourceFile.flags & 2048) { return undefined; } var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position); @@ -30095,9 +31217,13 @@ var ts; case 190: return textSpan(node, node.expression); case 208: - return textSpan(node, node.exportName); + return textSpan(node, node.expression); case 202: return textSpan(node, node.moduleReference); + case 203: + return textSpan(node, node.moduleSpecifier); + case 209: + return textSpan(node, node.moduleSpecifier); case 200: if (ts.getModuleInstanceState(node) !== 1) { return undefined; @@ -30144,7 +31270,7 @@ var ts; if (node.parent.kind === 158 && node.parent.type === node) { return spanInNode(node.parent.expression); } - if (ts.isAnyFunction(node.parent) && node.parent.type === node) { + if (ts.isFunctionLike(node.parent) && node.parent.type === node) { return spanInPreviousNode(node); } return spanInNode(node.parent); @@ -30157,7 +31283,11 @@ var ts; } var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175; var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration); - var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined; + var declarations = isParentVariableStatement + ? variableDeclaration.parent.parent.declarationList.declarations + : isDeclarationOfForStatement + ? variableDeclaration.parent.parent.initializer.declarations + : undefined; if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) { if (declarations && declarations[0] === variableDeclaration) { if (isParentVariableStatement) { @@ -30317,7 +31447,7 @@ var ts; return spanInNode(node.parent); } function spanInColonToken(node) { - if (ts.isAnyFunction(node.parent) || node.parent.kind === 217) { + if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) { return spanInPreviousNode(node); } return spanInNode(node.parent); diff --git a/bin/typescriptServices_internal.d.ts b/bin/typescriptServices_internal.d.ts index 16616795233..2cd2257c3e1 100644 --- a/bin/typescriptServices_internal.d.ts +++ b/bin/typescriptServices_internal.d.ts @@ -87,12 +87,6 @@ declare module ts { function combinePaths(path1: string, path2: string): string; function fileExtensionIs(path: string, extension: string): boolean; function removeFileExtension(path: string): string; - /** - * Based heavily on the abstract 'Quote' operation from ECMA-262 (24.3.2.2), - * but augmented for a few select characters. - * Note that this doesn't actually wrap the input in double quotes. - */ - function escapeString(s: string): string; function getDefaultLibFileName(options: CompilerOptions): string; interface ObjectAllocator { getNodeConstructor(kind: SyntaxKind): new () => Node; @@ -143,6 +137,11 @@ declare module ts { diagnosticMessage?: DiagnosticMessage; isNoDefaultLib?: boolean; } + interface SynthesizedNode extends Node { + leadingCommentRanges?: CommentRange[]; + trailingCommentRanges?: CommentRange[]; + startsOnNewLine: boolean; + } function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration; interface StringSymbolWriter extends SymbolWriter { string(): string; @@ -171,10 +170,12 @@ declare module ts { function escapeIdentifier(identifier: string): string; function unescapeIdentifier(identifier: string): string; function makeIdentifierFromModuleName(moduleName: string): string; + function isBlockOrCatchScoped(declaration: Declaration): boolean; + function isCatchClauseVariableDeclaration(declaration: Declaration): boolean; function declarationNameToString(name: DeclarationName): string; function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic; function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): Diagnostic; - function getErrorSpanForNode(node: Node): Node; + function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan; function isExternalModule(file: SourceFile): boolean; function isDeclarationFile(file: SourceFile): boolean; function isConstEnumDeclaration(node: Node): boolean; @@ -186,7 +187,7 @@ declare module ts { function getJsDocComments(node: Node, sourceFileOfNode: SourceFile): CommentRange[]; var fullTripleSlashReferencePathRegEx: RegExp; function forEachReturnStatement(body: Block, visitor: (stmt: ReturnStatement) => T): T; - function isAnyFunction(node: Node): boolean; + function isFunctionLike(node: Node): boolean; function isFunctionBlock(node: Node): boolean; function isObjectLiteralMethod(node: Node): boolean; function getContainingFunction(node: Node): FunctionLikeDeclaration; @@ -209,7 +210,7 @@ declare module ts { function isInAmbientContext(node: Node): boolean; function isDeclaration(node: Node): boolean; function isStatement(n: Node): boolean; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name: Node): boolean; + function isDeclarationName(name: Node): boolean; function getClassBaseTypeNode(node: ClassDeclaration): TypeReferenceNode; function getClassImplementedTypeNodes(node: ClassDeclaration): NodeArray; function getInterfaceBaseTypeNodes(node: InterfaceDeclaration): NodeArray; @@ -265,6 +266,18 @@ declare module ts { * Vn. */ function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange; + function nodeStartsNewLexicalEnvironment(n: Node): boolean; + function nodeIsSynthesized(node: Node): boolean; + function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node; + function generateUniqueName(baseName: string, isExistingName: (name: string) => boolean): string; + function createDiagnosticCollection(): DiagnosticCollection; + /** + * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2), + * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine) + * Note that this doesn't actually wrap the input in double quotes. + */ + function escapeString(s: string): string; + function escapeNonAsciiCharacters(s: string): string; } declare module ts { var optionDeclarations: CommandLineOption[]; diff --git a/bin/typescript_internal.d.ts b/bin/typescript_internal.d.ts index aaa72fa2254..e2e18df5726 100644 --- a/bin/typescript_internal.d.ts +++ b/bin/typescript_internal.d.ts @@ -87,12 +87,6 @@ declare module "typescript" { function combinePaths(path1: string, path2: string): string; function fileExtensionIs(path: string, extension: string): boolean; function removeFileExtension(path: string): string; - /** - * Based heavily on the abstract 'Quote' operation from ECMA-262 (24.3.2.2), - * but augmented for a few select characters. - * Note that this doesn't actually wrap the input in double quotes. - */ - function escapeString(s: string): string; function getDefaultLibFileName(options: CompilerOptions): string; interface ObjectAllocator { getNodeConstructor(kind: SyntaxKind): new () => Node; @@ -143,6 +137,11 @@ declare module "typescript" { diagnosticMessage?: DiagnosticMessage; isNoDefaultLib?: boolean; } + interface SynthesizedNode extends Node { + leadingCommentRanges?: CommentRange[]; + trailingCommentRanges?: CommentRange[]; + startsOnNewLine: boolean; + } function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration; interface StringSymbolWriter extends SymbolWriter { string(): string; @@ -171,10 +170,12 @@ declare module "typescript" { function escapeIdentifier(identifier: string): string; function unescapeIdentifier(identifier: string): string; function makeIdentifierFromModuleName(moduleName: string): string; + function isBlockOrCatchScoped(declaration: Declaration): boolean; + function isCatchClauseVariableDeclaration(declaration: Declaration): boolean; function declarationNameToString(name: DeclarationName): string; function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic; function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): Diagnostic; - function getErrorSpanForNode(node: Node): Node; + function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan; function isExternalModule(file: SourceFile): boolean; function isDeclarationFile(file: SourceFile): boolean; function isConstEnumDeclaration(node: Node): boolean; @@ -186,7 +187,7 @@ declare module "typescript" { function getJsDocComments(node: Node, sourceFileOfNode: SourceFile): CommentRange[]; var fullTripleSlashReferencePathRegEx: RegExp; function forEachReturnStatement(body: Block, visitor: (stmt: ReturnStatement) => T): T; - function isAnyFunction(node: Node): boolean; + function isFunctionLike(node: Node): boolean; function isFunctionBlock(node: Node): boolean; function isObjectLiteralMethod(node: Node): boolean; function getContainingFunction(node: Node): FunctionLikeDeclaration; @@ -209,7 +210,7 @@ declare module "typescript" { function isInAmbientContext(node: Node): boolean; function isDeclaration(node: Node): boolean; function isStatement(n: Node): boolean; - function isDeclarationOrFunctionExpressionOrCatchVariableName(name: Node): boolean; + function isDeclarationName(name: Node): boolean; function getClassBaseTypeNode(node: ClassDeclaration): TypeReferenceNode; function getClassImplementedTypeNodes(node: ClassDeclaration): NodeArray; function getInterfaceBaseTypeNodes(node: InterfaceDeclaration): NodeArray; @@ -265,6 +266,18 @@ declare module "typescript" { * Vn. */ function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange; + function nodeStartsNewLexicalEnvironment(n: Node): boolean; + function nodeIsSynthesized(node: Node): boolean; + function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node; + function generateUniqueName(baseName: string, isExistingName: (name: string) => boolean): string; + function createDiagnosticCollection(): DiagnosticCollection; + /** + * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2), + * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine) + * Note that this doesn't actually wrap the input in double quotes. + */ + function escapeString(s: string): string; + function escapeNonAsciiCharacters(s: string): string; } declare module "typescript" { var optionDeclarations: CommandLineOption[]; From 50954ac0cc58d6a831bdee7b8460f5affe90f2a2 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 7 Mar 2015 14:07:39 -0800 Subject: [PATCH 065/251] Update LKG --- bin/tsc.js | 462 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 339 insertions(+), 123 deletions(-) diff --git a/bin/tsc.js b/bin/tsc.js index 573d07360c9..32d4e894340 100644 --- a/bin/tsc.js +++ b/bin/tsc.js @@ -248,7 +248,9 @@ var ts; } ts.localizedDiagnosticMessages = undefined; function getLocaleSpecificMessage(message) { - return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message; + return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] + ? ts.localizedDiagnosticMessages[message] + : message; } ts.getLocaleSpecificMessage = getLocaleSpecificMessage; function createFileDiagnostic(file, start, length, message) { @@ -1486,11 +1488,15 @@ var ts; return false; } function isUnicodeIdentifierStart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierStart) : + lookupInUnicodeMap(code, unicodeES3IdentifierStart); } ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart; function isUnicodeIdentifierPart(code, languageVersion) { - return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart); + return languageVersion >= 1 ? + lookupInUnicodeMap(code, unicodeES5IdentifierPart) : + lookupInUnicodeMap(code, unicodeES3IdentifierPart); } function makeReverseMap(source) { var result = []; @@ -2733,7 +2739,9 @@ var ts; if (errorNode === undefined) { return getSpanOfTokenAtPosition(sourceFile, node.pos); } - var pos = nodeIsMissing(errorNode) ? errorNode.pos : ts.skipTrivia(sourceFile.text, errorNode.pos); + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : ts.skipTrivia(sourceFile.text, errorNode.pos); return createTextSpanFromBounds(pos, errorNode.end); } ts.getErrorSpanForNode = getErrorSpanForNode; @@ -3582,7 +3590,9 @@ var ts; } var nonAsciiCharacters = /[^\u0000-\u007F]/g; function escapeNonAsciiCharacters(s) { - return nonAsciiCharacters.test(s) ? s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : s; + return nonAsciiCharacters.test(s) ? + s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : + s; } ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; })(ts || (ts = {})); @@ -4354,7 +4364,9 @@ var ts; var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length; var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode; var saveContextFlags = contextFlags; - var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback); + var result = isLookAhead + ? scanner.lookAhead(callback) + : scanner.tryScan(callback); ts.Debug.assert(saveContextFlags === contextFlags); if (!result || isLookAhead) { token = saveToken; @@ -4538,7 +4550,10 @@ var ts; return canFollowModifier(); } function canFollowModifier() { - return token === 18 || token === 14 || token === 35 || isLiteralPropertyName(); + return token === 18 + || token === 14 + || token === 35 + || isLiteralPropertyName(); } function nextTokenIsClassOrFunction() { nextToken(); @@ -4978,7 +4993,9 @@ var ts; var tokenPos = scanner.getTokenPos(); nextToken(); finishNode(node); - if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { + if (node.kind === 7 + && sourceText.charCodeAt(tokenPos) === 48 + && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { node.flags |= 16384; } return node; @@ -5017,7 +5034,9 @@ var ts; } function parseParameterType() { if (parseOptional(51)) { - return token === 8 ? parseLiteralNode(true) : parseType(); + return token === 8 + ? parseLiteralNode(true) + : parseType(); } return undefined; } @@ -5187,7 +5206,9 @@ var ts; case 24: return parseSignatureMember(136); case 18: - return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature(); + return isIndexSignature() + ? parseIndexSignatureDeclaration(undefined) + : parsePropertyOrMethodSignature(); case 87: if (lookAhead(isStartOfConstructSignature)) { return parseSignatureMember(137); @@ -5209,7 +5230,9 @@ var ts; } function parseIndexSignatureWithModifiers() { var modifiers = parseModifiers(); - return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined; + return isIndexSignature() + ? parseIndexSignatureDeclaration(modifiers) + : undefined; } function isStartOfConstructSignature() { nextToken(); @@ -5498,7 +5521,9 @@ var ts; if (triState === 0) { return undefined; } - var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); + var arrowFunction = triState === 1 + ? parseParenthesizedArrowFunctionExpressionHead(true) + : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); if (!arrowFunction) { return undefined; } @@ -5720,7 +5745,9 @@ var ts; return expression; } function parseLeftHandSideExpressionOrHigher() { - var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher(); + var expression = token === 90 + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); return parseCallExpressionRest(expression); } function parseMemberExpressionOrHigher() { @@ -5774,7 +5801,9 @@ var ts; if (token === 10 || token === 11) { var tagExpression = createNode(157, expression.pos); tagExpression.tag = expression; - tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression(); + tagExpression.template = token === 10 + ? parseLiteralNode() + : parseTemplateExpression(); expression = finishNode(tagExpression); continue; } @@ -5820,7 +5849,9 @@ var ts; if (!parseExpected(25)) { return undefined; } - return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined; + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } function canFollowTypeArgumentsInExpression() { switch (token) { @@ -5895,7 +5926,9 @@ var ts; return finishNode(node); } function parseArgumentOrArrayLiteralElement() { - return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher(); + return token === 21 ? parseSpreadElement() : + token === 23 ? createNode(172) : + parseAssignmentExpressionOrHigher(); } function parseArgumentExpression() { return allowInAnd(parseArgumentOrArrayLiteralElement); @@ -6560,7 +6593,9 @@ var ts; node.typeParameters = parseTypeParameters(); node.heritageClauses = parseHeritageClauses(true); if (parseExpected(14)) { - node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers(); + node.members = inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseClassMembers) + : parseClassMembers(); parseExpected(15); } else { @@ -6570,7 +6605,9 @@ var ts; } function parseHeritageClauses(isClassHeritageClause) { if (isHeritageClause()) { - return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker(); + return isClassHeritageClause && inGeneratorParameterContext() + ? doOutsideOfYieldContext(parseHeritageClausesWorker) + : parseHeritageClausesWorker(); } return undefined; } @@ -6649,7 +6686,9 @@ var ts; setModifiers(node, modifiers); node.flags |= flags; node.name = parseIdentifier(); - node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock(); + node.body = parseOptional(20) + ? parseInternalModuleTail(getNodePos(), undefined, 1) + : parseModuleBlock(); return finishNode(node); } function parseAmbientExternalModuleDeclaration(fullStart, modifiers) { @@ -6661,7 +6700,9 @@ var ts; } function parseModuleDeclaration(fullStart, modifiers) { parseExpected(116); - return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); + return token === 8 + ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) + : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0); } function isExternalModuleReference() { return token === 117 && @@ -6715,7 +6756,9 @@ var ts; return finishNode(importClause); } function parseModuleReference() { - return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false); + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(false); } function parseExternalModuleReference() { var node = createNode(212); @@ -6905,7 +6948,9 @@ var ts; return parseSourceElementOrModuleElement(); } function parseSourceElementOrModuleElement() { - return isDeclarationStart() ? parseDeclaration() : parseStatement(); + return isDeclarationStart() + ? parseDeclaration() + : parseStatement(); } function processReferenceComments(sourceFile) { var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText); @@ -6963,7 +7008,13 @@ var ts; } function setExternalModuleIndicator(sourceFile) { sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) { - return node.flags & 1 || node.kind === 202 && node.moduleReference.kind === 212 || node.kind === 203 || node.kind === 208 || node.kind === 209 ? node : undefined; + return node.flags & 1 + || node.kind === 202 && node.moduleReference.kind === 212 + || node.kind === 203 + || node.kind === 208 + || node.kind === 209 + ? node + : undefined; }); } } @@ -7125,7 +7176,9 @@ var ts; if (node.name) { node.name.parent = node; } - var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = symbol.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 + : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(symbol.declarations, function (declaration) { file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); }); @@ -7588,7 +7641,9 @@ var ts; return emitResolver; } function error(location, message, arg0, arg1, arg2) { - var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); + var diagnostic = location + ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) + : ts.createCompilerDiagnostic(message, arg0, arg1, arg2); diagnostics.add(diagnostic); } function createSymbol(flags, name) { @@ -7674,7 +7729,8 @@ var ts; recordMergedSymbol(target, source); } else { - var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; + var message = target.flags & 2 || source.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0; ts.forEach(source.declarations, function (node) { error(node.name ? node.name : node, message, symbolToString(source)); }); @@ -7913,7 +7969,9 @@ var ts; return getExternalModuleMember(node.parent.parent.parent, node); } function getTargetOfExportSpecifier(node) { - return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); + return node.parent.parent.moduleSpecifier ? + getExternalModuleMember(node.parent.parent, node) : + resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536); } function getTargetOfExportAssignment(node) { return resolveEntityName(node.expression, 107455 | 793056 | 1536); @@ -8128,7 +8186,9 @@ var ts; return getMergedSymbol(symbol.parent); } function getExportSymbolOfValueSymbolIfExported(symbol) { - return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol; + return symbol && (symbol.flags & 1048576) !== 0 + ? getMergedSymbol(symbol.exportSymbol) + : symbol; } function symbolIsValue(symbol) { if (symbol.flags & 16777216) { @@ -9045,7 +9105,9 @@ var ts; return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes); } function getTypeFromBindingPattern(pattern) { - return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern); + return pattern.kind === 148 + ? getTypeFromObjectBindingPattern(pattern) + : getTypeFromArrayBindingPattern(pattern); } function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) { var type = getTypeForVariableLikeDeclaration(declaration); @@ -9089,7 +9151,9 @@ var ts; else if (links.type === resolvingType) { links.type = anyType; if (compilerOptions.noImplicitAny) { - var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; + var diagnostic = symbol.valueDeclaration.type ? + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : + ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer; error(symbol.valueDeclaration, diagnostic, symbolToString(symbol)); } } @@ -9469,7 +9533,8 @@ var ts; var baseType = classType.baseTypes[0]; var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1); return ts.map(baseSignatures, function (baseSignature) { - var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); + var signature = baseType.flags & 4096 ? + getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature); signature.typeParameters = classType.typeParameters; signature.resolvedReturnType = classType; return signature; @@ -9764,7 +9829,8 @@ var ts; var links = getNodeLinks(declaration); if (!links.resolvedSignature) { var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined; - var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; + var typeParameters = classType ? classType.typeParameters : + declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined; var parameters = []; var hasStringLiterals = false; var minArgumentCount = -1; @@ -9923,7 +9989,9 @@ var ts; } function getIndexTypeOfSymbol(symbol, kind) { var declaration = getIndexDeclarationOfSymbol(symbol, kind); - return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined; + return declaration + ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType + : undefined; } function getConstraintOfTypeParameter(type) { if (!type.constraint) { @@ -10387,7 +10455,8 @@ var ts; return mapper(type); } if (type.flags & 32768) { - return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type; + return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? + instantiateAnonymousType(type, mapper) : type; } if (type.flags & 4096) { return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType)); @@ -11186,7 +11255,9 @@ var ts; var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type; break; case 128: - var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; + var diagnostic = declaration.dotDotDotToken ? + ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : + ts.Diagnostics.Parameter_0_implicitly_has_an_1_type; break; case 195: case 132: @@ -11287,7 +11358,9 @@ var ts; for (var i = 0; i < typeParameters.length; i++) { if (target === typeParameters[i]) { var inferences = context.inferences[i]; - var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []); + var candidates = inferiority ? + inferences.secondary || (inferences.secondary = []) : + inferences.primary || (inferences.primary = []); if (!ts.contains(candidates, source)) candidates.push(source); break; @@ -11831,19 +11904,19 @@ var ts; if (container.flags & 128) { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135; + container.kind === 131 || + container.kind === 134 || + container.kind === 135; } else { canUseSuperExpression = container.kind === 132 || - container.kind === 131 || - container.kind === 134 || - container.kind === 135 || - container.kind === 130 || - container.kind === 129 || - container.kind === 133; + container.kind === 131 || + container.kind === 134 || + container.kind === 135 || + container.kind === 130 || + container.kind === 129 || + container.kind === 133; } } } @@ -12028,7 +12101,9 @@ var ts; var type = getContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); - return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1) || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); + return getTypeOfPropertyOfContextualType(type, "" + index) + || getIndexTypeOfContextualType(type, 1) + || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined); } return undefined; } @@ -12092,7 +12167,9 @@ var ts; } function getContextualSignature(node) { ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node)); - var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node); + var type = ts.isObjectLiteralMethod(node) + ? getContextualTypeForObjectLiteralMethod(node) + : getContextualType(node); if (!type) { return undefined; } @@ -12218,7 +12295,9 @@ var ts; } else { ts.Debug.assert(memberDecl.kind === 218); - var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper); + var type = memberDecl.name.kind === 126 + ? unknownType + : checkExpression(memberDecl.name, contextualMapper); } typeFlags |= type.flags; var prop = createSymbol(4 | 67108864 | member.flags, member.name); @@ -12334,7 +12413,9 @@ var ts; return anyType; } function isValidPropertyAccess(node, propertyName) { - var left = node.kind === 153 ? node.expression : node.left; + var left = node.kind === 153 + ? node.expression + : node.left; var type = checkExpressionOrQualifiedName(left); if (type !== unknownType && type !== anyType) { var prop = getPropertyOfType(getWidenedType(type), propertyName); @@ -12628,7 +12709,9 @@ var ts; var arg = args[i]; if (arg.kind !== 172) { var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i); - var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); + var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : + arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : + checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) { return false; } @@ -12920,9 +13003,13 @@ var ts; } function getTypeAtPosition(signature, pos) { if (pos >= 0) { - return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; + return signature.hasRestParameter ? + pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; } - return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType; + return signature.hasRestParameter ? + getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : + anyArrayType; } function assignContextualParameterTypes(signature, context, mapper) { var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0); @@ -13224,9 +13311,10 @@ var ts; var p = properties[i]; if (p.kind === 217 || p.kind === 218) { var name = p.name; - var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || - getIndexTypeOfType(sourceType, 0); + var type = sourceType.flags & 1 ? sourceType : + getTypeOfPropertyOfType(sourceType, name.text) || + isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || + getIndexTypeOfType(sourceType, 0); if (type) { checkDestructuringAssignment(p.initializer || name, type); } @@ -13251,7 +13339,9 @@ var ts; if (e.kind !== 172) { if (e.kind !== 171) { var propName = "" + i; - var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1); + var type = sourceType.flags & 1 ? sourceType : + isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : + getIndexTypeOfType(sourceType, 1); if (type) { checkDestructuringAssignment(e, type, contextualMapper); } @@ -13399,7 +13489,9 @@ var ts; return rightType; } function checkForDisallowedESSymbolOperand(operator) { - var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined; + var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : + someConstituentTypeHasKind(rightType, 1048576) ? node.right : + undefined; if (offendingSymbolOperand) { error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator)); return false; @@ -13510,8 +13602,8 @@ var ts; } if (isConstEnumObjectType(type)) { var ok = (node.parent.kind === 153 && node.parent.expression === node) || - (node.parent.kind === 154 && node.parent.expression === node) || - ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); + (node.parent.kind === 154 && node.parent.expression === node) || + ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node)); if (!ok) { error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment); } @@ -13736,7 +13828,7 @@ var ts; if (ts.getClassBaseTypeNode(node.parent)) { if (containsSuperCall(node.body)) { var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || - ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); + ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); }); if (superCallShouldBeFirst) { var statements = node.body.statements; if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) { @@ -14058,7 +14150,9 @@ var ts; case 197: return 2097152; case 200: - return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304; + return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 + ? 4194304 | 1048576 + : 4194304; case 196: case 199: return 2097152 | 1048576; @@ -14075,9 +14169,9 @@ var ts; function checkFunctionDeclaration(node) { if (produceDiagnostics) { checkFunctionLikeDeclaration(node) || - checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || - checkGrammarFunctionName(node.name) || - checkGrammarForGenerator(node); + checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || + checkGrammarFunctionName(node.name) || + checkGrammarForGenerator(node); checkCollisionWithCapturedSuperVariable(node, node.name); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); @@ -14211,11 +14305,11 @@ var ts; if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) { var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194); var container = varDeclList.parent.kind === 175 && - varDeclList.parent.parent; + varDeclList.parent.parent; var namesShareScope = container && - (container.kind === 174 && ts.isFunctionLike(container.parent) || - (container.kind === 201 && container.kind === 200) || - container.kind === 220); + (container.kind === 174 && ts.isFunctionLike(container.parent) || + (container.kind === 201 && container.kind === 200) || + container.kind === 220); if (!namesShareScope) { var name = symbolToString(localDeclarationSymbol); error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); @@ -14445,7 +14539,9 @@ var ts; ts.Debug.assert(languageVersion >= 2); var iteratedType = getIteratedType(iterable, expressionForError); if (expressionForError && iteratedType) { - var completeIterableType = globalIterableType !== emptyObjectType ? createTypeReference(globalIterableType, [iteratedType]) : emptyObjectType; + var completeIterableType = globalIterableType !== emptyObjectType + ? createTypeReference(globalIterableType, [iteratedType]) + : emptyObjectType; checkTypeAssignableTo(iterable, completeIterableType, expressionForError); } return iteratedType; @@ -14677,7 +14773,9 @@ var ts; errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0]; } if (errorNode && !isTypeAssignableTo(propertyType, indexType)) { - var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; + var errorMessage = indexKind === 0 + ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 + : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2; error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType)); } } @@ -15100,7 +15198,10 @@ var ts; checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); var symbol = getSymbolOfNode(node); - if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { + if (symbol.flags & 512 + && symbol.declarations.length > 1 + && !ts.isInAmbientContext(node) + && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) { var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); if (classOrFunc) { if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) { @@ -15136,7 +15237,9 @@ var ts; } var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8; if (node.parent.kind !== 220 && !inAmbientExternalModule) { - error(moduleName, node.kind === 209 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); + error(moduleName, node.kind === 209 ? + ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : + ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module); return false; } if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) { @@ -15150,10 +15253,12 @@ var ts; var target = resolveAlias(symbol); if (target !== unknownSymbol) { var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | - (symbol.flags & 793056 ? 793056 : 0) | - (symbol.flags & 1536 ? 1536 : 0); + (symbol.flags & 793056 ? 793056 : 0) | + (symbol.flags & 1536 ? 1536 : 0); if (target.flags & excludedMeanings) { - var message = node.kind === 211 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; + var message = node.kind === 211 ? + ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : + ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; error(node, message, symbolToString(symbol)); } } @@ -15737,7 +15842,9 @@ var ts; return getSymbolOfNode(node.parent); } if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) { - return node.parent.kind === 208 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node); + return node.parent.kind === 208 + ? getSymbolOfEntityNameOrPropertyAccessExpression(node) + : getSymbolOfPartOfRightHandSideOfImportEquals(node); } switch (node.kind) { case 64: @@ -15930,7 +16037,8 @@ var ts; } function generateNameForImportOrExportDeclaration(node) { var expr = ts.getExternalModuleName(node); - var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; + var baseName = expr.kind === 8 ? + ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module"; assignGeneratedName(node, makeUniqueName(baseName)); } function generateNameForImportDeclaration(node) { @@ -16056,7 +16164,9 @@ var ts; } function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) { var symbol = getSymbolOfNode(declaration); - var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType; + var type = symbol && !(symbol.flags & (2048 | 131072)) + ? getTypeOfSymbol(symbol) + : unknownType; getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) { @@ -16078,13 +16188,15 @@ var ts; return undefined; } var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || - n.parent.kind === 150 ? getSymbolOfNode(n.parent) : undefined; + n.parent.kind === 150 + ? getSymbolOfNode(n.parent) + : undefined; var symbol = declarationSymbol || getNodeLinks(n).resolvedSymbol || resolveName(n, n.text, 2 | 8388608, undefined, undefined); var isLetOrConst = symbol && - (symbol.flags & 2) && - symbol.valueDeclaration.parent.kind !== 216; + (symbol.flags & 2) && + symbol.valueDeclaration.parent.kind !== 216; if (isLetOrConst) { getSymbolLinks(symbol); return symbol.id; @@ -16543,16 +16655,22 @@ var ts; var variableList = forInOrOfStatement.initializer; if (!checkGrammarVariableDeclarationList(variableList)) { if (variableList.declarations.length > 1) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement + : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic); } var firstDeclaration = variableList.declarations[0]; if (firstDeclaration.initializer) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer + : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; return grammarErrorOnNode(firstDeclaration.name, diagnostic); } if (firstDeclaration.type) { - var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; + var diagnostic = forInOrOfStatement.kind === 182 + ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation + : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; return grammarErrorOnNode(firstDeclaration, diagnostic); } } @@ -16659,7 +16777,8 @@ var ts; switch (current.kind) { case 189: if (node.label && current.label.text === node.label.text) { - var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true); + var isMisplacedContinueLabel = node.kind === 184 + && !isIterationStatement(current.statement, true); if (isMisplacedContinueLabel) { return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement); } @@ -16680,11 +16799,15 @@ var ts; current = current.parent; } if (node.label) { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement + : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } else { - var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; + var message = node.kind === 185 + ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement + : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } } @@ -17059,7 +17182,9 @@ var ts; var lineCount = ts.getLineStarts(currentSourceFile).length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { - var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); + var nextLineStart = (currentLine + 1) === lineCount + ? currentSourceFile.text.length + 1 + : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile); if (pos !== comment.pos) { if (firstCommentLineIndent === undefined) { firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); @@ -17137,7 +17262,8 @@ var ts; } else { ts.forEach(declarations, function (member) { - if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) { + if ((member.kind === 134 || member.kind === 135) + && (member.flags & 128) === (accessor.flags & 128)) { var memberName = ts.getPropertyNameForPropertyNameNode(member.name); var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name); if (memberName === accessorName) { @@ -17672,7 +17798,9 @@ var ts; function getHeritageClauseVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.parent.parent.kind === 196) { - diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; + diagnosticMessage = isImplementsList ? + ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : + ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; } else { diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; @@ -17765,17 +17893,31 @@ var ts; function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (node.kind === 193) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; } else if (node.kind === 130 || node.kind === 129) { if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; } } return diagnosticMessage !== undefined ? { @@ -17837,17 +17979,25 @@ var ts; } function getTypeAnnotationFromAccessor(accessor) { if (accessor) { - return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined; + return accessor.kind === 134 + ? accessor.type + : accessor.parameters.length > 0 + ? accessor.parameters[0].type + : undefined; } } function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) { var diagnosticMessage; if (accessorWithTypeAnnotation.kind === 135) { if (accessorWithTypeAnnotation.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; } return { diagnosticMessage: diagnosticMessage, @@ -17857,10 +18007,18 @@ var ts; } else { if (accessorWithTypeAnnotation.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; } return { diagnosticMessage: diagnosticMessage, @@ -17942,28 +18100,48 @@ var ts; var diagnosticMessage; switch (node.kind) { case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 138: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; break; case 132: case 131: if (node.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; } else if (node.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : + ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; break; default: ts.Debug.fail("This is unknown kind for signature: " + node.kind); @@ -18002,28 +18180,50 @@ var ts; var diagnosticMessage; switch (node.parent.kind) { case 133: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; break; case 137: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 136: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; break; case 132: case 131: if (node.parent.flags & 128) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } else if (node.parent.parent.kind === 196) { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; } else { - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } break; case 195: - diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === 2 ? + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : + ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; break; default: ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind); @@ -18075,7 +18275,11 @@ var ts; } } function writeReferencePath(referencedFile) { - var declFileName = referencedFile.flags & 2048 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var declFileName = referencedFile.flags & 2048 + ? referencedFile.fileName + : shouldEmitToOwnFile(referencedFile, compilerOptions) + ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") + : ts.removeFileExtension(compilerOptions.out) + ".d.ts"; declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false); referencePathsOutput += "/// " + newLine; } @@ -18368,7 +18572,9 @@ var ts; node.kind === 199) { if (node.name) { var name = node.name; - scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text; + scopeName = name.kind === 126 + ? ts.getTextOfNode(name) + : node.name.text; } recordScopeNameStart(scopeName); } @@ -18700,7 +18906,8 @@ var ts; if (node.template.kind === 169) { ts.forEach(node.template.templateSpans, function (templateSpan) { write(", "); - var needsParens = templateSpan.expression.kind === 167 && templateSpan.expression.operatorToken.kind === 23; + var needsParens = templateSpan.expression.kind === 167 + && templateSpan.expression.operatorToken.kind === 23; emitParenthesizedIf(templateSpan.expression, needsParens); }); } @@ -18711,7 +18918,8 @@ var ts; ts.forEachChild(node, emit); return; } - var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent); + var emitOuterParens = ts.isExpression(node.parent) + && templateNeedsParens(node, node.parent); if (emitOuterParens) { write("("); } @@ -18722,7 +18930,8 @@ var ts; } for (var i = 0; i < node.templateSpans.length; i++) { var templateSpan = node.templateSpans[i]; - var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; + var needsParens = templateSpan.expression.kind !== 159 + && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1; if (i > 0 || headEmitted) { write(" + "); } @@ -19923,7 +20132,7 @@ var ts; var initializer = node.initializer; if (!initializer && languageVersion < 2) { var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && - (getCombinedFlagsForIdentifier(node.name) & 4096); + (getCombinedFlagsForIdentifier(node.name) & 4096); if (isUninitializedLet && node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) { @@ -19987,7 +20196,9 @@ var ts; return; } var blockScopeContainer = getEnclosingBlockScopeContainer(node); - var parent = blockScopeContainer.kind === 220 ? blockScopeContainer : blockScopeContainer.parent; + var parent = blockScopeContainer.kind === 220 + ? blockScopeContainer + : blockScopeContainer.parent; var generatedName = generateUniqueNameForLocation(parent, node.text); var variableId = resolver.getBlockScopedVariableId(node); if (!generatedBlockScopeNames) { @@ -21360,7 +21571,9 @@ var ts; } catch (e) { if (onError) { - onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message); + onError(e.number === unsupportedFileEncodingErrorCode + ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText + : e.message); } text = ""; } @@ -21695,7 +21908,8 @@ var ts; (!options.out || firstExternalModuleSourceFile !== undefined))) { var commonPathComponents; ts.forEach(files, function (sourceFile) { - if (!(sourceFile.flags & 2048) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { + if (!(sourceFile.flags & 2048) + && !ts.fileExtensionIs(sourceFile.fileName, ".js")) { var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory()); sourcePathComponents.pop(); if (commonPathComponents) { @@ -22376,7 +22590,9 @@ var ts; } } if (compilerOptions.noEmit) { - return diagnostics.length ? 1 : 0; + return diagnostics.length + ? 1 + : 0; } var emitOutput = program.emit(); reportDiagnostics(emitOutput.diagnostics); From 8bef6d7ebc6a92aeabfe7b438f7a302ab3e89263 Mon Sep 17 00:00:00 2001 From: steveluc Date: Sat, 7 Mar 2015 15:44:21 -0800 Subject: [PATCH 066/251] Added additional cases for format on enter. These cases fix bugs in the orginal format on enter (which wasn't distinguishing whether there was existing whitespace to start some types of lines). --- src/server/session.ts | 48 ++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/src/server/session.ts b/src/server/session.ts index 7e9c6972a1f..5a91bcc08a1 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -463,17 +463,41 @@ module ts.server { var edits = compilerService.languageService.getFormattingEditsAfterKeystroke(file, position, key, compilerService.formatCodeOptions); if ((key == "\n") && ((!edits) || (edits.length == 0) || allEditsBeforePos(edits, position))) { - // TODO: get these options from host - var editorOptions: ts.EditorOptions = { - IndentSize: 4, - TabSize: 4, - NewLineCharacter: "\n", - ConvertTabsToSpaces: true, - }; - var indentPosition = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions); - var spaces = generateSpaces(indentPosition); - if (indentPosition > 0) { - edits.push({ span: ts.createTextSpanFromBounds(position, position), newText: spaces }); + var scriptInfo = compilerService.host.getScriptInfo(file); + if (scriptInfo) { + var lineInfo = scriptInfo.getLineInfo(line); + if (lineInfo && (lineInfo.leaf) && (lineInfo.leaf.text)) { + var lineText = lineInfo.leaf.text; + if (lineText.search("\\S") < 0) { + // TODO: get these options from host + var editorOptions: ts.EditorOptions = { + IndentSize: 4, + TabSize: 4, + NewLineCharacter: "\n", + ConvertTabsToSpaces: true, + }; + var indentPosition = + compilerService.languageService.getIndentationAtPosition(file, position, editorOptions); + for (var i = 0, len = lineText.length; i < len; i++) { + if (lineText.charAt(i) == " ") { + indentPosition--; + } + else { + break; + } + } + if (indentPosition > 0) { + var spaces = generateSpaces(indentPosition); + edits.push({ span: ts.createTextSpanFromBounds(position, position), newText: spaces }); + } + else if (indentPosition < 0) { + edits.push({ + span: ts.createTextSpanFromBounds(position, position - indentPosition), + newText: "" + }); + } + } + } } } @@ -491,7 +515,7 @@ module ts.server { }; }); } - + getCompletions(line: number, col: number, prefix: string, fileName: string): protocol.CompletionEntry[] { if (!prefix) { prefix = ""; From 9a45160ab64da5d1121aa806a8fb49fe01e3eb05 Mon Sep 17 00:00:00 2001 From: steveluc Date: Sat, 7 Mar 2015 17:13:52 -0800 Subject: [PATCH 067/251] Changed TypeScript server logging to use an environment variable TSS_LOG as follows. If TSS_LOG is not set, no logging will occur. If TSS_LOG is set to any value, logging will occur as before this change (log file will be in directory of tsserver.js with name .logPID where PID is the process id of the server process; log will contain the pre-change messages). If TSS_LOG is set to a string that has the form "-file fileName", the log file will be in the tsserver.js directory with name 'fileName'. If TSS_LOG is set to a string that has the form "-level levelName", then the level of logging will be set to 'levelName'. Currently the two levels are 'normal' and 'verbose'. The TSS_LOG string can contain zero, one or both of its options as in "-file LOG -level verbose". At the verbose level, the server will log every request, response and event, and will also give elapsed time for message processing. --- src/server/editorServices.ts | 2 ++ src/server/server.ts | 64 +++++++++++++++++++++++++++++++++--- src/server/session.ts | 17 +++++++++- 3 files changed, 78 insertions(+), 5 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 5ca4cb4d00f..3cb66fed297 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -5,6 +5,8 @@ module ts.server { export interface Logger { close(): void; + verbose(): boolean; + enabled(): boolean; perftrc(s: string): void; info(s: string): void; startGroup(): void; diff --git a/src/server/server.ts b/src/server/server.ts index c48ba951347..e5cc0fd398d 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -19,7 +19,7 @@ module ts.server { inGroup = false; firstInGroup = true; - constructor(public logFilename: string) { + constructor(public logFilename: string, public level: string) { } static padStringRight(str: string, padding: string) { @@ -51,9 +51,20 @@ module ts.server { this.firstInGroup = true; } + enabled() { + return !!this.logFilename; + } + + verbose() { + return this.enabled() && (this.level == "verbose"); + } + + msg(s: string, type = "Err") { if (this.fd < 0) { - this.fd = fs.openSync(this.logFilename, "w"); + if (this.logFilename) { + this.fd = fs.openSync(this.logFilename, "w"); + } } if (this.fd >= 0) { s = s + "\n"; @@ -173,17 +184,62 @@ module ts.server { }); rl.on('close',() => { - this.projectService.closeLog(); this.projectService.log("Exiting..."); + this.projectService.closeLog(); process.exit(0); }); } } + interface LogEnv { + file?: string; + level?: string; + } + + function parseLogEnv(logEnvStr: string): LogEnv { + var logEnv: LogEnv = {}; + var args = logEnvStr.split(' '); + for (var i = 0, len = args.length; i < len; i++) { + var option = args[i]; + var value = args[i + 1]; + if (option && value) { + switch (option) { + case "-file": + logEnv.file = value; + break; + case "-level": + logEnv.level = value; + break; + } + } + } + return logEnv; + } + + // TSS_LOG "{ level: "normal | verbose | terse", file?: string}" + function createLoggerFromEnv() { + var fileName: string = undefined; + var level = "normal"; + var logEnvStr = process.env["TSS_LOG"]; + if (logEnvStr) { + var logEnv = parseLogEnv(logEnvStr); + if (logEnv.file) { + fileName = logEnv.file; + } + else { + fileName = __dirname + "/.log" + process.pid.toString(); + } + if (logEnv.level) { + level = logEnv.level; + } + } + var logger = new Logger(fileName, level); + return logger; + } // This places log file in the directory containing editorServices.js // TODO: check that this location is writable - var logger = new Logger(__dirname + "/.log" + process.pid.toString()); + var logger = createLoggerFromEnv(); // REVIEW: for now this implementation uses polling. // The advantage of polling is that it works reliably diff --git a/src/server/session.ts b/src/server/session.ts index 5a91bcc08a1..59a049a18e9 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -145,6 +145,9 @@ module ts.server { send(msg: NodeJS._debugger.Message) { var json = JSON.stringify(msg); + if (this.logger.verbose()) { + this.logger.info(msg.type+": " + json); + } this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) + '\r\n\r\n' + json); } @@ -717,6 +720,10 @@ module ts.server { } onMessage(message: string) { + if (this.logger.verbose()) { + this.logger.info("request: " + message); + var start = process.hrtime(); + } try { var request = JSON.parse(message); var response: any; @@ -822,13 +829,21 @@ module ts.server { } } + if (this.logger.verbose()) { + var elapsed = process.hrtime(start); + var elapsedms = ((1e9 * elapsed[0]) + elapsed[1])/1000000.0; + var leader = "Elapsed time (in milliseconds)"; + if (!responseRequired) { + leader = "Async elapsed time (in milliseconds)"; + } + this.logger.msg(leader+": " + elapsedms.toFixed(4).toString(), "Perf"); + } if (response) { this.output(response, request.command, request.seq); } else if (responseRequired) { this.output(undefined, request.command, request.seq, "No content available."); } - } catch (err) { if (err instanceof OperationCanceledException) { // Handle cancellation exceptions From 865802a63cf88bdea46938fc99fa4f13f2e0e61c Mon Sep 17 00:00:00 2001 From: steveluc Date: Sat, 7 Mar 2015 17:46:56 -0800 Subject: [PATCH 068/251] Added new logger methods to test harness. --- src/harness/harnessLanguageService.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 4206f16bab3..202a167f089 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -469,6 +469,7 @@ module Harness.LanguageService { this.writeMessage(message); } + readFile(fileName: string): string { if (fileName.indexOf(Harness.Compiler.defaultLibFileName) >= 0) { fileName = Harness.Compiler.defaultLibFileName; @@ -526,6 +527,15 @@ module Harness.LanguageService { msg(message: string) { return this.host.log(message); } + + enabled() { + return true; + } + + verbose() { + return false; + } + endGroup(): void { } From a6816fc128191cc71dbd4b21492a334dcbc29e91 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Sat, 7 Mar 2015 20:12:16 -0800 Subject: [PATCH 069/251] Added description to version exports --- src/compiler/program.ts | 1 + src/services/services.ts | 1 + tests/baselines/reference/APISample_compile.js | 2 ++ tests/baselines/reference/APISample_compile.types | 2 ++ tests/baselines/reference/APISample_linter.js | 2 ++ tests/baselines/reference/APISample_linter.types | 2 ++ tests/baselines/reference/APISample_transform.js | 2 ++ tests/baselines/reference/APISample_transform.types | 2 ++ tests/baselines/reference/APISample_watcher.js | 2 ++ tests/baselines/reference/APISample_watcher.types | 2 ++ 10 files changed, 18 insertions(+) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 6cd429b5301..9b933cacf74 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -5,6 +5,7 @@ module ts { /* @internal */ export var emitTime = 0; /* @internal */ export var ioReadTime = 0; + /** The version of the TypeScript compiler release */ export var version = "1.5.0.0"; export function createCompilerHost(options: CompilerOptions): CompilerHost { diff --git a/src/services/services.ts b/src/services/services.ts index fc4d1eff223..73ed1132724 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -11,6 +11,7 @@ /// module ts { + /** The version of the language service API */ export var servicesVersion = "0.4" export interface Node { diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index ec0618c517a..e54174386b5 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -1472,6 +1472,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; @@ -1479,6 +1480,7 @@ declare module "typescript" { function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program; } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; interface Node { getSourceFile(): SourceFile; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index dbd947e17db..45f9e807444 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -4716,6 +4716,7 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; >version : string @@ -4747,6 +4748,7 @@ declare module "typescript" { >Program : Program } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; >servicesVersion : string diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 62b30eab4eb..df85e5703e4 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -1503,6 +1503,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; @@ -1510,6 +1511,7 @@ declare module "typescript" { function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program; } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; interface Node { getSourceFile(): SourceFile; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 7e9101988ea..9c049a3b7fb 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -4862,6 +4862,7 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; >version : string @@ -4893,6 +4894,7 @@ declare module "typescript" { >Program : Program } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; >servicesVersion : string diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index de8ee896f88..df74967085a 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -1504,6 +1504,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; @@ -1511,6 +1512,7 @@ declare module "typescript" { function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program; } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; interface Node { getSourceFile(): SourceFile; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index a79c32c359c..07a14778fd2 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -4812,6 +4812,7 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; >version : string @@ -4843,6 +4844,7 @@ declare module "typescript" { >Program : Program } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; >servicesVersion : string diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 4d4e5f0d5dc..f92d1aaa81d 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1541,6 +1541,7 @@ declare module "typescript" { function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker; } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; function createCompilerHost(options: CompilerOptions): CompilerHost; function getPreEmitDiagnostics(program: Program): Diagnostic[]; @@ -1548,6 +1549,7 @@ declare module "typescript" { function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program; } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; interface Node { getSourceFile(): SourceFile; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 0ee826cb36d..e37c939a5b3 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -4985,6 +4985,7 @@ declare module "typescript" { >TypeChecker : TypeChecker } declare module "typescript" { + /** The version of the TypeScript compiler release */ var version: string; >version : string @@ -5016,6 +5017,7 @@ declare module "typescript" { >Program : Program } declare module "typescript" { + /** The version of the language service API */ var servicesVersion: string; >servicesVersion : string From 360e47880ebc8c43060284aec99ddb87e20f9ca9 Mon Sep 17 00:00:00 2001 From: steveluc Date: Sat, 7 Mar 2015 23:19:58 -0800 Subject: [PATCH 070/251] Addressed comments on code style and organization. --- src/harness/harnessLanguageService.ts | 2 +- src/server/editorServices.ts | 2 +- src/server/server.ts | 23 +++++++++++------------ src/server/session.ts | 14 ++++++++------ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 202a167f089..55b3464a384 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -532,7 +532,7 @@ module Harness.LanguageService { return true; } - verbose() { + isVerbose() { return false; } diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 3cb66fed297..970286f29fa 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -5,7 +5,7 @@ module ts.server { export interface Logger { close(): void; - verbose(): boolean; + isVerbose(): boolean; enabled(): boolean; perftrc(s: string): void; info(s: string): void; diff --git a/src/server/server.ts b/src/server/server.ts index e5cc0fd398d..1735a2dddec 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -55,7 +55,7 @@ module ts.server { return !!this.logFilename; } - verbose() { + isVerbose() { return this.enabled() && (this.level == "verbose"); } @@ -191,15 +191,15 @@ module ts.server { } } - interface LogEnv { + interface LogOptions { file?: string; - level?: string; + detailLevel?: string; } - function parseLogEnv(logEnvStr: string): LogEnv { - var logEnv: LogEnv = {}; + function parseLogEnv(logEnvStr: string): LogOptions { + var logEnv: LogOptions = {}; var args = logEnvStr.split(' '); - for (var i = 0, len = args.length; i < len; i++) { + for (var i = 0, len = args.length; i < (len - 1); i += 2) { var option = args[i]; var value = args[i + 1]; if (option && value) { @@ -208,7 +208,7 @@ module ts.server { logEnv.file = value; break; case "-level": - logEnv.level = value; + logEnv.detailLevel = value; break; } } @@ -219,7 +219,7 @@ module ts.server { // TSS_LOG "{ level: "normal | verbose | terse", file?: string}" function createLoggerFromEnv() { var fileName: string = undefined; - var level = "normal"; + var detailLevel = "normal"; var logEnvStr = process.env["TSS_LOG"]; if (logEnvStr) { var logEnv = parseLogEnv(logEnvStr); @@ -229,12 +229,11 @@ module ts.server { else { fileName = __dirname + "/.log" + process.pid.toString(); } - if (logEnv.level) { - level = logEnv.level; + if (logEnv.detailLevel) { + detailLevel = logEnv.detailLevel; } } - var logger = new Logger(fileName, level); - return logger; + return new Logger(fileName, detailLevel); } // This places log file in the directory containing editorServices.js // TODO: check that this location is writable diff --git a/src/server/session.ts b/src/server/session.ts index 59a049a18e9..ee828642830 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -145,8 +145,8 @@ module ts.server { send(msg: NodeJS._debugger.Message) { var json = JSON.stringify(msg); - if (this.logger.verbose()) { - this.logger.info(msg.type+": " + json); + if (this.logger.isVerbose()) { + this.logger.info(msg.type + ": " + json); } this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) + '\r\n\r\n' + json); @@ -720,7 +720,7 @@ module ts.server { } onMessage(message: string) { - if (this.logger.verbose()) { + if (this.logger.isVerbose()) { this.logger.info("request: " + message); var start = process.hrtime(); } @@ -829,14 +829,16 @@ module ts.server { } } - if (this.logger.verbose()) { + if (this.logger.isVerbose()) { var elapsed = process.hrtime(start); - var elapsedms = ((1e9 * elapsed[0]) + elapsed[1])/1000000.0; + var seconds = elapsed[0] + var nanoseconds = elapsed[1]; + var elapsedMs = ((1e9 * seconds) + nanoseconds)/1000000.0; var leader = "Elapsed time (in milliseconds)"; if (!responseRequired) { leader = "Async elapsed time (in milliseconds)"; } - this.logger.msg(leader+": " + elapsedms.toFixed(4).toString(), "Perf"); + this.logger.msg(leader + ": " + elapsedMs.toFixed(4).toString(), "Perf"); } if (response) { this.output(response, request.command, request.seq); From c0db7ffe8f55b6ec335880482ca43b93b066689d Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sun, 8 Mar 2015 18:08:49 +0100 Subject: [PATCH 071/251] Added valueOf definitions for String and Number --- src/lib/core.d.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts index cb5324fbd3d..bbaddeeacc1 100644 --- a/src/lib/core.d.ts +++ b/src/lib/core.d.ts @@ -410,6 +410,9 @@ interface String { */ substr(from: number, length?: number): string; + /** Returns the primitive value of the specified object. */ + valueOf(): string; + [index: number]: string; } @@ -462,6 +465,9 @@ interface Number { * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive. */ toPrecision(precision?: number): string; + + /** Returns the primitive value of the specified object. */ + valueOf(): number; } interface NumberConstructor { From 23f56dadfb422e3c45d8ee15f4d587eed1959bf4 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sun, 8 Mar 2015 18:59:04 +0100 Subject: [PATCH 072/251] Fixed tests due to lib.d.ts changes --- .../types/primitives/number/assignFromNumberInterface2.ts | 1 + .../types/primitives/string/assignFromStringInterface2.ts | 1 + .../stringLiteralTypeIsSubtypeOfString.ts | 1 + tests/cases/fourslash/completionEntryForUnionProperty2.ts | 3 ++- tests/cases/fourslash/completionListEnumMembers.ts | 2 +- tests/cases/fourslash/memberCompletionInForEach1.ts | 5 ++--- tests/cases/fourslash/server/completions.ts | 5 ++--- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts index b516f7b864d..da7da7c7a06 100644 --- a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts +++ b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts @@ -7,6 +7,7 @@ interface NotNumber { toFixed(fractionDigits?: number): string; toExponential(fractionDigits?: number): string; toPrecision(precision?: number): string; + valueOf(): number; doStuff(): string; } diff --git a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts index 981df14faa3..16308f90251 100644 --- a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts +++ b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts @@ -30,6 +30,7 @@ interface NotString { trim(): string; length: number; substr(from: number, length?: number): string; + valueOf(): string; [index: number]: string; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts index 15764837bc0..c7e9c0fc8e9 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts @@ -60,6 +60,7 @@ class C implements String { trim(): string { return null; } length: number; substr(from: number, length?: number): string { return null; } + valueOf(): string { return null; } [index: number]: string; } diff --git a/tests/cases/fourslash/completionEntryForUnionProperty2.ts b/tests/cases/fourslash/completionEntryForUnionProperty2.ts index b32e6d05345..ccf0b402d08 100644 --- a/tests/cases/fourslash/completionEntryForUnionProperty2.ts +++ b/tests/cases/fourslash/completionEntryForUnionProperty2.ts @@ -16,4 +16,5 @@ goTo.marker(); verify.memberListContains("toString", "(method) toString(): string"); -verify.memberListCount(1); \ No newline at end of file +verify.memberListContains("valueOf", "(method) valueOf(): string | number"); +verify.memberListCount(2); \ No newline at end of file diff --git a/tests/cases/fourslash/completionListEnumMembers.ts b/tests/cases/fourslash/completionListEnumMembers.ts index 938b4aa2f2e..9c24f6228b0 100644 --- a/tests/cases/fourslash/completionListEnumMembers.ts +++ b/tests/cases/fourslash/completionListEnumMembers.ts @@ -21,4 +21,4 @@ verify.memberListCount(0); goTo.marker('enumValueReference'); verify.memberListContains("toString"); verify.memberListContains("toFixed"); -verify.memberListCount(4); +verify.memberListCount(5); diff --git a/tests/cases/fourslash/memberCompletionInForEach1.ts b/tests/cases/fourslash/memberCompletionInForEach1.ts index 82d3b5b2400..2af0393283f 100644 --- a/tests/cases/fourslash/memberCompletionInForEach1.ts +++ b/tests/cases/fourslash/memberCompletionInForEach1.ts @@ -7,11 +7,10 @@ goTo.marker('1'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); +verify.memberListCount(21); edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear goTo.marker('2'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); - \ No newline at end of file +verify.memberListCount(21); diff --git a/tests/cases/fourslash/server/completions.ts b/tests/cases/fourslash/server/completions.ts index 82d3b5b2400..2af0393283f 100644 --- a/tests/cases/fourslash/server/completions.ts +++ b/tests/cases/fourslash/server/completions.ts @@ -7,11 +7,10 @@ goTo.marker('1'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); +verify.memberListCount(21); edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear goTo.marker('2'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); - \ No newline at end of file +verify.memberListCount(21); From e60edb3c7ea5651de183667f336151256728c107 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sun, 8 Mar 2015 19:07:22 +0100 Subject: [PATCH 073/251] Accepted baselines --- .../assignFromNumberInterface2.errors.txt | 5 +++-- .../reference/assignFromNumberInterface2.js | 1 + .../assignFromStringInterface2.errors.txt | 5 +++-- .../reference/assignFromStringInterface2.js | 1 + .../reference/booleanAssignment.errors.txt | 16 ++++++++++------ ...stringLiteralTypeIsSubtypeOfString.errors.txt | 9 +++++---- .../stringLiteralTypeIsSubtypeOfString.js | 2 ++ ...teStringsArrayTypeDefinedInES5Mode.errors.txt | 2 +- ...StringsArrayTypeRedefinedInES6Mode.errors.txt | 2 +- 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/tests/baselines/reference/assignFromNumberInterface2.errors.txt b/tests/baselines/reference/assignFromNumberInterface2.errors.txt index fa53d8facdf..85639cdeeaf 100644 --- a/tests/baselines/reference/assignFromNumberInterface2.errors.txt +++ b/tests/baselines/reference/assignFromNumberInterface2.errors.txt @@ -1,5 +1,5 @@ -tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(23,1): error TS2322: Type 'Number' is not assignable to type 'number'. -tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(24,1): error TS2322: Type 'NotNumber' is not assignable to type 'number'. +tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(24,1): error TS2322: Type 'Number' is not assignable to type 'number'. +tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(25,1): error TS2322: Type 'NotNumber' is not assignable to type 'number'. ==== tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts (2 errors) ==== @@ -12,6 +12,7 @@ tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(24 toFixed(fractionDigits?: number): string; toExponential(fractionDigits?: number): string; toPrecision(precision?: number): string; + valueOf(): number; doStuff(): string; } diff --git a/tests/baselines/reference/assignFromNumberInterface2.js b/tests/baselines/reference/assignFromNumberInterface2.js index 74384d42302..25262bf27f0 100644 --- a/tests/baselines/reference/assignFromNumberInterface2.js +++ b/tests/baselines/reference/assignFromNumberInterface2.js @@ -8,6 +8,7 @@ interface NotNumber { toFixed(fractionDigits?: number): string; toExponential(fractionDigits?: number): string; toPrecision(precision?: number): string; + valueOf(): number; doStuff(): string; } diff --git a/tests/baselines/reference/assignFromStringInterface2.errors.txt b/tests/baselines/reference/assignFromStringInterface2.errors.txt index 2e3e518f75b..4e09eb6eacb 100644 --- a/tests/baselines/reference/assignFromStringInterface2.errors.txt +++ b/tests/baselines/reference/assignFromStringInterface2.errors.txt @@ -1,5 +1,5 @@ -tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(46,1): error TS2322: Type 'String' is not assignable to type 'string'. -tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(47,1): error TS2322: Type 'NotString' is not assignable to type 'string'. +tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(47,1): error TS2322: Type 'String' is not assignable to type 'string'. +tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(48,1): error TS2322: Type 'NotString' is not assignable to type 'string'. ==== tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts (2 errors) ==== @@ -35,6 +35,7 @@ tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(47 trim(): string; length: number; substr(from: number, length?: number): string; + valueOf(): string; [index: number]: string; } diff --git a/tests/baselines/reference/assignFromStringInterface2.js b/tests/baselines/reference/assignFromStringInterface2.js index 7e4821ac2a7..5636a4806cc 100644 --- a/tests/baselines/reference/assignFromStringInterface2.js +++ b/tests/baselines/reference/assignFromStringInterface2.js @@ -31,6 +31,7 @@ interface NotString { trim(): string; length: number; substr(from: number, length?: number): string; + valueOf(): string; [index: number]: string; } diff --git a/tests/baselines/reference/booleanAssignment.errors.txt b/tests/baselines/reference/booleanAssignment.errors.txt index 2d6c6b045ea..454bd7ef707 100644 --- a/tests/baselines/reference/booleanAssignment.errors.txt +++ b/tests/baselines/reference/booleanAssignment.errors.txt @@ -1,13 +1,15 @@ tests/cases/compiler/booleanAssignment.ts(2,1): error TS2322: Type 'number' is not assignable to type 'Boolean'. Types of property 'valueOf' are incompatible. - Type '() => Object' is not assignable to type '() => boolean'. - Type 'Object' is not assignable to type 'boolean'. + Type '() => number' is not assignable to type '() => boolean'. + Type 'number' is not assignable to type 'boolean'. tests/cases/compiler/booleanAssignment.ts(3,1): error TS2322: Type 'string' is not assignable to type 'Boolean'. Types of property 'valueOf' are incompatible. - Type '() => Object' is not assignable to type '() => boolean'. + Type '() => string' is not assignable to type '() => boolean'. + Type 'string' is not assignable to type 'boolean'. tests/cases/compiler/booleanAssignment.ts(4,1): error TS2322: Type '{}' is not assignable to type 'Boolean'. Types of property 'valueOf' are incompatible. Type '() => Object' is not assignable to type '() => boolean'. + Type 'Object' is not assignable to type 'boolean'. ==== tests/cases/compiler/booleanAssignment.ts (3 errors) ==== @@ -16,18 +18,20 @@ tests/cases/compiler/booleanAssignment.ts(4,1): error TS2322: Type '{}' is not a ~ !!! error TS2322: Type 'number' is not assignable to type 'Boolean'. !!! error TS2322: Types of property 'valueOf' are incompatible. -!!! error TS2322: Type '() => Object' is not assignable to type '() => boolean'. -!!! error TS2322: Type 'Object' is not assignable to type 'boolean'. +!!! error TS2322: Type '() => number' is not assignable to type '() => boolean'. +!!! error TS2322: Type 'number' is not assignable to type 'boolean'. b = "a"; // Error ~ !!! error TS2322: Type 'string' is not assignable to type 'Boolean'. !!! error TS2322: Types of property 'valueOf' are incompatible. -!!! error TS2322: Type '() => Object' is not assignable to type '() => boolean'. +!!! error TS2322: Type '() => string' is not assignable to type '() => boolean'. +!!! error TS2322: Type 'string' is not assignable to type 'boolean'. b = {}; // Error ~ !!! error TS2322: Type '{}' is not assignable to type 'Boolean'. !!! error TS2322: Types of property 'valueOf' are incompatible. !!! error TS2322: Type '() => Object' is not assignable to type '() => boolean'. +!!! error TS2322: Type 'Object' is not assignable to type 'boolean'. var o = {}; o = b; // OK diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt index b82fa1c93ee..8a916c16b2d 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt @@ -3,14 +3,14 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(30,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(34,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. 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(76,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(89,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(93,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(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(97,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(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) ==== @@ -86,6 +86,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite trim(): string { return null; } length: number; substr(from: number, length?: number): string { return null; } + valueOf(): string { return null; } [index: number]: string; } diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js index 6260493dea0..01b5dc814a7 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js @@ -61,6 +61,7 @@ class C implements String { trim(): string { return null; } length: number; substr(from: number, length?: number): string { return null; } + valueOf(): string { return null; } [index: number]: string; } @@ -138,6 +139,7 @@ var C = (function () { C.prototype.toLocaleUpperCase = function () { return null; }; C.prototype.trim = function () { return null; }; C.prototype.substr = function (from, length) { return null; }; + C.prototype.valueOf = function () { return null; }; return C; })(); function f10(x) { } diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt index 7ac2eff8652..7c796d47398 100644 --- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt +++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt @@ -1,4 +1,4 @@ -lib.d.ts(515,11): error TS2300: Duplicate identifier 'TemplateStringsArray'. +lib.d.ts(521,11): error TS2300: Duplicate identifier 'TemplateStringsArray'. tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(2,7): error TS2300: Duplicate identifier 'TemplateStringsArray'. tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'. Property 'raw' is missing in type '{ [x: number]: undefined; }'. diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt index db383b216a5..4b9cb63d9aa 100644 --- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt +++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt @@ -1,4 +1,4 @@ -lib.d.ts(515,11): error TS2300: Duplicate identifier 'TemplateStringsArray'. +lib.d.ts(521,11): error TS2300: Duplicate identifier 'TemplateStringsArray'. tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(2,7): error TS2300: Duplicate identifier 'TemplateStringsArray'. tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'. Property 'raw' is missing in type '{ [x: number]: undefined; }'. From c371f1e521eb9cf580bba6e502418a60a542da2c Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sun, 8 Mar 2015 18:23:23 -0700 Subject: [PATCH 074/251] Make the preservation of formatting an optional experimental compiler flag. --- src/compiler/commandLineParser.ts | 6 + .../diagnosticInformationMap.generated.ts | 1 + src/compiler/diagnosticMessages.json | 4 + src/compiler/emitter.ts | 24 +- src/compiler/types.ts | 1 + src/harness/harness.ts | 4 + tests/baselines/reference/2dArrays.js | 4 +- .../baselines/reference/APISample_compile.js | 7 +- .../reference/APISample_compile.types | 3 + tests/baselines/reference/APISample_linter.js | 4 +- .../reference/APISample_linter.types | 3 + .../reference/APISample_transform.js | 37 +- .../reference/APISample_transform.types | 3 + .../baselines/reference/APISample_watcher.js | 43 +- .../reference/APISample_watcher.types | 3 + ...entFunctionWithTheSameNameAndCommonRoot.js | 5 +- .../reference/ArrowFunctionExpression1.js | 3 +- ...hModuleMemberThatUsesClassTypeParameter.js | 7 +- ...GenericClassStaticFunctionOfTheSameName.js | 3 +- ...GenericClassStaticFunctionOfTheSameName.js | 3 +- ...dStaticFunctionUsingClassPrivateStatics.js | 4 +- ...nctionAndExportedFunctionThatShareAName.js | 22 +- ...ionAndNonExportedFunctionThatShareAName.js | 22 +- ...ticVariableAndExportedVarThatShareAName.js | 10 +- ...VariableAndNonExportedVarThatShareAName.js | 10 +- .../baselines/reference/ClassDeclaration11.js | 3 +- .../baselines/reference/ClassDeclaration13.js | 3 +- .../baselines/reference/ClassDeclaration21.js | 3 +- .../baselines/reference/ClassDeclaration22.js | 3 +- .../baselines/reference/ES5SymbolProperty2.js | 3 +- .../baselines/reference/ES5SymbolProperty3.js | 3 +- .../baselines/reference/ES5SymbolProperty4.js | 3 +- .../baselines/reference/ES5SymbolProperty5.js | 3 +- .../baselines/reference/ES5SymbolProperty6.js | 3 +- .../baselines/reference/ES5SymbolProperty7.js | 3 +- ...sClassHeritageListMemberTypeAnnotations.js | 11 +- ...accessibleTypeInTypeParameterConstraint.js | 11 +- ...TypesInParameterAndReturnTypeAnnotation.js | 5 +- ...ccessibleTypesInParameterTypeAnnotation.js | 5 +- ...InaccessibleTypesInReturnTypeAnnotation.js | 5 +- ...sClassHeritageListMemberTypeAnnotations.js | 11 +- ...accessibleTypeInTypeParameterConstraint.js | 11 +- ...WithAccessibleTypesOnItsExportedMembers.js | 5 +- ...hAccessibleTypesInMemberTypeAnnotations.js | 10 +- ...iableWithAccessibleTypeInTypeAnnotation.js | 5 +- ...bleWithInaccessibleTypeInTypeAnnotation.js | 11 +- ...ctionAndModuleWithSameNameAndCommonRoot.js | 20 +- ...oduleWithSameNameAndDifferentCommonRoot.js | 10 +- .../reference/FunctionDeclaration10_es6.js | 4 +- .../reference/FunctionDeclaration12_es6.js | 3 +- .../reference/FunctionDeclaration4.js | 3 +- .../reference/FunctionDeclaration6.js | 3 +- .../reference/FunctionExpression1_es6.js | 3 +- .../reference/FunctionExpression2_es6.js | 3 +- .../FunctionPropertyAssignments1_es6.js | 5 +- .../FunctionPropertyAssignments2_es6.js | 5 +- .../FunctionPropertyAssignments3_es6.js | 5 +- .../FunctionPropertyAssignments4_es6.js | 4 +- .../FunctionPropertyAssignments5_es6.js | 3 +- .../FunctionPropertyAssignments6_es6.js | 5 +- .../reference/MemberAccessorDeclaration15.js | 3 +- .../MemberFunctionDeclaration1_es6.js | 3 +- .../MemberFunctionDeclaration2_es6.js | 3 +- .../MemberFunctionDeclaration3_es6.js | 3 +- .../MemberFunctionDeclaration4_es6.js | 3 +- .../MemberFunctionDeclaration7_es6.js | 3 +- ...uleAndFunctionWithSameNameAndCommonRoot.js | 20 +- ...leWithExportedAndNonExportedImportAlias.js | 10 +- tests/baselines/reference/Protected4.js | 3 +- tests/baselines/reference/Protected5.js | 3 +- tests/baselines/reference/Protected6.js | 3 +- tests/baselines/reference/Protected7.js | 3 +- ...ortedAndNonExportedClassesOfTheSameName.js | 5 +- ...tedAndNonExportedLocalVarsOfTheSameName.js | 15 +- ...eEachWithExportedLocalVarsOfTheSameName.js | 15 +- ...esWithTheSameNameAndDifferentCommonRoot.js | 10 +- ...ModulesWithTheSameNameAndSameCommonRoot.js | 15 +- .../reference/YieldExpression10_es6.js | 3 +- .../reference/YieldExpression13_es6.js | 4 +- .../reference/YieldExpression17_es6.js | 6 +- .../reference/accessibilityModifiers.js | 70 +- .../accessorParameterAccessibilityModifier.js | 6 +- tests/baselines/reference/accessorWithES3.js | 7 +- tests/baselines/reference/accessorWithES5.js | 7 +- .../reference/accessorWithoutBody1.js | 4 +- .../reference/accessorWithoutBody2.js | 4 +- .../accessorsAreNotContextuallyTyped.js | 4 +- .../reference/accessorsNotAllowedInES3.js | 10 +- .../accessors_spec_section-4.5_error-cases.js | 30 +- .../accessors_spec_section-4.5_inference.js | 42 +- .../additionOperatorWithAnyAndEveryType.js | 14 +- .../additionOperatorWithInvalidOperands.js | 6 +- ...OperatorWithNullValueAndInvalidOperator.js | 11 +- .../additionOperatorWithStringAndEveryType.js | 4 +- .../additionOperatorWithTypeParameter.js | 3 +- ...torWithUndefinedValueAndInvalidOperands.js | 11 +- .../baselines/reference/aliasUsageInArray.js | 8 +- .../aliasUsageInFunctionExpression.js | 8 +- .../reference/aliasUsageInGenericFunction.js | 8 +- .../reference/aliasUsageInObjectLiteral.js | 14 +- .../reference/aliasUsageInOrExpression.js | 8 +- .../reference/aliasUsedAsNameValue.js | 4 +- .../ambientClassOverloadForFunction.js | 4 +- .../reference/ambiguousGenericAssertion1.js | 8 +- .../baselines/reference/ambiguousOverload.js | 8 +- tests/baselines/reference/anonterface.js | 4 +- .../anyAssignabilityInInheritance.js | 3 +- .../reference/anyAssignableToEveryType2.js | 3 +- tests/baselines/reference/anyDeclare.js | 3 +- .../reference/anyIdenticalToItself.js | 3 +- .../anyInferenceAnonymousFunctions.js | 12 +- .../reference/arrayAssignmentTest1.js | 24 +- .../reference/arrayAssignmentTest2.js | 28 +- .../reference/arrayAssignmentTest4.js | 12 +- tests/baselines/reference/arrayAugment.js | 4 +- .../reference/arrayBestCommonTypes.js | 364 +- tests/baselines/reference/arrayCast.js | 13 +- tests/baselines/reference/arrayConcatMap.js | 13 +- tests/baselines/reference/arrayLiteral.js | 18 +- tests/baselines/reference/arrayLiteral1.js | 5 +- tests/baselines/reference/arrayLiteral2.js | 5 +- .../reference/arrayLiteralContextualType.js | 11 +- .../baselines/reference/arrayLiteralSpread.js | 16 +- .../reference/arrayLiteralTypeInference.js | 20 +- .../reference/arrayLiteralWidened.js | 47 +- ...arrayLiteralWithMultipleBestCommonTypes.js | 52 +- tests/baselines/reference/arrayLiterals.js | 97 +- .../arrayLiteralsWithRecursiveGenerics.js | 20 +- .../reference/arrayOfFunctionTypes3.js | 25 +- .../arrayReferenceWithoutTypeArgs.js | 3 +- tests/baselines/reference/arraySigChecking.js | 15 +- .../reference/arrowFunctionContexts.js | 98 +- .../reference/arrowFunctionExpressions.js | 83 +- .../arrowFunctionInConstructorArgument1.js | 4 +- .../arrowFunctionInExpressionStatement1.js | 4 +- .../arrowFunctionInExpressionStatement2.js | 4 +- .../arrowFunctionMissingCurlyWithSemicolon.js | 4 +- .../arrowFunctionWithObjectLiteralBody1.js | 4 +- .../arrowFunctionWithObjectLiteralBody2.js | 4 +- .../arrowFunctionWithObjectLiteralBody5.js | 28 +- .../arrowFunctionWithObjectLiteralBody6.js | 20 +- .../reference/arrowFunctionsMissingTokens.js | 54 +- tests/baselines/reference/asiArith.js | 6 +- tests/baselines/reference/assign1.js | 5 +- .../reference/assignEveryTypeToAny.js | 12 +- .../assignLambdaToNominalSubtypeOfFunction.js | 11 +- .../reference/assignToExistingClass.js | 4 +- tests/baselines/reference/assignToFn.js | 6 +- .../baselines/reference/assignmentCompat1.js | 4 +- .../reference/assignmentCompatBug2.js | 57 +- .../reference/assignmentCompatBug3.js | 11 +- .../reference/assignmentCompatBug5.js | 25 +- .../reference/assignmentCompatForEnums.js | 4 +- ...signmentCompatFunctionsWithOptionalArgs.js | 18 +- ...CompatInterfaceWithStringIndexSignature.js | 6 +- .../reference/assignmentCompatOnNew.js | 3 +- .../assignmentCompatWithCallSignatures.js | 40 +- .../assignmentCompatWithCallSignatures2.js | 74 +- ...ithCallSignaturesWithOptionalParameters.js | 72 +- ...patWithCallSignaturesWithRestParameters.js | 84 +- ...assignmentCompatWithConstructSignatures.js | 16 +- ...ssignmentCompatWithConstructSignatures2.js | 32 +- ...ricCallSignaturesWithOptionalParameters.js | 144 +- .../assignmentCompatWithObjectMembers.js | 16 +- .../assignmentCompatWithObjectMembers2.js | 8 +- .../assignmentCompatWithObjectMembers3.js | 8 +- .../assignmentCompatWithObjectMembers4.js | 16 +- ...mentCompatWithObjectMembersNumericNames.js | 8 +- ...nmentCompatWithObjectMembersOptionality.js | 8 +- ...mentCompatWithObjectMembersOptionality2.js | 8 +- ...mpatWithObjectMembersStringNumericNames.js | 16 +- .../assignmentCompatWithOverloads.js | 16 +- .../reference/assignmentCompatability1.js | 4 +- .../reference/assignmentCompatability10.js | 4 +- .../reference/assignmentCompatability11.js | 8 +- .../reference/assignmentCompatability12.js | 8 +- .../reference/assignmentCompatability13.js | 8 +- .../reference/assignmentCompatability14.js | 8 +- .../reference/assignmentCompatability15.js | 8 +- .../reference/assignmentCompatability16.js | 10 +- .../reference/assignmentCompatability17.js | 10 +- .../reference/assignmentCompatability18.js | 10 +- .../reference/assignmentCompatability19.js | 10 +- .../reference/assignmentCompatability2.js | 4 +- .../reference/assignmentCompatability20.js | 10 +- .../reference/assignmentCompatability21.js | 10 +- .../reference/assignmentCompatability22.js | 10 +- .../reference/assignmentCompatability23.js | 10 +- .../reference/assignmentCompatability24.js | 8 +- .../reference/assignmentCompatability25.js | 4 +- .../reference/assignmentCompatability26.js | 4 +- .../reference/assignmentCompatability27.js | 4 +- .../reference/assignmentCompatability28.js | 4 +- .../reference/assignmentCompatability29.js | 4 +- .../reference/assignmentCompatability3.js | 8 +- .../reference/assignmentCompatability30.js | 4 +- .../reference/assignmentCompatability31.js | 4 +- .../reference/assignmentCompatability32.js | 4 +- .../reference/assignmentCompatability33.js | 4 +- .../reference/assignmentCompatability34.js | 4 +- .../reference/assignmentCompatability35.js | 4 +- .../reference/assignmentCompatability36.js | 4 +- .../reference/assignmentCompatability37.js | 4 +- .../reference/assignmentCompatability38.js | 4 +- .../reference/assignmentCompatability39.js | 4 +- .../reference/assignmentCompatability4.js | 4 +- .../reference/assignmentCompatability40.js | 4 +- .../reference/assignmentCompatability41.js | 4 +- .../reference/assignmentCompatability42.js | 4 +- .../reference/assignmentCompatability43.js | 9 +- .../reference/assignmentCompatability5.js | 8 +- .../reference/assignmentCompatability6.js | 4 +- .../reference/assignmentCompatability7.js | 8 +- .../reference/assignmentCompatability8.js | 4 +- .../reference/assignmentCompatability9.js | 4 +- ...-apply-member-off-of-function-interface.js | 17 +- ...g-call-member-off-of-function-interface.js | 17 +- .../reference/assignmentLHSIsValue.js | 29 +- .../assignmentStricterConstraints.js | 3 +- .../reference/assignmentToFunction.js | 7 +- .../baselines/reference/assignmentToObject.js | 4 +- .../assignmentToObjectAndFunction.js | 16 +- .../assignmentToParenthesizedIdentifiers.js | 47 +- .../reference/assignmentToReferenceTypes.js | 3 +- tests/baselines/reference/assignments.js | 3 +- ...entedTypeAssignmentCompatIndexSignature.js | 3 +- ...ugmentedTypeBracketAccessIndexSignature.js | 3 +- ...augmentedTypeBracketNamedPropertyAccess.js | 3 +- .../reference/augmentedTypesClass.js | 6 +- .../reference/augmentedTypesClass2a.js | 9 +- .../reference/augmentedTypesClass3.js | 12 +- .../reference/augmentedTypesClass4.js | 6 +- .../baselines/reference/augmentedTypesEnum.js | 9 +- .../augmentedTypesExternalModule1.js | 3 +- .../reference/augmentedTypesFunction.js | 39 +- .../reference/augmentedTypesModules.js | 39 +- .../reference/augmentedTypesModules2.js | 24 +- .../reference/augmentedTypesModules3.js | 3 +- .../reference/augmentedTypesModules3b.js | 9 +- .../reference/augmentedTypesModules4.js | 3 +- .../baselines/reference/augmentedTypesVar.js | 9 +- tests/baselines/reference/autoLift2.js | 14 +- tests/baselines/reference/autolift3.js | 3 +- .../bestCommonTypeOfConditionalExpressions.js | 12 +- .../reference/bestCommonTypeOfTuple.js | 33 +- .../bestCommonTypeReturnStatement.js | 8 +- .../bestCommonTypeWithContextualTyping.js | 8 +- .../bestCommonTypeWithOptionalProperties.js | 36 +- .../bitwiseNotOperatorInvalidOperations.js | 6 +- .../bitwiseNotOperatorWithAnyOtherType.js | 11 +- .../bitwiseNotOperatorWithBooleanType.js | 13 +- .../bitwiseNotOperatorWithNumberType.js | 25 +- .../bitwiseNotOperatorWithStringType.js | 25 +- ...ctionWithIncorrectNumberOfTypeArguments.js | 8 +- ...allGenericFunctionWithZeroTypeArguments.js | 8 +- ...callNonGenericFunctionWithTypeArguments.js | 8 +- tests/baselines/reference/callOverloads1.js | 7 +- tests/baselines/reference/callOverloads2.js | 11 +- tests/baselines/reference/callOverloads3.js | 3 +- tests/baselines/reference/callOverloads4.js | 3 +- tests/baselines/reference/callOverloads5.js | 3 +- .../callSignatureWithoutAnnotationsOrBody.js | 3 +- ...ureWithoutReturnTypeAnnotationInference.js | 8 +- ...sWithAccessibilityModifiersOnParameters.js | 48 +- .../callSignaturesWithDuplicateParameters.js | 48 +- .../callSignaturesWithOptionalParameters.js | 21 +- .../callSignaturesWithOptionalParameters2.js | 12 +- tests/baselines/reference/callWithSpread.js | 6 +- .../baselines/reference/callWithSpreadES6.js | 6 +- .../callWithWrongNumberOfTypeArguments.js | 3 +- .../reference/callbacksDontShareTypes.js | 12 +- .../reference/captureThisInSuperCall.js | 9 +- .../reference/castExpressionParentheses.js | 15 +- tests/baselines/reference/castTest.js | 4 +- tests/baselines/reference/castingTuple.js | 31 +- tests/baselines/reference/catch.js | 12 +- ...arameterConstrainedToOtherTypeParameter.js | 10 +- ...rameterConstrainedToOtherTypeParameter2.js | 52 +- .../baselines/reference/chainedImportAlias.js | 3 +- ...hainedSpecializationToObjectTypeLiteral.js | 8 +- .../reference/classBodyWithStatements.js | 3 +- tests/baselines/reference/classExpression.js | 4 +- .../reference/classExtendingClass.js | 12 +- .../reference/classExtendingPrimitive.js | 3 +- .../reference/classExtendingPrimitive2.js | 3 +- .../reference/classExtendsEveryObjectType.js | 9 +- .../reference/classExtendsEveryObjectType2.js | 6 +- ...sInterfaceThatExtendsClassWithPrivates1.js | 12 +- .../classExtendsValidConstructorFunction.js | 3 +- .../reference/classImplementsClass2.js | 4 +- .../reference/classImplementsClass3.js | 4 +- .../reference/classImplementsClass4.js | 4 +- .../reference/classImplementsClass5.js | 4 +- .../reference/classImplementsClass6.js | 4 +- .../classImplementsImportedInterface.js | 3 +- .../reference/classMethodWithKeywordName1.js | 3 +- tests/baselines/reference/classOrder2.js | 7 +- .../reference/classOverloadForFunction.js | 3 +- .../reference/classPropertyAsPrivate.js | 20 +- .../reference/classPropertyAsProtected.js | 20 +- .../classPropertyIsPublicByDefault.js | 20 +- .../reference/classSideInheritance1.js | 4 +- .../baselines/reference/classWithEmptyBody.js | 14 +- .../reference/classWithMultipleBaseClasses.js | 12 +- ...hOnlyPublicMembersEquivalentToInterface.js | 11 +- ...OnlyPublicMembersEquivalentToInterface2.js | 11 +- .../reference/classWithOptionalParameter.js | 6 +- ...ssWithOverloadImplementationOfWrongName.js | 3 +- ...sWithOverloadImplementationOfWrongName2.js | 3 +- .../reference/classWithPrivateProperty.js | 16 +- .../reference/classWithProtectedProperty.js | 16 +- .../reference/classWithPublicProperty.js | 16 +- .../reference/classWithStaticMembers.js | 11 +- tests/baselines/reference/classdecl.js | 8 +- .../cloduleAcrossModuleDefinitions.js | 6 +- tests/baselines/reference/cloduleTest1.js | 3 +- .../reference/cloduleWithDuplicateMember1.js | 13 +- .../reference/cloduleWithDuplicateMember2.js | 9 +- .../reference/clodulesDerivedClasses.js | 4 +- .../reference/collisionSuperAndParameter.js | 20 +- ...collisionThisExpressionAndAliasInGlobal.js | 4 +- ...onThisExpressionAndAmbientClassInGlobal.js | 4 +- ...sionThisExpressionAndAmbientVarInGlobal.js | 4 +- ...collisionThisExpressionAndClassInGlobal.js | 4 +- .../collisionThisExpressionAndEnumInGlobal.js | 4 +- ...lisionThisExpressionAndFunctionInGlobal.js | 4 +- ...ionThisExpressionAndLocalVarInAccessors.js | 36 +- ...nThisExpressionAndLocalVarInConstructor.js | 18 +- ...sionThisExpressionAndLocalVarInFunction.js | 4 +- ...lisionThisExpressionAndLocalVarInLambda.js | 14 +- ...lisionThisExpressionAndLocalVarInMethod.js | 18 +- ...sionThisExpressionAndLocalVarInProperty.js | 18 +- ...xpressionAndLocalVarWithSuperExperssion.js | 4 +- ...ollisionThisExpressionAndModuleInGlobal.js | 4 +- ...ollisionThisExpressionAndNameResolution.js | 4 +- .../collisionThisExpressionAndParameter.js | 40 +- ...ionAndPropertyNameAsConstuctorParameter.js | 16 +- .../collisionThisExpressionAndVarInGlobal.js | 4 +- .../commaOperatorWithSecondOperandAnyType.js | 10 +- ...mmaOperatorWithSecondOperandBooleanType.js | 24 +- ...ommaOperatorWithSecondOperandObjectType.js | 5 +- ...ommaOperatorWithSecondOperandStringType.js | 10 +- .../reference/commentEmitAtEndOfFile1.js | 3 +- .../reference/commentInMethodCall.js | 3 +- tests/baselines/reference/commentOnBlock1.js | 3 +- .../reference/commentOnClassAccessor1.js | 4 +- .../reference/commentOnClassAccessor2.js | 7 +- .../commentsBeforeFunctionExpression1.js | 4 +- tests/baselines/reference/commentsFunction.js | 20 +- .../baselines/reference/commentsInterface.js | 4 +- .../reference/commentsOnObjectLiteral3.js | 3 +- tests/baselines/reference/commentsVarDecl.js | 4 +- .../reference/complexClassRelationships.js | 10 +- .../reference/compositeGenericFunction.js | 8 +- .../reference/compoundAssignmentLHSIsValue.js | 28 +- .../reference/computedPropertyNames10_ES5.js | 33 +- .../reference/computedPropertyNames10_ES6.js | 33 +- .../reference/computedPropertyNames11_ES5.js | 83 +- .../reference/computedPropertyNames11_ES6.js | 39 +- .../reference/computedPropertyNames13_ES5.js | 33 +- .../reference/computedPropertyNames13_ES6.js | 33 +- .../reference/computedPropertyNames14_ES5.js | 18 +- .../reference/computedPropertyNames14_ES6.js | 18 +- .../reference/computedPropertyNames15_ES5.js | 9 +- .../reference/computedPropertyNames15_ES6.js | 9 +- .../reference/computedPropertyNames16_ES5.js | 39 +- .../reference/computedPropertyNames16_ES6.js | 39 +- .../reference/computedPropertyNames17_ES5.js | 21 +- .../reference/computedPropertyNames17_ES6.js | 21 +- .../reference/computedPropertyNames1_ES5.js | 15 +- .../reference/computedPropertyNames1_ES6.js | 7 +- .../reference/computedPropertyNames21_ES5.js | 3 +- .../reference/computedPropertyNames21_ES6.js | 3 +- .../reference/computedPropertyNames22_ES5.js | 3 +- .../reference/computedPropertyNames22_ES6.js | 3 +- .../reference/computedPropertyNames23_ES5.js | 3 +- .../reference/computedPropertyNames23_ES6.js | 5 +- .../reference/computedPropertyNames24_ES5.js | 3 +- .../reference/computedPropertyNames24_ES6.js | 3 +- .../reference/computedPropertyNames25_ES5.js | 3 +- .../reference/computedPropertyNames25_ES6.js | 3 +- .../reference/computedPropertyNames26_ES5.js | 3 +- .../reference/computedPropertyNames26_ES6.js | 5 +- .../reference/computedPropertyNames27_ES5.js | 3 +- .../reference/computedPropertyNames27_ES6.js | 3 +- .../reference/computedPropertyNames28_ES5.js | 3 +- .../reference/computedPropertyNames28_ES6.js | 3 +- .../reference/computedPropertyNames29_ES5.js | 3 +- .../reference/computedPropertyNames29_ES6.js | 3 +- .../reference/computedPropertyNames2_ES5.js | 18 +- .../reference/computedPropertyNames2_ES6.js | 18 +- .../reference/computedPropertyNames30_ES5.js | 3 +- .../reference/computedPropertyNames30_ES6.js | 3 +- .../reference/computedPropertyNames31_ES5.js | 3 +- .../reference/computedPropertyNames31_ES6.js | 3 +- .../reference/computedPropertyNames32_ES5.js | 7 +- .../reference/computedPropertyNames32_ES6.js | 7 +- .../reference/computedPropertyNames33_ES5.js | 7 +- .../reference/computedPropertyNames33_ES6.js | 7 +- .../reference/computedPropertyNames34_ES5.js | 7 +- .../reference/computedPropertyNames34_ES6.js | 7 +- .../reference/computedPropertyNames35_ES5.js | 4 +- .../reference/computedPropertyNames35_ES6.js | 4 +- .../reference/computedPropertyNames36_ES5.js | 7 +- .../reference/computedPropertyNames36_ES6.js | 7 +- .../reference/computedPropertyNames37_ES5.js | 7 +- .../reference/computedPropertyNames37_ES6.js | 7 +- .../reference/computedPropertyNames38_ES5.js | 7 +- .../reference/computedPropertyNames38_ES6.js | 7 +- .../reference/computedPropertyNames39_ES5.js | 7 +- .../reference/computedPropertyNames39_ES6.js | 7 +- .../reference/computedPropertyNames3_ES5.js | 24 +- .../reference/computedPropertyNames3_ES6.js | 24 +- .../reference/computedPropertyNames40_ES5.js | 8 +- .../reference/computedPropertyNames40_ES6.js | 8 +- .../reference/computedPropertyNames41_ES5.js | 4 +- .../reference/computedPropertyNames41_ES6.js | 4 +- .../reference/computedPropertyNames43_ES5.js | 7 +- .../reference/computedPropertyNames43_ES6.js | 7 +- .../reference/computedPropertyNames44_ES5.js | 7 +- .../reference/computedPropertyNames44_ES6.js | 7 +- .../reference/computedPropertyNames45_ES5.js | 7 +- .../reference/computedPropertyNames45_ES6.js | 7 +- .../reference/computedPropertyNames49_ES5.js | 32 +- .../reference/computedPropertyNames50_ES5.js | 32 +- .../reference/computedPropertyNames9_ES5.js | 3 +- .../reference/computedPropertyNames9_ES6.js | 3 +- ...omputedPropertyNamesContextualType1_ES5.js | 8 +- ...omputedPropertyNamesContextualType1_ES6.js | 4 +- ...omputedPropertyNamesContextualType2_ES5.js | 8 +- ...omputedPropertyNamesContextualType2_ES6.js | 4 +- ...omputedPropertyNamesContextualType3_ES5.js | 8 +- ...omputedPropertyNamesContextualType3_ES6.js | 4 +- ...omputedPropertyNamesContextualType6_ES5.js | 10 +- ...omputedPropertyNamesContextualType6_ES6.js | 7 +- ...omputedPropertyNamesContextualType7_ES5.js | 10 +- ...omputedPropertyNamesContextualType7_ES6.js | 7 +- ...mputedPropertyNamesDeclarationEmit1_ES5.js | 10 +- ...mputedPropertyNamesDeclarationEmit1_ES6.js | 10 +- ...mputedPropertyNamesDeclarationEmit2_ES5.js | 10 +- ...mputedPropertyNamesDeclarationEmit2_ES6.js | 10 +- ...mputedPropertyNamesDeclarationEmit5_ES5.js | 18 +- ...mputedPropertyNamesDeclarationEmit5_ES6.js | 10 +- .../computedPropertyNamesOnOverloads_ES5.js | 3 +- .../computedPropertyNamesOnOverloads_ES6.js | 3 +- tests/baselines/reference/concatError.js | 4 +- .../conditionalExpressionNewLine10.js | 8 +- .../conditionalExpressionNewLine2.js | 3 +- .../conditionalExpressionNewLine3.js | 3 +- .../conditionalExpressionNewLine4.js | 3 +- .../conditionalExpressionNewLine5.js | 3 +- .../conditionalExpressionNewLine6.js | 4 +- .../conditionalExpressionNewLine7.js | 4 +- .../conditionalExpressionNewLine8.js | 4 +- .../conditionalExpressionNewLine9.js | 6 +- .../reference/conditionalExpressions2.js | 25 +- ...onditionalOperatorConditionIsNumberType.js | 10 +- ...onditionalOperatorConditionIsObjectType.js | 49 +- .../conditionalOperatorConditoinIsAnyType.js | 25 +- ...onditionalOperatorConditoinIsStringType.js | 10 +- .../conditionalOperatorWithIdenticalBCT.js | 46 +- .../conditionalOperatorWithoutIdenticalBCT.js | 24 +- ...cateOverloadsCausedByOverloadResolution.js | 3 +- .../reference/conflictMarkerTrivia2.js | 3 +- .../reference/conflictingTypeAnnotatedVar.js | 6 +- .../reference/constDeclarations-access2.js | 6 +- .../reference/constDeclarations-access3.js | 6 +- .../reference/constDeclarations-access4.js | 6 +- .../reference/constDeclarations-access5.js | 6 +- .../reference/constDeclarations-errors.js | 12 +- tests/baselines/reference/constEnumErrors.js | 4 +- tests/baselines/reference/constEnums.js | 9 +- .../reference/constantOverloadFunction.js | 12 +- .../constantOverloadFunctionNoSubtypeError.js | 12 +- ...nstraintCheckInGenericBaseTypeReference.js | 3 +- .../baselines/reference/constraintErrors1.js | 3 +- .../constraintSatisfactionWithAny.js | 12 +- .../constraintSatisfactionWithEmptyObject.js | 6 +- .../constructorArgWithGenericCallSignature.js | 3 +- .../baselines/reference/constructorAsType.js | 6 +- .../reference/constructorOverloads1.js | 12 +- .../reference/constructorOverloads2.js | 12 +- .../reference/constructorOverloads3.js | 9 +- .../reference/constructorOverloads6.js | 6 +- .../reference/constructorOverloads7.js | 4 +- ...tructorParametersInVariableDeclarations.js | 16 +- .../constructorReturnsInvalidType.js | 3 +- ...nstructorWithAssignableReturnExpression.js | 12 +- ...constructorWithIncompleteTypeAnnotation.js | 81 +- .../contextualSignatureInstantiation1.js | 8 +- .../contextualSignatureInstantiation2.js | 8 +- .../contextualSignatureInstantiation3.js | 10 +- ...arameterConstrainedToOuterTypeParameter.js | 4 +- .../baselines/reference/contextualTypeAny.js | 10 +- .../contextualTypeAppliedToVarArgs.js | 3 +- .../contextualTypeArrayReturnType.js | 4 +- .../reference/contextualTypeWithTuple.js | 67 +- ...ntextualTypeWithUnionTypeCallSignatures.js | 20 +- ...textualTypeWithUnionTypeIndexSignatures.js | 56 +- .../contextualTypeWithUnionTypeMembers.js | 103 +- ...ontextualTypeWithUnionTypeObjectLiteral.js | 8 +- tests/baselines/reference/contextualTyping.js | 157 +- .../reference/contextualTyping.js.map | 2 +- .../reference/contextualTyping.sourcemap.txt | 3717 +++++++++-------- .../baselines/reference/contextualTyping1.js | 2 +- .../baselines/reference/contextualTyping10.js | 9 +- .../baselines/reference/contextualTyping11.js | 4 +- .../baselines/reference/contextualTyping12.js | 10 +- .../baselines/reference/contextualTyping13.js | 4 +- .../baselines/reference/contextualTyping14.js | 4 +- .../baselines/reference/contextualTyping15.js | 4 +- .../baselines/reference/contextualTyping16.js | 8 +- .../baselines/reference/contextualTyping17.js | 9 +- .../baselines/reference/contextualTyping18.js | 4 +- .../baselines/reference/contextualTyping19.js | 15 +- .../baselines/reference/contextualTyping2.js | 5 +- .../baselines/reference/contextualTyping20.js | 16 +- .../baselines/reference/contextualTyping21.js | 13 +- .../baselines/reference/contextualTyping22.js | 8 +- .../baselines/reference/contextualTyping23.js | 4 +- .../baselines/reference/contextualTyping24.js | 4 +- .../baselines/reference/contextualTyping25.js | 3 +- .../baselines/reference/contextualTyping26.js | 3 +- .../baselines/reference/contextualTyping27.js | 3 +- .../baselines/reference/contextualTyping28.js | 7 +- .../baselines/reference/contextualTyping29.js | 8 +- .../baselines/reference/contextualTyping3.js | 4 +- .../baselines/reference/contextualTyping30.js | 8 +- .../baselines/reference/contextualTyping31.js | 7 +- .../baselines/reference/contextualTyping32.js | 12 +- .../baselines/reference/contextualTyping33.js | 12 +- .../baselines/reference/contextualTyping34.js | 4 +- .../baselines/reference/contextualTyping35.js | 5 +- .../baselines/reference/contextualTyping36.js | 7 +- .../baselines/reference/contextualTyping37.js | 7 +- .../baselines/reference/contextualTyping38.js | 4 +- .../baselines/reference/contextualTyping39.js | 4 +- .../baselines/reference/contextualTyping4.js | 5 +- .../baselines/reference/contextualTyping40.js | 4 +- .../baselines/reference/contextualTyping41.js | 4 +- .../baselines/reference/contextualTyping6.js | 9 +- .../baselines/reference/contextualTyping7.js | 4 +- .../baselines/reference/contextualTyping8.js | 4 +- .../baselines/reference/contextualTyping9.js | 10 +- .../contextualTypingArrayOfLambdas.js | 9 +- .../reference/contextualTypingOfAccessors.js | 7 +- .../contextualTypingOfArrayLiterals1.js | 5 +- ...contextualTypingOfConditionalExpression.js | 12 +- ...ontextualTypingOfConditionalExpression2.js | 5 +- ...lTypingOfGenericFunctionTypedArguments1.js | 8 +- ...ontextualTypingOfLambdaReturnExpression.js | 11 +- ...ualTypingOfLambdaWithMultipleSignatures.js | 3 +- ...alTypingOfLambdaWithMultipleSignatures2.js | 4 +- .../contextualTypingOfObjectLiterals.js | 7 +- .../contextualTypingOfObjectLiterals2.js | 9 +- ...alTypingTwoInstancesOfSameTypeParameter.js | 6 +- ...ontextualTypingWithFixedTypeParameters1.js | 12 +- ...TypingWithGenericAndNonGenericSignature.js | 8 +- .../contextualTypingWithGenericSignature.js | 4 +- .../reference/contextuallyTypingOrOperator.js | 28 +- .../contextuallyTypingOrOperator2.js | 16 +- .../baselines/reference/convertKeywordsYes.js | 3 +- .../couldNotSelectGenericOverload.js | 13 +- tests/baselines/reference/covariance1.js | 11 +- .../reference/crashInResolveInterface.js | 4 +- .../baselines/reference/customEventDetail.js | 5 +- tests/baselines/reference/debuggerEmit.js | 4 +- .../declFileAliasUseBeforeDeclaration.js | 3 +- ...declFileForClassWithMultipleBaseClasses.js | 18 +- ...leForClassWithPrivateOverloadedFunction.js | 3 +- .../reference/declFileGenericType.js | 27 +- ...ModuleAssignmentInObjectLiteralProperty.js | 8 +- .../declFileObjectLiteralWithAccessors.js | 8 +- .../declFileObjectLiteralWithOnlyGetter.js | 4 +- .../declFileObjectLiteralWithOnlySetter.js | 4 +- .../reference/declFilePrivateStatic.js | 20 +- .../reference/declFileRegressionTests.js | 8 +- ...RestParametersOfFunctionAndFunctionType.js | 18 +- .../declFileTypeAnnotationArrayType.js | 40 +- .../declFileTypeAnnotationParenType.js | 20 +- .../declFileTypeAnnotationTupleType.js | 13 +- .../declFileTypeAnnotationUnionType.js | 8 +- .../reference/declFileTypeofFunction.js | 8 +- .../declFileTypeofInAnonymousType.js | 16 +- tests/baselines/reference/declInput-2.js | 22 +- tests/baselines/reference/declInput.js | 12 +- tests/baselines/reference/declInput3.js | 12 +- tests/baselines/reference/declInput4.js | 11 +- .../declarationEmit_nameConflicts.js | 18 +- .../declarationEmit_nameConflicts2.js | 3 +- .../declarationEmit_nameConflicts3.js | 12 +- .../declarationEmit_protectedMembers.js | 18 +- .../reference/declarationsAndAssignments.js | 364 +- .../decrementOperatorWithAnyOtherType.js | 10 +- ...eratorWithAnyOtherTypeInvalidOperations.js | 11 +- .../decrementOperatorWithNumberType.js | 5 +- ...OperatorWithNumberTypeInvalidOperations.js | 37 +- ...ementOperatorWithUnsupportedBooleanType.js | 32 +- ...rementOperatorWithUnsupportedStringType.js | 37 +- .../defaultArgsInFunctionExpressions.js | 8 +- .../defaultBestCommonTypesHaveDecls.js | 8 +- .../baselines/reference/defaultIndexProps1.js | 4 +- .../baselines/reference/defaultIndexProps2.js | 4 +- .../deleteOperatorWithAnyOtherType.js | 11 +- .../deleteOperatorWithBooleanType.js | 13 +- .../reference/deleteOperatorWithNumberType.js | 25 +- .../reference/deleteOperatorWithStringType.js | 25 +- ...derivedClassConstructorWithoutSuperCall.js | 8 +- .../derivedClassIncludesInheritedMembers.js | 20 +- .../derivedClassOverridesProtectedMembers.js | 40 +- .../derivedClassOverridesProtectedMembers2.js | 40 +- .../derivedClassOverridesProtectedMembers3.js | 40 +- .../derivedClassOverridesPublicMembers.js | 40 +- .../derivedClassSuperCallsWithThisArg.js | 8 +- .../reference/derivedClassTransitivity.js | 9 +- .../reference/derivedClassTransitivity2.js | 9 +- .../reference/derivedClassTransitivity3.js | 9 +- .../reference/derivedClassTransitivity4.js | 9 +- .../reference/derivedClassWithAny.js | 8 +- ...ivateInstanceShadowingProtectedInstance.js | 14 +- ...hPrivateInstanceShadowingPublicInstance.js | 14 +- ...thPrivateStaticShadowingProtectedStatic.js | 14 +- ...sWithPrivateStaticShadowingPublicStatic.js | 14 +- tests/baselines/reference/derivedClasses.js | 16 +- .../reference/derivedGenericClassWithAny.js | 8 +- ...sesHiddenBaseCallViaSuperPropertyAccess.js | 14 +- .../derivedTypeDoesNotRequireExtendsClause.js | 5 +- .../destructuringParameterProperties1.js | 36 +- .../destructuringParameterProperties2.js | 36 +- .../destructuringParameterProperties3.js | 48 +- .../destructuringParameterProperties5.js | 18 +- .../detachedCommentAtStartOfConstructor1.js | 4 +- .../detachedCommentAtStartOfConstructor2.js | 4 +- .../detachedCommentAtStartOfFunctionBody1.js | 4 +- .../detachedCommentAtStartOfFunctionBody2.js | 4 +- ...tWidenAtObjectLiteralPropertyAssignment.js | 9 +- .../reference/doWhileBreakStatements.js | 3 +- .../reference/doWhileContinueStatements.js | 3 +- tests/baselines/reference/doWhileLoop.js | 3 +- .../reference/dottedSymbolResolution1.js | 3 +- .../reference/downlevelLetConst12.js | 8 +- .../reference/downlevelLetConst13.js | 32 +- .../reference/downlevelLetConst14.js | 32 +- .../reference/downlevelLetConst15.js | 36 +- .../reference/downlevelLetConst16.js | 104 +- .../reference/downlevelLetConst18.js | 34 +- .../duplicateIdentifierInCatchBlock.js | 21 +- ...ateIdentifiersAcrossContainerBoundaries.js | 9 +- .../reference/duplicateLocalVariable1.js | 202 +- .../reference/duplicateLocalVariable2.js | 8 +- .../duplicateObjectLiteralProperty.js | 11 +- .../duplicateOverloadInTypeAugmentation1.js | 4 +- .../reference/duplicatePropertyNames.js | 18 +- .../duplicateSymbolsExportMatching.js | 3 +- .../reference/duplicateTypeParameters1.js | 3 +- .../reference/duplicateTypeParameters2.js | 6 +- tests/baselines/reference/elaboratedErrors.js | 3 +- .../baselines/reference/emitArrowFunction.js | 17 +- .../reference/emitArrowFunctionAsIs.js | 9 +- .../reference/emitArrowFunctionAsIsES6.js | 9 +- .../reference/emitArrowFunctionES6.js | 19 +- .../emitArrowFunctionThisCapturing.js | 3 +- .../emitArrowFunctionThisCapturingES6.js | 3 +- .../emitArrowFunctionWhenUsingArguments.js | 3 +- .../emitArrowFunctionWhenUsingArgumentsES6.js | 3 +- .../reference/emitArrowFunctionsAsIs.js | 9 +- .../reference/emitArrowFunctionsAsIsES6.js | 9 +- .../emitDefaultParametersFunctionES6.js | 12 +- ...tDefaultParametersFunctionExpressionES6.js | 21 +- ...mitDefaultParametersFunctionPropertyES6.js | 12 +- .../emitDefaultParametersMethodES6.js | 12 +- .../emitRestParametersFunctionES6.js | 6 +- ...emitRestParametersFunctionExpressionES6.js | 12 +- .../emitRestParametersFunctionPropertyES6.js | 3 +- .../reference/emitRestParametersMethodES6.js | 12 +- tests/baselines/reference/emptyExpr.js | 4 +- .../reference/emptyTypeArgumentList.js | 3 +- .../enumAssignabilityInInheritance.js | 3 +- tests/baselines/reference/enumBasics.js | 16 +- .../enumConflictsWithGlobalIdentifier.js | 3 +- tests/baselines/reference/enumIndexer.js | 13 +- .../enumIsNotASubtypeOfAnythingButNumber.js | 3 +- .../reference/enumMemberResolution.js | 3 +- tests/baselines/reference/enumMerging.js | 18 +- .../errorOnContextuallyTypedReturnType.js | 6 +- .../reference/errorSuperPropertyAccess.js | 21 +- tests/baselines/reference/errorSupression1.js | 4 +- .../reference/errorsInGenericTypeReference.js | 24 +- tests/baselines/reference/es6ClassTest.js | 8 +- tests/baselines/reference/es6ClassTest2.js | 10 +- tests/baselines/reference/es6ClassTest3.js | 6 +- tests/baselines/reference/es6ClassTest8.js | 24 +- tests/baselines/reference/es6ClassTest9.js | 3 +- tests/baselines/reference/es6MemberScoping.js | 4 +- .../baselines/reference/escapedIdentifiers.js | 16 +- .../everyTypeWithAnnotationAndInitializer.js | 20 +- ...TypeWithAnnotationAndInvalidInitializer.js | 24 +- .../reference/everyTypeWithInitializer.js | 16 +- .../baselines/reference/exportAlreadySeen.js | 3 +- .../baselines/reference/exportAssignTypes.js | 10 +- .../exportAssignmentConstrainedGenericType.js | 5 +- .../reference/exportAssignmentFunction.js | 4 +- .../exportAssignmentMergedInterface.js | 8 +- tests/baselines/reference/exportCodeGen.js | 6 +- .../reference/exportImportMultipleFiles.js | 4 +- .../exportImportNonInstantiatedModule.js | 4 +- .../exportImportNonInstantiatedModule2.js | 4 +- .../reference/exportNonVisibleType.js | 5 +- .../baselines/reference/exportPrivateType.js | 4 +- .../baselines/reference/exportedVariable1.js | 4 +- .../extendAndImplementTheSameBaseType.js | 6 +- .../extendAndImplementTheSameBaseType2.js | 3 +- tests/baselines/reference/extendArray.js | 8 +- .../reference/extendNonClassSymbol1.js | 3 +- .../reference/extendsClauseAlreadySeen.js | 3 +- .../reference/extendsClauseAlreadySeen2.js | 3 +- tests/baselines/reference/externModule.js | 3 +- ...ceOfImportDeclarationWithExportModifier.js | 3 +- ...ernceResolutionOrderInImportDeclaration.js | 3 +- .../reference/fatArrowfunctionAsType.js | 4 +- .../baselines/reference/fatarrowfunctions.js | 78 +- .../reference/fatarrowfunctionsErrors.js | 21 +- ...rowfunctionsInFunctionParameterDefaults.js | 4 +- .../fatarrowfunctionsOptionalArgs.js | 222 +- .../fatarrowfunctionsOptionalArgsErrors1.js | 4 +- .../fatarrowfunctionsOptionalArgsErrors4.js | 26 +- .../reference/fieldAndGetterWithSameName.js | 4 +- ...eParameterInSignatureWithRestParameters.js | 3 +- tests/baselines/reference/for-inStatements.js | 109 +- .../for-inStatementsDestructuring.js | 3 +- .../for-inStatementsDestructuring2.js | 3 +- .../for-inStatementsDestructuring3.js | 6 +- .../for-inStatementsDestructuring4.js | 6 +- .../reference/for-inStatementsInvalid.js | 82 +- tests/baselines/reference/for-of1.js | 3 +- tests/baselines/reference/for-of10.js | 5 +- tests/baselines/reference/for-of11.js | 6 +- tests/baselines/reference/for-of12.js | 6 +- tests/baselines/reference/for-of13.js | 5 +- tests/baselines/reference/for-of14.js | 3 +- tests/baselines/reference/for-of15.js | 3 +- tests/baselines/reference/for-of16.js | 3 +- tests/baselines/reference/for-of17.js | 3 +- tests/baselines/reference/for-of18.js | 3 +- tests/baselines/reference/for-of2.js | 3 +- tests/baselines/reference/for-of24.js | 3 +- tests/baselines/reference/for-of25.js | 3 +- tests/baselines/reference/for-of26.js | 3 +- tests/baselines/reference/for-of27.js | 3 +- tests/baselines/reference/for-of28.js | 3 +- tests/baselines/reference/for-of29.js | 3 +- tests/baselines/reference/for-of3.js | 3 +- tests/baselines/reference/for-of30.js | 3 +- tests/baselines/reference/for-of31.js | 3 +- tests/baselines/reference/for-of32.js | 3 +- tests/baselines/reference/for-of33.js | 3 +- tests/baselines/reference/for-of34.js | 3 +- tests/baselines/reference/for-of35.js | 3 +- tests/baselines/reference/for-of36.js | 5 +- tests/baselines/reference/for-of37.js | 7 +- tests/baselines/reference/for-of38.js | 7 +- tests/baselines/reference/for-of39.js | 11 +- tests/baselines/reference/for-of4.js | 4 +- tests/baselines/reference/for-of40.js | 7 +- tests/baselines/reference/for-of41.js | 11 +- tests/baselines/reference/for-of42.js | 7 +- tests/baselines/reference/for-of43.js | 7 +- tests/baselines/reference/for-of44.js | 15 +- tests/baselines/reference/for-of45.js | 12 +- tests/baselines/reference/for-of46.js | 12 +- tests/baselines/reference/for-of47.js | 12 +- tests/baselines/reference/for-of48.js | 12 +- tests/baselines/reference/for-of49.js | 14 +- tests/baselines/reference/for-of5.js | 4 +- tests/baselines/reference/for-of50.js | 7 +- tests/baselines/reference/for-of51.js | 3 +- tests/baselines/reference/for-of52.js | 5 +- tests/baselines/reference/for-of55.js | 4 +- tests/baselines/reference/for-of56.js | 3 +- tests/baselines/reference/for-of6.js | 4 +- tests/baselines/reference/for-of7.js | 5 +- tests/baselines/reference/for-of8.js | 5 +- tests/baselines/reference/for-of9.js | 8 +- .../baselines/reference/forBreakStatements.js | 3 +- .../reference/forContinueStatements.js | 3 +- .../reference/forInBreakStatements.js | 3 +- .../reference/forInContinueStatements.js | 3 +- tests/baselines/reference/forStatements.js | 68 +- .../forStatementsMultipleInvalidDecl.js | 75 +- .../forStatementsMultipleValidDecl.js | 91 +- tests/baselines/reference/funClodule.js | 6 +- tests/baselines/reference/funcdecl.js | 3 +- .../functionAndInterfaceWithSeparateErrors.js | 3 +- .../functionAndPropertyNameConflict.js | 3 +- .../reference/functionArgShadowing.js | 6 +- .../baselines/reference/functionAssignment.js | 27 +- .../reference/functionAssignmentError.js | 8 +- tests/baselines/reference/functionCall1.js | 4 +- tests/baselines/reference/functionCall11.js | 3 +- tests/baselines/reference/functionCall12.js | 3 +- tests/baselines/reference/functionCall2.js | 4 +- tests/baselines/reference/functionCall3.js | 6 +- tests/baselines/reference/functionCall4.js | 8 +- tests/baselines/reference/functionCall5.js | 4 +- tests/baselines/reference/functionCall6.js | 3 +- tests/baselines/reference/functionCall7.js | 4 +- tests/baselines/reference/functionCall8.js | 3 +- tests/baselines/reference/functionCall9.js | 3 +- .../functionConstraintSatisfaction.js | 36 +- .../functionConstraintSatisfaction2.js | 26 +- .../functionConstraintSatisfaction3.js | 28 +- ...ctionExpressionAndLambdaMatchesFunction.js | 7 +- .../functionExpressionInWithBlock.js | 4 +- .../functionExpressionReturningItself.js | 4 +- .../reference/functionImplementationErrors.js | 8 +- .../reference/functionImplementations.js | 8 +- tests/baselines/reference/functionLiteral.js | 8 +- .../reference/functionLiteralForOverloads.js | 16 +- .../reference/functionNameConflicts.js | 15 +- .../reference/functionOverloadAmbiguity1.js | 14 +- .../reference/functionOverloadErrors.js | 48 +- .../reference/functionOverloadErrorsSyntax.js | 9 +- ...nctionOverloadImplementationOfWrongName.js | 3 +- ...ctionOverloadImplementationOfWrongName2.js | 3 +- .../baselines/reference/functionOverloads.js | 4 +- .../baselines/reference/functionOverloads1.js | 4 +- .../reference/functionOverloads10.js | 3 +- .../reference/functionOverloads11.js | 4 +- .../reference/functionOverloads12.js | 10 +- .../reference/functionOverloads13.js | 4 +- .../reference/functionOverloads14.js | 6 +- .../reference/functionOverloads15.js | 4 +- .../reference/functionOverloads16.js | 4 +- .../reference/functionOverloads17.js | 6 +- .../reference/functionOverloads18.js | 6 +- .../reference/functionOverloads19.js | 6 +- .../baselines/reference/functionOverloads2.js | 4 +- .../reference/functionOverloads20.js | 4 +- .../reference/functionOverloads21.js | 4 +- .../reference/functionOverloads22.js | 8 +- .../reference/functionOverloads23.js | 4 +- .../reference/functionOverloads24.js | 5 +- .../reference/functionOverloads25.js | 4 +- .../reference/functionOverloads26.js | 4 +- .../reference/functionOverloads27.js | 4 +- .../reference/functionOverloads28.js | 4 +- .../reference/functionOverloads29.js | 4 +- .../reference/functionOverloads30.js | 4 +- .../reference/functionOverloads31.js | 4 +- .../reference/functionOverloads32.js | 4 +- .../reference/functionOverloads33.js | 4 +- .../reference/functionOverloads34.js | 4 +- .../reference/functionOverloads35.js | 8 +- .../reference/functionOverloads36.js | 8 +- .../reference/functionOverloads37.js | 4 +- .../reference/functionOverloads38.js | 10 +- .../reference/functionOverloads39.js | 10 +- .../baselines/reference/functionOverloads4.js | 4 +- .../reference/functionOverloads40.js | 10 +- .../reference/functionOverloads41.js | 8 +- .../reference/functionOverloads42.js | 10 +- .../baselines/reference/functionOverloads5.js | 3 +- .../baselines/reference/functionOverloads6.js | 3 +- .../baselines/reference/functionOverloads7.js | 4 +- .../baselines/reference/functionOverloads8.js | 4 +- .../baselines/reference/functionOverloads9.js | 4 +- tests/baselines/reference/functionReturn.js | 10 +- tests/baselines/reference/functionType.js | 3 +- .../functionTypeArgumentAssignmentCompat.js | 4 +- ...nWithAnyReturnTypeAndNoReturnExpression.js | 9 +- ...nWithDefaultParameterWithNoStatements10.js | 8 +- ...nWithDefaultParameterWithNoStatements13.js | 8 +- .../functionWithMultipleReturnStatements2.js | 12 +- ...nsMissingReturnStatementsAndExpressions.js | 3 +- .../functionsWithModifiersInBlocks1.js | 3 +- .../reference/funduleSplitAcrossFiles.js | 3 +- tests/baselines/reference/fuzzy.js | 13 +- .../reference/generatedContextualTyping.js | 2671 ++++++++++-- .../generativeRecursionWithTypeOf.js | 3 +- .../genericArgumentCallSigAssignmentCompat.js | 11 +- tests/baselines/reference/genericArray1.js | 8 +- .../reference/genericArrayMethods1.js | 5 +- ...icAssignmentCompatOfFunctionSignatures1.js | 6 +- .../genericAssignmentCompatWithInterfaces1.js | 16 +- .../genericCallWithArrayLiteralArgs.js | 30 +- .../genericCallWithFixedArguments.js | 9 +- .../genericCallWithFunctionTypedArguments.js | 56 +- .../genericCallWithFunctionTypedArguments5.js | 36 +- ...enericCallWithGenericSignatureArguments.js | 66 +- ...nericCallWithGenericSignatureArguments2.js | 60 +- ...nericCallWithGenericSignatureArguments3.js | 76 +- .../genericCallWithNonGenericArgs1.js | 3 +- .../genericCallWithObjectLiteralArgs.js | 20 +- .../genericCallWithObjectLiteralArguments1.js | 29 +- .../genericCallWithObjectTypeArgs2.js | 24 +- ...icCallWithObjectTypeArgsAndConstraints2.js | 22 +- ...icCallWithObjectTypeArgsAndConstraints3.js | 27 +- ...icCallWithObjectTypeArgsAndConstraints4.js | 18 +- ...icCallWithObjectTypeArgsAndConstraints5.js | 9 +- ...allWithOverloadedFunctionTypedArguments.js | 32 +- ...llWithOverloadedFunctionTypedArguments2.js | 17 +- .../reference/genericCallWithTupleType.js | 50 +- .../genericCallbacksAndClassHierarchy.js | 6 +- .../reference/genericCallsWithoutParens.js | 3 +- .../reference/genericChainedCalls.js | 23 +- ...cClassPropertyInheritanceSpecialization.js | 7 +- ...icClassWithFunctionTypedMemberArguments.js | 60 +- ...nericClassWithStaticsUsingTypeArguments.js | 11 +- .../reference/genericCloduleInModule.js | 6 +- .../reference/genericCloduleInModule2.js | 6 +- .../reference/genericCombinators2.js | 8 +- .../reference/genericConstraintDeclaration.js | 4 +- .../genericConstraintSatisfaction1.js | 4 +- .../genericContextualTypingSpecialization.js | 4 +- .../genericFunctionHasFreshTypeArgs.js | 9 +- .../genericFunctionSpecializations1.js | 6 +- .../genericFunctionTypedArgumentsAreFixed.js | 6 +- .../baselines/reference/genericFunctions0.js | 4 +- .../baselines/reference/genericFunctions1.js | 4 +- .../baselines/reference/genericFunctions2.js | 4 +- ...genericFunctionsWithOptionalParameters3.js | 23 +- .../reference/genericFunduleInModule.js | 4 +- .../reference/genericFunduleInModule2.js | 4 +- .../baselines/reference/genericImplements.js | 12 +- .../baselines/reference/genericInference1.js | 8 +- .../reference/genericInterfaceTypeCall.js | 8 +- .../genericLambaArgWithoutTypeArguments.js | 4 +- ...ericMergedDeclarationUsingTypeParameter.js | 4 +- .../genericMethodOverspecialization.js | 8 +- .../reference/genericObjectLitReturnType.js | 6 +- .../reference/genericOfACloduleType1.js | 7 +- .../reference/genericOfACloduleType2.js | 7 +- .../reference/genericOverloadSignatures.js | 3 +- .../genericParameterAssignability1.js | 8 +- .../reference/genericPrototypeProperty.js | 4 +- ...ericRecursiveImplicitConstructorErrors3.js | 5 +- tests/baselines/reference/genericReduce.js | 23 +- tests/baselines/reference/genericRestArgs.js | 6 +- .../reference/genericReturnTypeFromGetter1.js | 4 +- .../genericReversingTypeParameters.js | 8 +- .../genericReversingTypeParameters2.js | 8 +- .../reference/genericSpecializations1.js | 12 +- .../reference/genericSpecializations2.js | 12 +- .../reference/genericSpecializations3.js | 16 +- .../reference/genericStaticAnyTypeFunction.js | 4 +- .../genericTypeArgumentInference1.js | 15 +- .../reference/genericTypeAssertions1.js | 3 +- .../reference/genericTypeAssertions2.js | 3 +- .../reference/genericTypeAssertions3.js | 8 +- .../reference/genericTypeAssertions4.js | 12 +- ...genericTypeReferenceWithoutTypeArgument.js | 21 +- ...enericTypeReferenceWithoutTypeArgument2.js | 21 +- .../genericTypeReferencesRequireTypeArgs.js | 4 +- .../genericTypeWithNonGenericBaseMisMatch.js | 3 +- .../genericWithIndexerOfTypeParameterType2.js | 3 +- .../genericWithOpenTypeParameters1.js | 20 +- .../genericsAndHigherOrderFunctions.js | 8 +- .../reference/genericsManyTypeParameters.js | 128 +- .../genericsWithDuplicateTypeParameters1.js | 21 +- .../genericsWithoutTypeParameters1.js | 22 +- .../reference/getAndSetAsMemberNames.js | 11 +- .../reference/getAndSetNotIdenticalType.js | 3 +- .../baselines/reference/getsetReturnTypes.js | 4 +- .../reference/getterSetterNonAccessor.js | 7 +- .../baselines/reference/gettersAndSetters.js | 35 +- .../gettersAndSettersAccessibility.js | 7 +- .../reference/gettersAndSettersErrors.js | 21 +- .../reference/gettersAndSettersTypesAgree.js | 30 +- tests/baselines/reference/giant.js | 204 +- .../baselines/reference/globalThisCapture.js | 4 +- .../baselines/reference/grammarAmbiguities.js | 8 +- .../reference/grammarAmbiguities1.js | 14 +- .../heterogeneousArrayAndOverloads.js | 21 +- .../reference/heterogeneousArrayLiterals.js | 457 +- .../reference/ifDoWhileStatements.js | 297 +- .../illegalSuperCallsInConstructor.js | 12 +- .../reference/implementsClauseAlreadySeen.js | 3 +- .../reference/implicitAnyCastedValue.js | 5 +- ...AnyDeclareFunctionExprWithoutFormalType.js | 37 +- ...icitAnyDeclareFunctionWithoutFormalType.js | 12 +- .../implicitAnyDeclareMemberWithoutType2.js | 3 +- ...itAnyDeclareVariablesWithoutTypeAndInit.js | 3 +- .../implicitAnyFromCircularInference.js | 16 +- ...tAnyFunctionInvocationWithAnyArguements.js | 32 +- ...mplicitAnyFunctionReturnNullOrUndefined.js | 24 +- .../implicitAnyGenericTypeInference.js | 6 +- .../reference/implicitAnyGenerics.js | 4 +- .../baselines/reference/implicitAnyInCatch.js | 9 +- ...licitAnyNewExprLackConstructorSignature.js | 4 +- .../reference/implicitAnyWidenToAny.js | 32 +- ...sAnExternalModuleInsideAnInternalModule.js | 3 +- .../reference/importAliasIdentifiers.js | 15 +- .../baselines/reference/importAsBaseClass.js | 4 +- tests/baselines/reference/importDecl.js | 20 +- .../reference/importInTypePosition.js | 5 +- tests/baselines/reference/importStatements.js | 5 +- .../reference/importStatementsInterfaces.js | 6 +- .../reference/importedModuleAddToGlobal.js | 4 +- tests/baselines/reference/inOperator.js | 9 +- .../reference/inOperatorWithFunction.js | 8 +- .../baselines/reference/incompatibleTypes.js | 36 +- .../reference/incompleteObjectLiteral1.js | 4 +- .../incrementOperatorWithAnyOtherType.js | 10 +- ...eratorWithAnyOtherTypeInvalidOperations.js | 11 +- .../incrementOperatorWithNumberType.js | 5 +- ...OperatorWithNumberTypeInvalidOperations.js | 37 +- ...ementOperatorWithUnsupportedBooleanType.js | 32 +- ...rementOperatorWithUnsupportedStringType.js | 37 +- .../indexSignaturesInferentialTyping.js | 28 +- tests/baselines/reference/indexer.js | 9 +- tests/baselines/reference/indexerA.js | 9 +- tests/baselines/reference/indexerWithTuple.js | 23 +- .../reference/inferSecondaryParameter.js | 5 +- ...eArgumentsInSignatureWithRestParameters.js | 11 +- .../inferenceFromParameterlessLambda.js | 9 +- .../inferentialTypingWithFunctionType2.js | 6 +- ...inferentialTypingWithFunctionTypeNested.js | 6 +- ...ypingWithFunctionTypeSyntacticScenarios.js | 8 +- .../inferentialTypingWithFunctionTypeZip.js | 8 +- ...entialTypingWithObjectLiteralProperties.js | 20 +- tests/baselines/reference/inheritance.js | 16 +- tests/baselines/reference/inheritance1.js | 12 +- ...itanceGrandParentPrivateMemberCollision.js | 6 +- ...tPrivateMemberCollisionWithPublicMember.js | 6 +- ...tPublicMemberCollisionWithPrivateMember.js | 6 +- ...nheritedFunctionAssignmentCompatibility.js | 11 +- .../reference/innerBoundLambdaEmit.js | 3 +- tests/baselines/reference/innerFunc.js | 8 +- tests/baselines/reference/innerModExport1.js | 12 +- tests/baselines/reference/innerModExport2.js | 12 +- tests/baselines/reference/innerOverloads.js | 4 +- .../instanceAndStaticDeclarations1.js | 4 +- .../instanceMemberAssignsToClassPrototype.js | 14 +- ...nstancePropertiesInheritedIntoClassType.js | 14 +- .../reference/instancePropertyInClassType.js | 14 +- .../instanceofOperatorWithInvalidOperands.js | 3 +- ...tantiateNonGenericTypeWithTypeArguments.js | 3 +- .../baselines/reference/instantiatedModule.js | 5 +- tests/baselines/reference/intTypeCheck.js | 40 +- tests/baselines/reference/interface0.js | 4 +- .../reference/interfaceAssignmentCompat.js | 12 +- .../reference/interfaceContextualType.js | 8 +- .../reference/interfaceDeclaration2.js | 3 +- .../reference/interfaceDeclaration4.js | 3 +- .../reference/interfaceExtendingClass.js | 3 +- .../reference/interfaceExtendingClass2.js | 3 +- .../reference/interfaceExtendsClass1.js | 9 +- .../interfaceExtendsClassWithPrivate1.js | 15 +- .../interfaceExtendsClassWithPrivate2.js | 26 +- .../reference/interfaceImplementation1.js | 3 +- .../reference/interfaceImplementation3.js | 3 +- .../reference/interfaceImplementation4.js | 3 +- .../reference/interfaceImplementation5.js | 30 +- .../reference/interfaceImplementation6.js | 4 +- .../reference/interfaceImplementation7.js | 4 +- tests/baselines/reference/interfaceNaming1.js | 3 +- .../baselines/reference/interfaceSubtyping.js | 4 +- .../interfaceWithPropertyOfEveryType.js | 15 +- ...aceWithPropertyThatIsPrivateInBaseType2.js | 6 +- .../invalidDoWhileBreakStatements.js | 3 +- .../invalidDoWhileContinueStatements.js | 3 +- .../reference/invalidForBreakStatements.js | 3 +- .../reference/invalidForContinueStatements.js | 3 +- .../reference/invalidForInBreakStatements.js | 3 +- .../invalidForInContinueStatements.js | 3 +- .../invalidModuleWithVarStatements.js | 9 +- .../invalidMultipleVariableDeclarations.js | 29 +- .../reference/invalidReturnStatements.js | 28 +- .../baselines/reference/invalidStaticField.js | 4 +- .../reference/invalidTryStatements.js | 18 +- .../reference/invalidTryStatements2.js | 12 +- .../reference/invalidTypeOfTarget.js | 3 +- .../reference/invalidUndefinedAssignments.js | 3 +- .../reference/invalidUndefinedValues.js | 5 +- .../reference/invalidVoidAssignments.js | 5 +- .../baselines/reference/invalidVoidValues.js | 5 +- .../reference/invalidWhileBreakStatements.js | 3 +- .../invalidWhileContinueStatements.js | 3 +- tests/baselines/reference/ipromise4.js | 9 +- .../reference/iterableContextualTyping1.js | 4 +- tests/baselines/reference/keywordField.js | 4 +- tests/baselines/reference/lambdaExpression.js | 8 +- tests/baselines/reference/lambdaParamTypes.js | 51 +- tests/baselines/reference/lambdaPropSelf.js | 4 +- .../reference/lastPropertyInLiteralWins.js | 12 +- .../reference/letAndVarRedeclaration.js | 15 +- .../reference/letDeclarations-access.js | 6 +- .../reference/letDeclarations-es5.js | 6 +- tests/baselines/reference/letDeclarations.js | 6 +- .../reference/letInLetOrConstDeclarations.js | 3 +- tests/baselines/reference/lift.js | 8 +- .../baselines/reference/literals-negative.js | 6 +- .../reference/localImportNameVsGlobalName.js | 3 +- .../logicalNotOperatorWithAnyOtherType.js | 11 +- .../logicalNotOperatorWithBooleanType.js | 13 +- .../logicalNotOperatorWithNumberType.js | 25 +- .../logicalNotOperatorWithStringType.js | 25 +- .../logicalOrExpressionIsContextuallyTyped.js | 8 +- ...gicalOrExpressionIsNotContextuallyTyped.js | 4 +- .../logicalOrOperatorWithTypeParameters.js | 4 +- .../matchingOfObjectLiteralConstraints.js | 7 +- tests/baselines/reference/maxConstraints.js | 4 +- .../memberFunctionsWithPrivateOverloads.js | 24 +- .../memberFunctionsWithPublicOverloads.js | 24 +- ...mberFunctionsWithPublicPrivateOverloads.js | 36 +- .../reference/mergedDeclarations1.js | 5 +- .../reference/mergedDeclarations4.js | 3 +- .../mergedModuleDeclarationCodeGen2.js | 3 +- .../mergedModuleDeclarationCodeGen3.js | 3 +- .../mergedModuleDeclarationCodeGen4.js | 3 +- .../mergedModuleDeclarationCodeGen5.js | 12 +- .../methodContainingLocalFunction.js | 18 +- ...hedExplicitTypeParameterAndArgumentType.js | 46 +- tests/baselines/reference/missingSelf.js | 14 +- .../reference/missingTypeArguments2.js | 7 +- .../mixingFunctionAndAmbientModule1.js | 6 +- .../mixingStaticAndInstanceOverloads.js | 18 +- tests/baselines/reference/modFunctionCrash.js | 4 +- .../baselines/reference/moduleCodeGenTest5.js | 12 +- .../reference/moduleInTypePosition1.js | 3 +- .../reference/moduleKeywordRepeatError.js | 3 +- .../moduleMemberWithoutTypeAnnotation1.js | 3 +- .../baselines/reference/moduleNewExportBug.js | 3 +- .../reference/moduleReopenedTypeOtherBlock.js | 4 +- .../reference/moduleReopenedTypeSameBlock.js | 4 +- tests/baselines/reference/moduleScoping.js | 15 +- .../reference/moduleSymbolMerging.js | 4 +- .../reference/moduleUnassignedVariable.js | 8 +- .../reference/moduleVisibilityTest1.js | 36 +- .../reference/moduleVisibilityTest2.js | 36 +- .../moduleWithStatementsOfEveryKind.js | 12 +- .../baselines/reference/multiCallOverloads.js | 15 +- ...tyAccessAndArrowFunctionIndent1.errors.txt | 17 + ...nePropertyAccessAndArrowFunctionIndent1.js | 14 + .../reference/multiModuleClodule1.js | 16 +- .../reference/multiModuleFundule1.js | 6 +- .../reference/multipleInheritance.js | 16 +- .../reference/multipleNumericIndexers.js | 5 +- .../reference/multipleStringIndexers.js | 4 +- tests/baselines/reference/mutrec.js | 8 +- .../mutuallyRecursiveGenericBaseTypes2.js | 4 +- tests/baselines/reference/nameCollisions.js | 15 +- .../nameCollisionsInPropertyAssignments.js | 6 +- .../negateOperatorWithAnyOtherType.js | 11 +- .../negateOperatorWithBooleanType.js | 13 +- .../reference/negateOperatorWithNumberType.js | 25 +- .../reference/negateOperatorWithStringType.js | 25 +- .../reference/nestedClassDeclaration.js | 6 +- tests/baselines/reference/nestedModules.js | 5 +- .../reference/nestedRecursiveLambda.js | 26 +- tests/baselines/reference/nestedSelf.js | 8 +- .../reference/newExpressionWithCast.js | 9 +- .../reference/newFunctionImplicitAny.js | 3 +- .../reference/newOperatorConformance.js | 3 +- .../reference/newOperatorErrorCases.js | 4 +- ...CollisionThisExpressionAndClassInGlobal.js | 4 +- ...ionThisExpressionAndLocalVarInAccessors.js | 36 +- ...nThisExpressionAndLocalVarInConstructor.js | 18 +- ...sionThisExpressionAndLocalVarInFunction.js | 4 +- ...lisionThisExpressionAndLocalVarInLambda.js | 14 +- ...lisionThisExpressionAndLocalVarInMethod.js | 18 +- ...sionThisExpressionAndLocalVarInProperty.js | 18 +- ...noCollisionThisExpressionAndVarInGlobal.js | 4 +- ...nThisExpressionInFunctionAndVarInGlobal.js | 4 +- .../reference/noConstraintInReturnType1.js | 4 +- .../baselines/reference/noImplicitAnyForIn.js | 23 +- .../noImplicitAnyForMethodParameters.js | 6 +- .../noImplicitAnyInCastExpression.js | 13 +- ...tAnyInContextuallyTypesFunctionParamter.js | 9 +- .../noImplicitAnyParametersInBareFunctions.js | 34 +- .../noImplicitAnyParametersInClass.js | 68 +- .../noImplicitAnyParametersInModule.js | 34 +- .../reference/noImplicitAnyWithOverloads.js | 7 +- tests/baselines/reference/noSelfOnVars.js | 3 +- .../reference/nonInstantiatedModule.js | 5 +- tests/baselines/reference/null.js | 5 +- .../nullIsSubtypeOfEverythingButUndefined.js | 25 +- tests/baselines/reference/numberAsInLHS.js | 5 +- ...icIndexerConstrainsPropertyDeclarations.js | 12 +- ...cIndexerConstrainsPropertyDeclarations2.js | 8 +- .../reference/numericIndexerConstraint1.js | 3 +- .../reference/numericIndexerConstraint2.js | 3 +- .../reference/numericIndexerConstraint4.js | 4 +- .../reference/numericIndexerConstraint5.js | 5 +- .../reference/numericIndexingResults.js | 10 +- .../objectLitIndexerContextualType.js | 16 +- .../objectLitStructuralTypeMismatch.js | 4 +- .../reference/objectLitTargetTypeCallSite.js | 5 +- tests/baselines/reference/objectLiteral1.js | 5 +- tests/baselines/reference/objectLiteral2.js | 5 +- .../objectLiteralArraySpecialization.js | 15 +- .../objectLiteralContextualTyping.js | 18 +- .../reference/objectLiteralErrors.js | 244 +- .../reference/objectLiteralErrorsES3.js | 19 +- ...bjectLiteralFunctionArgContextualTyping.js | 35 +- ...jectLiteralFunctionArgContextualTyping2.js | 35 +- .../objectLiteralGettersAndSetters.js | 150 +- .../reference/objectLiteralIndexerErrors.js | 10 +- .../reference/objectLiteralIndexers.js | 15 +- .../objectLiteralMemberWithModifiers1.js | 5 +- .../objectLiteralMemberWithModifiers2.js | 5 +- .../objectLiteralMemberWithQuestionMark1.js | 5 +- .../objectLiteralMemberWithoutBlock1.js | 4 +- .../objectLiteralParameterResolution.js | 4 +- ...ectLiteralReferencingInternalProperties.js | 5 +- .../objectLiteralShorthandProperties.js | 3 +- ...ectLiteralShorthandPropertiesAssignment.js | 28 +- ...LiteralShorthandPropertiesAssignmentES6.js | 28 +- ...teralShorthandPropertiesAssignmentError.js | 20 +- ...iesAssignmentErrorFromMissingIdentifier.js | 19 +- .../objectLiteralShorthandPropertiesES6.js | 3 +- ...ndPropertiesErrorFromNotUsingIdentifier.js | 18 +- ...eralShorthandPropertiesFunctionArgument.js | 13 +- ...ralShorthandPropertiesFunctionArgument2.js | 8 +- .../reference/objectLiteralWithSemicolons1.js | 6 +- .../reference/objectLiteralWithSemicolons4.js | 3 +- .../reference/objectLiteralWithSemicolons5.js | 8 +- ...objectTypeHidingMembersOfExtendedObject.js | 6 +- .../objectTypeHidingMembersOfObject.js | 6 +- ...peHidingMembersOfObjectAssignmentCompat.js | 6 +- ...eHidingMembersOfObjectAssignmentCompat2.js | 7 +- .../reference/objectTypesIdentity.js | 55 +- .../reference/objectTypesIdentity2.js | 37 +- .../objectTypesIdentityWithCallSignatures.js | 75 +- .../objectTypesIdentityWithCallSignatures2.js | 75 +- .../objectTypesIdentityWithCallSignatures3.js | 21 +- ...yWithCallSignaturesDifferingParamCounts.js | 75 +- ...WithCallSignaturesDifferingParamCounts2.js | 24 +- ...IdentityWithCallSignaturesWithOverloads.js | 73 +- ...jectTypesIdentityWithComplexConstraints.js | 3 +- ...ectTypesIdentityWithConstructSignatures.js | 48 +- ...ctTypesIdentityWithConstructSignatures2.js | 48 +- ...ConstructSignaturesDifferingParamCounts.js | 48 +- ...tTypesIdentityWithGenericCallSignatures.js | 75 +- ...TypesIdentityWithGenericCallSignatures2.js | 75 +- ...ricCallSignaturesDifferingByConstraints.js | 75 +- ...icCallSignaturesDifferingByConstraints2.js | 85 +- ...icCallSignaturesDifferingByConstraints3.js | 85 +- ...ericCallSignaturesDifferingByReturnType.js | 75 +- ...ricCallSignaturesDifferingByReturnType2.js | 75 +- ...lSignaturesDifferingTypeParameterCounts.js | 75 +- ...SignaturesDifferingTypeParameterCounts2.js | 21 +- ...llSignaturesDifferingTypeParameterNames.js | 75 +- ...WithGenericCallSignaturesOptionalParams.js | 75 +- ...ithGenericCallSignaturesOptionalParams2.js | 75 +- ...ithGenericCallSignaturesOptionalParams3.js | 75 +- ...nstructSignaturesDifferingByConstraints.js | 45 +- ...structSignaturesDifferingByConstraints2.js | 51 +- ...structSignaturesDifferingByConstraints3.js | 51 +- ...onstructSignaturesDifferingByReturnType.js | 51 +- ...nstructSignaturesDifferingByReturnType2.js | 48 +- ...tSignaturesDifferingTypeParameterCounts.js | 45 +- ...ctSignaturesDifferingTypeParameterNames.js | 45 +- ...enericConstructSignaturesOptionalParams.js | 45 +- ...nericConstructSignaturesOptionalParams2.js | 45 +- ...nericConstructSignaturesOptionalParams3.js | 45 +- ...objectTypesIdentityWithNumericIndexers1.js | 73 +- ...objectTypesIdentityWithNumericIndexers2.js | 73 +- ...objectTypesIdentityWithNumericIndexers3.js | 73 +- .../objectTypesIdentityWithOptionality.js | 31 +- .../objectTypesIdentityWithPrivates.js | 73 +- .../objectTypesIdentityWithPrivates2.js | 18 +- .../objectTypesIdentityWithPublics.js | 55 +- .../objectTypesIdentityWithStringIndexers.js | 73 +- .../objectTypesIdentityWithStringIndexers2.js | 73 +- .../objectTypesWithOptionalProperties2.js | 4 +- .../optionalAccessorsInInterface1.js | 12 +- .../reference/optionalBindingParameters1.js | 12 +- .../reference/optionalBindingParameters2.js | 12 +- .../optionalBindingParametersInOverloads1.js | 12 +- .../optionalBindingParametersInOverloads2.js | 12 +- .../optionalConstructorArgInSuper.js | 3 +- .../optionalFunctionArgAssignability.js | 8 +- .../reference/optionalParamArgsTest.js | 53 +- .../reference/optionalParamInOverride.js | 6 +- .../reference/optionalPropertiesTest.js | 37 +- .../reference/optionalSetterParam.js | 3 +- .../orderMattersForSignatureGroupIdentity.js | 10 +- .../overEagerReturnTypeSpecialization.js | 16 +- .../reference/overloadAssignmentCompat.js | 4 +- tests/baselines/reference/overloadCallTest.js | 4 +- .../reference/overloadModifiersMustAgree.js | 6 +- .../overloadOnConstConstraintChecks1.js | 12 +- .../overloadOnConstConstraintChecks2.js | 3 +- .../overloadOnConstConstraintChecks3.js | 3 +- .../overloadOnConstConstraintChecks4.js | 3 +- ...tInObjectLiteralImplementingAnInterface.js | 5 +- .../overloadOnConstNoAnyImplementation.js | 12 +- .../overloadOnConstNoAnyImplementation2.js | 16 +- ...verloadOnConstNoNonSpecializedSignature.js | 3 +- .../overloadOnConstNoStringImplementation.js | 12 +- .../overloadOnConstNoStringImplementation2.js | 16 +- .../overloadOnConstantsInvalidOverload1.js | 12 +- .../baselines/reference/overloadResolution.js | 27 +- .../overloadResolutionClassConstructors.js | 12 +- .../overloadResolutionConstructors.js | 8 +- .../overloadResolutionOverCTLambda.js | 7 +- .../overloadResolutionOverNonCTLambdas.js | 16 +- .../overloadResolutionOverNonCTObjectLit.js | 14 +- .../reference/overloadResolutionTest1.js | 52 +- ...CallbacksWithDifferingOptionalityOnArgs.js | 11 +- .../reference/overloadingOnConstants1.js | 12 +- .../overloadingStaticFunctionsInFunctions.js | 3 +- ...esolutionWithConstraintCheckingDeferred.js | 8 +- ...sInDifferentContainersDisagreeOnAmbient.js | 3 +- .../overloadsWithProvisionalErrors.js | 17 +- .../reference/overloadsWithinClasses.js | 9 +- ...parameterInitializersForwardReferencing.js | 14 +- .../parametersWithNoAnnotationAreAny.js | 20 +- .../parenthesizedContexualTyping1.js | 94 +- .../parenthesizedContexualTyping2.js | 114 +- tests/baselines/reference/parse1.js | 3 +- tests/baselines/reference/parseTypes.js | 8 +- .../reference/parser15.4.4.14-9-2.js | 11 +- tests/baselines/reference/parser509667.js | 3 +- tests/baselines/reference/parser509669.js | 3 +- tests/baselines/reference/parser512097.js | 4 +- tests/baselines/reference/parser521128.js | 3 +- tests/baselines/reference/parser536727.js | 12 +- tests/baselines/reference/parser553699.js | 3 +- .../parserAccessibilityAfterStatic10.js | 3 +- .../parserAccessibilityAfterStatic11.js | 3 +- .../parserAccessibilityAfterStatic14.js | 3 +- .../parserAccessibilityAfterStatic7.js | 3 +- tests/baselines/reference/parserAccessors1.js | 3 +- .../baselines/reference/parserAccessors10.js | 3 +- tests/baselines/reference/parserAccessors2.js | 3 +- tests/baselines/reference/parserAccessors3.js | 5 +- tests/baselines/reference/parserAccessors4.js | 5 +- tests/baselines/reference/parserAccessors7.js | 5 +- tests/baselines/reference/parserAccessors8.js | 5 +- tests/baselines/reference/parserAccessors9.js | 5 +- .../parserAmbiguityWithBinaryOperator1.js | 3 +- .../parserAmbiguityWithBinaryOperator2.js | 3 +- .../parserAmbiguityWithBinaryOperator3.js | 3 +- .../parserAmbiguityWithBinaryOperator4.js | 3 +- .../parserArrayLiteralExpression10.js | 5 +- .../parserArrayLiteralExpression11.js | 6 +- .../parserArrayLiteralExpression12.js | 7 +- .../parserArrayLiteralExpression13.js | 8 +- .../parserArrayLiteralExpression14.js | 14 +- .../parserArrayLiteralExpression15.js | 14 +- .../parserArrayLiteralExpression2.js | 4 +- .../parserArrayLiteralExpression3.js | 5 +- .../parserArrayLiteralExpression4.js | 6 +- .../parserArrayLiteralExpression5.js | 4 +- .../parserArrayLiteralExpression6.js | 5 +- .../parserArrayLiteralExpression7.js | 4 +- .../parserArrayLiteralExpression8.js | 5 +- .../parserArrayLiteralExpression9.js | 5 +- .../parserArrowFunctionExpression1.js | 3 +- .../parserArrowFunctionExpression2.js | 3 +- .../parserArrowFunctionExpression3.js | 3 +- .../parserArrowFunctionExpression4.js | 3 +- .../parserCastVersusArrowFunction1.js | 12 +- tests/baselines/reference/parserClass1.js | 20 +- .../reference/parserClassDeclaration11.js | 3 +- .../reference/parserClassDeclaration13.js | 3 +- .../reference/parserClassDeclaration16.js | 3 +- .../reference/parserClassDeclaration19.js | 3 +- .../reference/parserClassDeclaration20.js | 3 +- .../reference/parserClassDeclaration21.js | 3 +- .../reference/parserClassDeclaration22.js | 3 +- .../reference/parserCommaInTypeMemberList2.js | 4 +- .../reference/parserComputedPropertyName1.js | 4 +- .../reference/parserComputedPropertyName12.js | 3 +- .../reference/parserComputedPropertyName17.js | 5 +- .../reference/parserComputedPropertyName2.js | 4 +- .../reference/parserComputedPropertyName24.js | 3 +- .../reference/parserComputedPropertyName3.js | 5 +- .../reference/parserComputedPropertyName33.js | 3 +- .../reference/parserComputedPropertyName38.js | 3 +- .../reference/parserComputedPropertyName39.js | 3 +- .../reference/parserComputedPropertyName4.js | 5 +- .../reference/parserComputedPropertyName40.js | 3 +- .../reference/parserComputedPropertyName5.js | 5 +- .../reference/parserComputedPropertyName6.js | 5 +- .../reference/parserES3Accessors1.js | 3 +- .../reference/parserES3Accessors2.js | 3 +- .../reference/parserES3Accessors3.js | 5 +- .../reference/parserES3Accessors4.js | 5 +- .../parserES5ComputedPropertyName3.js | 3 +- .../parserES5ComputedPropertyName4.js | 7 +- .../reference/parserES5ForOfStatement17.js | 3 +- .../reference/parserES5ForOfStatement18.js | 3 +- .../reference/parserES5ForOfStatement19.js | 3 +- .../reference/parserES5ForOfStatement20.js | 3 +- .../reference/parserES5ForOfStatement21.js | 3 +- .../reference/parserES5SymbolProperty7.js | 3 +- .../parserErrantSemicolonInClass1.js | 8 +- ...serErrorRecoveryArrayLiteralExpression1.js | 11 +- ...serErrorRecoveryArrayLiteralExpression2.js | 12 +- ...serErrorRecoveryArrayLiteralExpression3.js | 7 +- .../reference/parserErrorRecovery_Block1.js | 3 +- .../reference/parserErrorRecovery_Block3.js | 3 +- ...ErrorRecovery_IncompleteMemberVariable1.js | 4 +- ...ErrorRecovery_IncompleteMemberVariable2.js | 4 +- .../parserErrorRecovery_ObjectLiteral1.js | 5 +- .../parserErrorRecovery_ObjectLiteral2.js | 6 +- .../parserErrorRecovery_ObjectLiteral3.js | 6 +- .../parserErrorRecovery_ObjectLiteral4.js | 6 +- .../parserErrorRecovery_ObjectLiteral5.js | 6 +- .../parserErrorRecovery_ParameterList6.js | 3 +- .../parserErrorRecovery_SwitchStatement1.js | 6 +- .../reference/parserForOfStatement17.js | 3 +- .../reference/parserForOfStatement18.js | 3 +- .../reference/parserForOfStatement19.js | 3 +- .../reference/parserForOfStatement20.js | 3 +- .../reference/parserForOfStatement21.js | 3 +- .../reference/parserFunctionDeclaration4.js | 3 +- .../reference/parserFunctionDeclaration5.js | 3 +- .../reference/parserFunctionDeclaration6.js | 3 +- .../parserFunctionPropertyAssignment1.js | 5 +- .../parserFunctionPropertyAssignment2.js | 5 +- .../parserFunctionPropertyAssignment3.js | 5 +- .../parserFunctionPropertyAssignment4.js | 5 +- tests/baselines/reference/parserFuzz1.js | 6 +- .../parserGetAccessorWithTypeParameters1.js | 3 +- .../parserGreaterThanTokenAmbiguity10.js | 3 +- .../parserGreaterThanTokenAmbiguity14.js | 3 +- .../parserGreaterThanTokenAmbiguity15.js | 3 +- .../parserGreaterThanTokenAmbiguity19.js | 3 +- .../parserGreaterThanTokenAmbiguity20.js | 3 +- .../parserGreaterThanTokenAmbiguity4.js | 3 +- .../parserGreaterThanTokenAmbiguity5.js | 3 +- .../parserGreaterThanTokenAmbiguity9.js | 3 +- .../reference/parserInExpression1.js | 4 +- .../reference/parserMemberAccessor1.js | 6 +- .../parserMemberAccessorDeclaration1.js | 3 +- .../parserMemberAccessorDeclaration10.js | 3 +- .../parserMemberAccessorDeclaration11.js | 3 +- .../parserMemberAccessorDeclaration12.js | 3 +- .../parserMemberAccessorDeclaration13.js | 3 +- .../parserMemberAccessorDeclaration14.js | 3 +- .../parserMemberAccessorDeclaration15.js | 3 +- .../parserMemberAccessorDeclaration17.js | 3 +- .../parserMemberAccessorDeclaration2.js | 3 +- .../parserMemberAccessorDeclaration3.js | 3 +- .../parserMemberAccessorDeclaration4.js | 3 +- .../parserMemberAccessorDeclaration5.js | 3 +- .../parserMemberAccessorDeclaration6.js | 3 +- .../parserMemberAccessorDeclaration7.js | 3 +- .../parserMemberAccessorDeclaration8.js | 3 +- .../parserMemberAccessorDeclaration9.js | 3 +- .../parserMemberFunctionDeclaration1.js | 3 +- .../parserMemberFunctionDeclaration2.js | 3 +- .../parserMemberFunctionDeclaration3.js | 3 +- .../parserMemberFunctionDeclaration4.js | 3 +- .../parserMemberFunctionDeclaration5.js | 3 +- ...erMemberFunctionDeclarationAmbiguities1.js | 24 +- .../parserMissingLambdaOpenBrace1.js | 4 +- .../reference/parserMissingToken1.js | 6 +- ...rserNoASIOnCallAfterFunctionExpression1.js | 3 +- .../reference/parserNotHexLiteral1.js | 5 +- .../reference/parserObjectLiterals1.js | 5 +- .../reference/parserParameterList1.js | 3 +- .../reference/parserParameterList15.js | 3 +- .../reference/parserParameterList16.js | 3 +- .../reference/parserParameterList3.js | 3 +- .../baselines/reference/parserRealSource1.js | 60 +- .../baselines/reference/parserRealSource10.js | 3 +- .../baselines/reference/parserRealSource11.js | 228 +- .../baselines/reference/parserRealSource14.js | 223 +- .../baselines/reference/parserRealSource4.js | 8 +- .../baselines/reference/parserRealSource6.js | 3 +- .../baselines/reference/parserRealSource7.js | 39 +- .../baselines/reference/parserRealSource8.js | 21 +- .../baselines/reference/parserRealSource9.js | 4 +- ...parserRegularExpressionDivideAmbiguity1.js | 3 +- .../reference/parserReturnStatement4.js | 6 +- .../parserSetAccessorWithTypeParameters1.js | 3 +- .../parserShorthandPropertyAssignment1.js | 8 +- .../parserShorthandPropertyAssignment2.js | 4 +- .../parserShorthandPropertyAssignment3.js | 4 +- .../parserShorthandPropertyAssignment4.js | 4 +- .../parserShorthandPropertyAssignment5.js | 4 +- .../reference/parserSkippedTokens16.js | 9 +- .../baselines/reference/parserStrictMode12.js | 5 +- .../reference/parserSymbolIndexer5.js | 3 +- .../reference/parserSymbolProperty7.js | 3 +- .../reference/parserUnaryExpression2.js | 3 +- .../reference/parserUnaryExpression3.js | 4 +- .../parserUnicodeWhitespaceCharacter1.js | 3 +- .../parserUsingConstructorAsIdentifier.js | 16 +- tests/baselines/reference/parserharness.js | 244 +- tests/baselines/reference/parserindenter.js | 14 +- ...sRecoversWhenHittingUnexpectedSemicolon.js | 3 +- .../reference/partiallyAmbientFundule.js | 3 +- .../reference/plusOperatorWithAnyOtherType.js | 12 +- .../reference/plusOperatorWithBooleanType.js | 13 +- .../reference/plusOperatorWithNumberType.js | 25 +- .../reference/plusOperatorWithStringType.js | 25 +- .../reference/primitiveConstraints1.js | 6 +- tests/baselines/reference/primitiveMembers.js | 11 +- .../reference/primtiveTypesAreIdentical.js | 21 +- ...ivateClassPropertyAccessibleWithinClass.js | 56 +- .../reference/privateInstanceVisibility.js | 4 +- .../privateStaticMemberAccessibility.js | 4 +- .../baselines/reference/privateVisibility.js | 7 +- tests/baselines/reference/privateVisibles.js | 4 +- .../reference/project/baseline/amd/decl.js | 5 +- .../reference/project/baseline/node/decl.js | 5 +- .../reference/project/baseline2/amd/decl.js | 5 +- .../project/baseline2/amd/dont_emit.js | 5 +- .../reference/project/baseline2/node/decl.js | 5 +- .../project/baseline2/node/dont_emit.js | 5 +- .../project/nonRelative/amd/lib/bar/a.js | 3 +- .../project/nonRelative/amd/lib/foo/a.js | 3 +- .../project/nonRelative/amd/lib/foo/b.js | 3 +- .../project/nonRelative/node/lib/bar/a.js | 3 +- .../project/nonRelative/node/lib/foo/a.js | 3 +- .../project/nonRelative/node/lib/foo/b.js | 3 +- .../reference/project/prologueEmit/amd/out.js | 4 +- .../project/prologueEmit/node/out.js | 4 +- .../amd/li'b/class'A.js | 3 +- .../node/li'b/class'A.js | 3 +- tests/baselines/reference/promiseChaining.js | 8 +- tests/baselines/reference/promiseChaining1.js | 8 +- tests/baselines/reference/promiseChaining2.js | 8 +- .../reference/promisePermutations.js | 16 +- .../reference/promisePermutations2.js | 16 +- .../reference/promisePermutations3.js | 16 +- .../reference/promiseTypeInference.js | 4 +- tests/baselines/reference/propertyAccess.js | 21 +- ...tyAccessOnTypeParameterWithConstraints2.js | 4 +- ...tyAccessOnTypeParameterWithConstraints3.js | 4 +- ...tyAccessOnTypeParameterWithConstraints5.js | 4 +- .../propertyAndAccessorWithSameName.js | 6 +- .../propertyAndFunctionWithSameName.js | 3 +- tests/baselines/reference/propertyOrdering.js | 4 +- .../reference/propertyWrappedInTry.js | 3 +- ...ectedClassPropertyAccessibleWithinClass.js | 56 +- ...edClassPropertyAccessibleWithinSubclass.js | 32 +- tests/baselines/reference/prototypes.js | 3 +- .../reference/qualifiedModuleLocals.js | 7 +- .../reference/quotedAccessorName1.js | 4 +- .../reference/quotedAccessorName2.js | 4 +- .../reference/quotedFunctionName1.js | 3 +- .../reference/quotedFunctionName2.js | 3 +- .../reference/quotedPropertyName3.js | 4 +- tests/baselines/reference/rectype.js | 4 +- tests/baselines/reference/recur1.js | 6 +- .../recursiveBaseConstructorCreation1.js | 3 +- .../reference/recursiveClassReferenceTest.js | 20 +- .../recursiveClassReferenceTest.js.map | 2 +- .../recursiveClassReferenceTest.sourcemap.txt | 938 +++-- .../reference/recursiveFunctionTypes.js | 28 +- .../reference/recursiveFunctionTypes1.js | 3 +- .../reference/recursiveGetterAccess.js | 4 +- .../recursiveIdenticalOverloadResolution.js | 4 +- .../reference/recursiveInference1.js | 4 +- .../reference/recursiveInferenceBug.js | 7 +- .../reference/recursiveInheritance3.js | 4 +- .../reference/recursiveInitializer.js | 4 +- .../reference/recursiveObjectLiteral.js | 4 +- .../reference/recursiveProperties.js | 8 +- tests/baselines/reference/recursiveReturns.js | 4 +- .../recursiveTypesUsedAsFunctionParameters.js | 10 +- tests/baselines/reference/redefineArray.js | 4 +- ...lassDeclarationWhenInBaseTypeResolution.js | 2744 +++++++++--- .../reference/restArgAssignmentCompat.js | 11 +- .../reference/restElementMustBeLast.js | 12 +- .../reference/restParameterNotLast.js | 3 +- .../reference/returnInConstructor1.js | 26 +- tests/baselines/reference/returnStatements.js | 53 +- .../reference/returnTypeParameter.js | 7 +- .../returnTypeParameterWithModules.js | 11 +- .../reference/returnTypeTypeArguments.js | 68 +- ...verseInferenceInContextualInstantiation.js | 4 +- tests/baselines/reference/scannertest1.js | 10 +- .../reference/scopingInCatchBlocks.js | 15 +- tests/baselines/reference/selfInCallback.js | 8 +- tests/baselines/reference/selfInLambdas.js | 4 +- tests/baselines/reference/separate1-2.js | 3 +- .../reference/shadowPrivateMembers.js | 6 +- .../reference/shadowedInternalModule.js | 10 +- ...tionParameterReferencedInObjectLiteral1.js | 8 +- .../reference/sourceMap-FileWithComments.js | 4 +- .../sourceMap-FileWithComments.js.map | 2 +- .../sourceMap-FileWithComments.sourcemap.txt | 326 +- ...aultConstructorAndCapturedThisStatement.js | 4 +- ...ConstructorAndCapturedThisStatement.js.map | 2 +- ...ctorAndCapturedThisStatement.sourcemap.txt | 70 +- .../sourceMapValidationFunctionExpressions.js | 4 +- ...rceMapValidationFunctionExpressions.js.map | 2 +- ...alidationFunctionExpressions.sourcemap.txt | 50 +- ...MapValidationFunctionPropertyAssignment.js | 5 +- ...alidationFunctionPropertyAssignment.js.map | 2 +- ...onFunctionPropertyAssignment.sourcemap.txt | 48 +- .../sourceMapValidationStatements.js | 29 +- .../sourceMapValidationStatements.js.map | 2 +- ...ourceMapValidationStatements.sourcemap.txt | 493 +-- ...eBeforeQuestionMarkInPropertyAssignment.js | 4 +- ...specializationsShouldNotAffectEachOther.js | 8 +- .../baselines/reference/specializeVarArgs1.js | 4 +- .../specializedInheritedConstructors1.js | 8 +- .../specializedOverloadWithRestParameters.js | 6 +- ...pecializedSignatureAsCallbackParameter1.js | 8 +- ...reIsNotSubtypeOfNonSpecializedSignature.js | 12 +- ...atureIsSubtypeOfNonSpecializedSignature.js | 12 +- .../reference/staticAndMemberFunctions.js | 6 +- .../staticAndNonStaticPropertiesSameName.js | 6 +- tests/baselines/reference/staticClassProps.js | 3 +- tests/baselines/reference/staticFactory1.js | 8 +- .../reference/staticGetterAndSetter.js | 7 +- .../baselines/reference/staticInheritance.js | 3 +- .../reference/staticInstanceResolution4.js | 3 +- .../reference/staticInstanceResolution5.js | 9 +- ...mberAssignsToConstructorFunctionMembers.js | 14 +- .../reference/staticMemberExportAccess.js | 4 +- ...AndPublicMemberOfAnotherClassAssignment.js | 6 +- .../staticMembersUsingClassTypeParameter.js | 9 +- ...icMethodsReferencingClassTypeParameters.js | 4 +- .../reference/staticModifierAlreadySeen.js | 3 +- .../reference/staticOffOfInstance1.js | 3 +- .../reference/staticOffOfInstance2.js | 3 +- .../staticPropertyAndFunctionWithSameName.js | 3 +- .../reference/staticPropertyNotInClassType.js | 22 +- .../reference/staticPrototypeProperty.js | 3 +- tests/baselines/reference/staticVisibility.js | 8 +- tests/baselines/reference/statics.js | 4 +- .../baselines/reference/staticsInAFunction.js | 3 +- .../reference/staticsInConstructorBodies.js | 3 +- tests/baselines/reference/strictMode5.js | 3 +- .../reference/stringIndexerAndConstructor.js | 3 +- ...ngIndexerConstrainsPropertyDeclarations.js | 12 +- ...gIndexerConstrainsPropertyDeclarations2.js | 8 +- .../reference/stringIndexingResults.js | 4 +- .../stringLiteralObjectLiteralDeclaration1.js | 4 +- ...iteralPropertyNameWithLineContinuation1.js | 6 +- .../stringLiteralTypeIsSubtypeOfString.js | 120 +- ...gLiteralTypesInImplementationSignatures.js | 21 +- ...LiteralTypesInImplementationSignatures2.js | 12 +- .../baselines/reference/stringPropCodeGen.js | 3 +- tests/baselines/reference/stripInternal1.js | 6 +- tests/baselines/reference/structural1.js | 5 +- tests/baselines/reference/subtypesOfAny.js | 3 +- .../reference/subtypesOfTypeParameter.js | 25 +- ...subtypesOfTypeParameterWithConstraints2.js | 25 +- tests/baselines/reference/subtypesOfUnion.js | 3 +- .../reference/subtypingWithCallSignatures.js | 16 +- .../reference/subtypingWithCallSignatures2.js | 281 +- .../reference/subtypingWithCallSignatures3.js | 166 +- .../reference/subtypingWithCallSignatures4.js | 173 +- .../reference/subtypingWithCallSignaturesA.js | 4 +- .../subtypingWithConstructSignatures2.js | 140 +- .../subtypingWithConstructSignatures3.js | 80 +- .../subtypingWithConstructSignatures4.js | 90 +- .../subtypingWithObjectMembersOptionality.js | 8 +- .../subtypingWithOptionalProperties.js | 4 +- tests/baselines/reference/superAccess.js | 4 +- tests/baselines/reference/superAccess2.js | 10 +- ...eButWithIncorrectNumberOfTypeArguments1.js | 4 +- ...sFromGenericTypeButWithNoTypeArguments1.js | 4 +- ...ivesNonGenericTypeButWithTypeArguments1.js | 4 +- .../superCallFromClassThatHasNoBaseType1.js | 4 +- .../reference/superCallFromFunction1.js | 4 +- .../reference/superCallInNonStaticMethod.js | 4 +- .../reference/superCallOutsideConstructor.js | 3 +- .../superCallParameterContextualTyping1.js | 4 +- .../superCallParameterContextualTyping2.js | 4 +- tests/baselines/reference/superCalls.js | 3 +- .../reference/superCallsInConstructor.js | 9 +- tests/baselines/reference/superErrors.js | 44 +- .../baselines/reference/superInCatchBlock1.js | 3 +- tests/baselines/reference/superInLambdas.js | 52 +- tests/baselines/reference/superNewCall1.js | 4 +- .../reference/superPropertyAccess.js | 21 +- .../reference/superPropertyAccess1.js | 6 +- .../reference/superPropertyAccess2.js | 6 +- .../reference/superPropertyAccessNoError.js | 4 +- .../reference/superWithTypeArgument3.js | 3 +- ...side-object-literal-getters-and-setters.js | 4 +- .../reference/switchAssignmentCompat.js | 3 +- .../reference/switchBreakStatements.js | 3 +- .../switchCasesExpressionTypeMismatch.js | 24 +- .../baselines/reference/switchFallThroughs.js | 7 +- tests/baselines/reference/switchStatements.js | 37 +- .../switchStatementsWithMultipleDefaults.js | 3 +- .../reference/symbolDeclarationEmit10.js | 7 +- .../reference/symbolDeclarationEmit11.js | 10 +- .../reference/symbolDeclarationEmit12.js | 10 +- .../reference/symbolDeclarationEmit13.js | 7 +- .../reference/symbolDeclarationEmit14.js | 8 +- .../reference/symbolDeclarationEmit3.js | 3 +- .../reference/symbolDeclarationEmit4.js | 7 +- .../reference/symbolDeclarationEmit9.js | 3 +- tests/baselines/reference/symbolProperty1.js | 3 +- tests/baselines/reference/symbolProperty18.js | 7 +- tests/baselines/reference/symbolProperty19.js | 10 +- tests/baselines/reference/symbolProperty2.js | 3 +- tests/baselines/reference/symbolProperty20.js | 4 +- tests/baselines/reference/symbolProperty22.js | 4 +- tests/baselines/reference/symbolProperty28.js | 4 +- tests/baselines/reference/symbolProperty29.js | 4 +- tests/baselines/reference/symbolProperty3.js | 3 +- tests/baselines/reference/symbolProperty30.js | 4 +- tests/baselines/reference/symbolProperty31.js | 4 +- tests/baselines/reference/symbolProperty32.js | 4 +- tests/baselines/reference/symbolProperty33.js | 4 +- tests/baselines/reference/symbolProperty34.js | 4 +- tests/baselines/reference/symbolProperty4.js | 3 +- tests/baselines/reference/symbolProperty48.js | 3 +- tests/baselines/reference/symbolProperty49.js | 3 +- tests/baselines/reference/symbolProperty5.js | 3 +- tests/baselines/reference/symbolProperty50.js | 3 +- tests/baselines/reference/symbolProperty51.js | 3 +- tests/baselines/reference/symbolProperty6.js | 3 +- tests/baselines/reference/symbolProperty7.js | 3 +- tests/baselines/reference/symbolType13.js | 9 +- .../taggedTemplateContextualTyping1.js | 29 +- .../taggedTemplateContextualTyping2.js | 18 +- ...gedTemplateStringsTypeArgumentInference.js | 137 +- ...TemplateStringsTypeArgumentInferenceES6.js | 53 +- ...dTemplateStringsWithOverloadResolution3.js | 27 +- ...plateStringsWithOverloadResolution3_ES6.js | 19 +- ...tionExpressionsInSubstitutionExpression.js | 4 +- ...nExpressionsInSubstitutionExpressionES6.js | 4 +- tests/baselines/reference/targetTypeArgs.js | 40 +- .../reference/targetTypeBaseCalls.js | 15 +- tests/baselines/reference/targetTypeCalls.js | 28 +- .../baselines/reference/targetTypeCastTest.js | 8 +- .../reference/targetTypeObjectLiteralToAny.js | 5 +- tests/baselines/reference/targetTypeTest1.js | 18 +- tests/baselines/reference/targetTypeTest2.js | 16 +- tests/baselines/reference/targetTypeTest3.js | 16 +- .../baselines/reference/targetTypeVoidFunc.js | 4 +- .../reference/targetTypingOnFunctions.js | 8 +- .../reference/templateStringInArray.js | 6 +- .../templateStringInArrowFunction.js | 4 +- .../templateStringInEqualityChecks.js | 5 +- .../templateStringInEqualityChecksES6.js | 5 +- .../reference/templateStringInInOperator.js | 5 +- .../templateStringInInOperatorES6.js | 5 +- .../templateStringInObjectLiteral.js | 3 +- .../templateStringInObjectLiteralES6.js | 3 +- .../templateStringWithEmbeddedArray.js | 6 +- .../templateStringWithEmbeddedArrayES6.js | 6 +- ...templateStringWithEmbeddedArrowFunction.js | 4 +- ...ateStringWithEmbeddedFunctionExpression.js | 4 +- ...StringWithEmbeddedFunctionExpressionES6.js | 4 +- .../templateStringWithEmbeddedInOperator.js | 5 +- ...templateStringWithEmbeddedInOperatorES6.js | 5 +- ...templateStringWithEmbeddedObjectLiteral.js | 5 +- ...plateStringWithEmbeddedObjectLiteralES6.js | 5 +- ...tionExpressionsInSubstitutionExpression.js | 4 +- ...nExpressionsInSubstitutionExpressionES6.js | 4 +- .../reference/ternaryExpressionSourceMap.js | 6 +- .../ternaryExpressionSourceMap.js.map | 2 +- .../ternaryExpressionSourceMap.sourcemap.txt | 75 +- tests/baselines/reference/thisBinding.js | 5 +- tests/baselines/reference/thisBinding2.js | 4 +- ...essionInCallExpressionWithTypeArguments.js | 8 +- .../thisExpressionInIndexExpression.js | 4 +- .../thisExpressionOfGenericObject.js | 4 +- tests/baselines/reference/thisInAccessors.js | 16 +- ...thisInArrowFunctionInStaticInitializer1.js | 3 +- .../reference/thisInInnerFunctions.js | 8 +- .../reference/thisInInvalidContexts.js | 3 +- .../thisInInvalidContextsExternalModule.js | 3 +- tests/baselines/reference/thisInLambda.js | 7 +- .../reference/thisInObjectLiterals.js | 5 +- .../reference/thisInOuterClassBody.js | 4 +- .../thisInPropertyBoundDeclarations.js | 47 +- ...eferencedInFunctionInsideArrowFunction1.js | 7 +- .../reference/throwInEnclosingStatements.js | 4 +- tests/baselines/reference/throwStatements.js | 36 +- ...ArgumentsInGenericFunctionTypedArgument.js | 8 +- .../reference/tooManyTypeParameters1.js | 6 +- tests/baselines/reference/topLevelExports.js | 4 +- tests/baselines/reference/topLevelLambda.js | 4 +- tests/baselines/reference/topLevelLambda2.js | 7 +- tests/baselines/reference/topLevelLambda3.js | 4 +- tests/baselines/reference/topLevelLambda4.js | 4 +- ...railingCommaInHeterogenousArrayLiteral1.js | 17 +- .../baselines/reference/trailingCommasES3.js | 38 +- .../baselines/reference/trailingCommasES5.js | 38 +- tests/baselines/reference/tryCatchFinally.js | 21 +- tests/baselines/reference/tryStatements.js | 15 +- tests/baselines/reference/tupleTypes.js | 49 +- .../reference/twoAccessorsWithSameName.js | 13 +- .../reference/twoAccessorsWithSameName2.js | 10 +- tests/baselines/reference/typeAliases.js | 5 +- ...eAnnotationBestCommonTypeInArrayLiteral.js | 3 +- tests/baselines/reference/typeArgInference.js | 29 +- .../baselines/reference/typeArgInference2.js | 21 +- .../reference/typeArgInferenceWithNull.js | 20 +- .../typeArgumentConstraintResolution1.js | 7 +- .../reference/typeArgumentInference.js | 164 +- ...ypeArgumentInferenceConstructSignatures.js | 146 +- .../reference/typeArgumentInferenceErrors.js | 28 +- .../typeArgumentInferenceOrdering.js | 4 +- ...eArgumentInferenceTransitiveConstraints.js | 6 +- ...mentInferenceWithConstraintAsCommonRoot.js | 4 +- .../typeArgumentInferenceWithConstraints.js | 180 +- .../typeArgumentInferenceWithObjectLiteral.js | 64 +- .../typeAssertionToGenericFunctionType.js | 8 +- tests/baselines/reference/typeAssertions.js | 6 +- .../reference/typeCheckTypeArgument.js | 9 +- ...CheckingInsideFunctionExpressionInArray.js | 12 +- tests/baselines/reference/typeGuardsDefeat.js | 4 +- .../typeGuardsInConditionalExpression.js | 77 +- .../typeGuardsInFunctionAndModuleBlock.js | 62 +- .../reference/typeGuardsInIfStatement.js | 26 +- ...ypeGuardsInRightOperandOfAndAndOperator.js | 30 +- .../typeGuardsInRightOperandOfOrOrOperator.js | 30 +- .../baselines/reference/typeGuardsWithAny.js | 4 +- .../reference/typeIdentityConsidersBrands.js | 6 +- tests/baselines/reference/typeInfer1.js | 10 +- .../typeInferenceConflictingCandidates.js | 4 +- .../reference/typeInferenceFixEarly.js | 4 +- .../reference/typeInferenceWithTupleType.js | 25 +- .../typeInferenceWithTypeAnnotation.js | 4 +- .../reference/typeLiteralCallback.js | 8 +- tests/baselines/reference/typeMatch2.js | 80 +- tests/baselines/reference/typeOfOnTypeArg.js | 4 +- .../reference/typeOfThisInInstanceMember.js | 6 +- .../reference/typeOfThisInInstanceMember2.js | 6 +- .../reference/typeParameterAsElementType.js | 5 +- .../typeParameterAsTypeParameterConstraint.js | 28 +- ...typeParameterAsTypeParameterConstraint2.js | 20 +- ...erAsTypeParameterConstraintTransitively.js | 36 +- ...rAsTypeParameterConstraintTransitively2.js | 30 +- ...rameterCompatibilityAccrossDeclarations.js | 8 +- .../reference/typeParameterConstraints1.js | 39 +- ...ypeParameterDirectlyConstrainedToItself.js | 12 +- ...eParameterIndirectlyConstrainedToItself.js | 12 +- .../reference/typeParameterOrderReversal.js | 6 +- .../typeParameterUsedAsConstraint.js | 36 +- .../typeParametersAreIdenticalToThemselves.js | 33 +- .../typeParametersInStaticAccessors.js | 7 +- tests/baselines/reference/typeQueryOnClass.js | 21 +- tests/baselines/reference/typeResolution.js | 15 +- .../baselines/reference/typeResolution.js.map | 2 +- .../reference/typeResolution.sourcemap.txt | 449 +- tests/baselines/reference/typeVal.js | 4 +- .../reference/typedGenericPrototypeMember.js | 3 +- .../reference/typeofANonExportedType.js | 7 +- .../reference/typeofAnExportedType.js | 7 +- tests/baselines/reference/typeofClass2.js | 12 +- tests/baselines/reference/typeofInterface.js | 4 +- .../typeofOperatorWithAnyOtherType.js | 11 +- .../typeofOperatorWithBooleanType.js | 18 +- .../reference/typeofOperatorWithNumberType.js | 30 +- .../reference/typeofOperatorWithStringType.js | 30 +- .../typesWithDuplicateTypeParameters.js | 6 +- .../reference/typesWithOptionalProperty.js | 17 +- .../reference/uncaughtCompilerError1.js | 10 +- tests/baselines/reference/undeclaredMethod.js | 3 +- .../reference/undeclaredModuleError.js | 3 +- .../reference/undefinedArgumentInference.js | 5 +- .../undefinedIsSubtypeOfEverything.js | 3 +- ...ndefinedSymbolReferencedInArrayLiteral1.js | 18 +- tests/baselines/reference/underscoreTest1.js | 658 ++- .../unexpectedStatementBlockTerminator.js | 7 +- ...nSubtypeIfEveryConstituentTypeIsSubtype.js | 3 +- .../reference/unionTypeEquivalence.js | 3 +- .../reference/unionTypeFromArrayLiteral.js | 64 +- .../baselines/reference/unionTypeInference.js | 5 +- .../reference/unionTypesAssignability.js | 6 +- tests/baselines/reference/unknownSymbols1.js | 3 +- tests/baselines/reference/unknownSymbols2.js | 8 +- .../reference/unspecializedConstraints.js | 16 +- ...untypedFunctionCallsWithTypeParameters1.js | 7 +- .../validMultipleVariableDeclarations.js | 41 +- .../reference/validUseOfThisInSuper.js | 4 +- .../reference/varAndFunctionShareName.js | 3 +- tests/baselines/reference/vardecl.js | 16 +- tests/baselines/reference/voidArrayLit.js | 14 +- .../reference/voidAsNonAmbiguousReturnType.js | 3 +- .../reference/voidFunctionAssignmentCompat.js | 52 +- .../reference/voidOperatorWithAnyOtherType.js | 10 +- .../reference/voidOperatorWithBooleanType.js | 13 +- .../reference/voidOperatorWithNumberType.js | 25 +- .../reference/voidOperatorWithStringType.js | 25 +- .../reference/whileBreakStatements.js | 3 +- .../reference/whileContinueStatements.js | 3 +- tests/baselines/reference/widenToAny1.js | 5 +- tests/baselines/reference/widenToAny2.js | 5 +- tests/baselines/reference/widenedTypes.js | 30 +- tests/baselines/reference/widenedTypes1.js | 26 +- tests/baselines/reference/withExportDecl.js | 22 +- tests/baselines/reference/withImportDecl.js | 11 +- tests/baselines/reference/withStatement.js | 3 +- .../reference/withStatementErrors.js | 3 +- tests/baselines/reference/witness.js | 4 +- .../wrappedAndRecursiveConstraints3.js | 11 +- .../wrappedAndRecursiveConstraints4.js | 11 +- .../reference/wrappedIncovations1.js | 5 +- .../reference/wrappedIncovations2.js | 5 +- ...nePropertyAccessAndArrowFunctionIndent1.ts | 4 + 1891 files changed, 28569 insertions(+), 11179 deletions(-) create mode 100644 tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt create mode 100644 tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js create mode 100644 tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 4ba2da757e5..a6fe773cd7b 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -140,6 +140,12 @@ module ts { description: Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation, experimental: true }, + { + name: "preserveFormatting", + type: "boolean", + description: Diagnostics.Preserve_new_lines_when_emitting_code, + experimental: true + }, { name: "target", shortName: "t", diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index f616de8bd4b..24ed8ce4e99 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -463,6 +463,7 @@ module ts { File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: DiagnosticCategory.Error, key: "File '{0}' must have extension '.ts' or '.d.ts'." }, Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." }, Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." }, + Preserve_new_lines_when_emitting_code: { code: 6057, category: DiagnosticCategory.Message, key: "Preserve new-lines when emitting code." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index ddd3f72aaf0..40f7d55f9f0 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1844,6 +1844,10 @@ "category": "Message", "code": 6056 }, + "Preserve new-lines when emitting code.": { + "category": "Message", + "code": 6057 + }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 40f46958121..c7f132519ae 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1531,6 +1531,7 @@ module ts { var sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap ? [] : undefined; var diagnostics: Diagnostic[] = []; var newLine = host.getNewLine(); + var preserveNewLines = compilerOptions.preserveNewLines || false; if (targetSourceFile === undefined) { forEach(host.getSourceFiles(), sourceFile => { @@ -2172,7 +2173,7 @@ module ts { increaseIndent(); - if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) { + if (preserveNewLines && nodeStartPositionsAreOnSameLine(parent, nodes[0])) { if (spacesBetweenBraces) { write(" "); } @@ -2183,7 +2184,7 @@ module ts { for (var i = 0, n = nodes.length; i < n; i++) { if (i) { - if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) { + if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) { write(", "); } else { @@ -2195,15 +2196,13 @@ module ts { emit(nodes[i]); } - var closeTokenIsOnSameLineAsLastElement = nodeEndPositionsAreOnSameLine(parent, lastOrUndefined(nodes)); - if (nodes.hasTrailingComma && allowTrailingComma) { write(","); } decreaseIndent(); - if (closeTokenIsOnSameLineAsLastElement) { + if (preserveNewLines && nodeEndPositionsAreOnSameLine(parent, lastOrUndefined(nodes))) { if (spacesBetweenBraces) { write(" "); } @@ -3035,10 +3034,12 @@ module ts { } function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node) { - var isSynthesized = nodeIsSynthesized(parent); + // Use a newline for existin code if the original had one, and we're preserving formatting. + var realNodesAreOnDifferentLines = preserveNewLines && !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2); - var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2); + // Always use a newline for synthesized code if hte generator asked for it. var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2); + if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) { increaseIndent(); writeLine(); @@ -3383,7 +3384,7 @@ module ts { } function emitBlock(node: Block) { - if (isSingleLineEmptyBlock(node)) { + if (preserveNewLines && isSingleLineEmptyBlock(node)) { emitToken(SyntaxKind.OpenBraceToken, node.pos); write(" "); emitToken(SyntaxKind.CloseBraceToken, node.statements.end); @@ -3600,7 +3601,8 @@ module ts { else { write("default:"); } - if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) { + + if (preserveNewLines && node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) { write(" "); emit(node.statements[0]); } @@ -4303,7 +4305,7 @@ module ts { // If we didn't have to emit any preamble code, then attempt to keep the arrow // function on one line. - if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) { + if (preserveNewLines && !preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) { write(" "); emitStart(body); write("return "); @@ -4354,7 +4356,7 @@ module ts { var preambleEmitted = writer.getTextPos() !== initialTextPos; - if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { + if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) { for (var i = 0, n = body.statements.length; i < n; i++) { write(" "); emit(body.statements[i]); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 21f21f97b18..abace7e224e 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1554,6 +1554,7 @@ module ts { version?: boolean; watch?: boolean; stripInternal?: boolean; + preserveNewLines?: boolean; [option: string]: string | number | boolean; } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 26c06c7950c..6d9a77d4785 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1007,6 +1007,10 @@ module Harness { options.outDir = setting.value; break; + case 'preservenewlines': + options.preserveNewLines = !!setting.value; + break; + case 'sourceroot': options.sourceRoot = setting.value; break; diff --git a/tests/baselines/reference/2dArrays.js b/tests/baselines/reference/2dArrays.js index fe8ab380ba7..7840f3d8c54 100644 --- a/tests/baselines/reference/2dArrays.js +++ b/tests/baselines/reference/2dArrays.js @@ -30,7 +30,9 @@ var Board = (function () { function Board() { } Board.prototype.allShipsSunk = function () { - return this.ships.every(function (val) { return val.isSunk; }); + return this.ships.every(function (val) { + return val.isSunk; + }); }; return Board; })(); diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 423f00a5202..b2c299de7a2 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -1234,6 +1234,7 @@ declare module "typescript" { version?: boolean; watch?: boolean; stripInternal?: boolean; + preserveNewLines?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -2003,6 +2004,8 @@ function compile(fileNames, options) { } exports.compile = compile; compile(process.argv.slice(2), { - noEmitOnError: true, noImplicitAny: true, - target: 1 /* ES5 */, module: 1 /* CommonJS */ + noEmitOnError: true, + noImplicitAny: true, + target: 1 /* ES5 */, + module: 1 /* CommonJS */ }); diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 8028c42e426..cd5078e6f4c 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3939,6 +3939,9 @@ declare module "typescript" { stripInternal?: boolean; >stripInternal : boolean + preserveNewLines?: boolean; +>preserveNewLines : boolean + [option: string]: string | number | boolean; >option : string } diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 469adaa0202..73ead70933b 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -1265,6 +1265,7 @@ declare module "typescript" { version?: boolean; watch?: boolean; stripInternal?: boolean; + preserveNewLines?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -2037,8 +2038,7 @@ function delint(sourceFile) { if (ifStatement.thenStatement.kind !== 174 /* Block */) { report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body."); } - if (ifStatement.elseStatement && - ifStatement.elseStatement.kind !== 174 /* Block */ && ifStatement.elseStatement.kind !== 178 /* IfStatement */) { + if (ifStatement.elseStatement && ifStatement.elseStatement.kind !== 174 /* Block */ && ifStatement.elseStatement.kind !== 178 /* IfStatement */) { report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body."); } break; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 5b968d41c92..8632c09700d 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -4085,6 +4085,9 @@ declare module "typescript" { stripInternal?: boolean; >stripInternal : boolean + preserveNewLines?: boolean; +>preserveNewLines : boolean + [option: string]: string | number | boolean; >option : string } diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 75d74933eae..41edf853d44 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -1266,6 +1266,7 @@ declare module "typescript" { version?: boolean; watch?: boolean; stripInternal?: boolean; + preserveNewLines?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -2033,20 +2034,35 @@ function transform(contents, compilerOptions) { // Create a compilerHost object to allow the compiler to read and write files var compilerHost = { getSourceFile: function (fileName, target) { - return files[fileName] !== undefined ? - ts.createSourceFile(fileName, files[fileName], target) : undefined; + return files[fileName] !== undefined ? ts.createSourceFile(fileName, files[fileName], target) : undefined; }, writeFile: function (name, text, writeByteOrderMark) { - outputs.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); + outputs.push({ + name: name, + text: text, + writeByteOrderMark: writeByteOrderMark + }); }, - getDefaultLibFileName: function () { return "lib.d.ts"; }, - useCaseSensitiveFileNames: function () { return false; }, - getCanonicalFileName: function (fileName) { return fileName; }, - getCurrentDirectory: function () { return ""; }, - getNewLine: function () { return "\n"; } + getDefaultLibFileName: function () { + return "lib.d.ts"; + }, + useCaseSensitiveFileNames: function () { + return false; + }, + getCanonicalFileName: function (fileName) { + return fileName; + }, + getCurrentDirectory: function () { + return ""; + }, + getNewLine: function () { + return "\n"; + } }; // Create a program from inputs - var program = ts.createProgram(["file.ts"], compilerOptions, compilerHost); + var program = ts.createProgram([ + "file.ts" + ], compilerOptions, compilerHost); // Query for early errors var errors = ts.getPreEmitDiagnostics(program); var emitResult = program.emit(); @@ -2054,8 +2070,7 @@ function transform(contents, compilerOptions) { return { outputs: outputs, errors: errors.map(function (e) { - return e.file.fileName + "(" + (e.file.getLineAndCharacterOfPosition(e.start).line + 1) + "): " - + ts.flattenDiagnosticMessageText(e.messageText, os.EOL); + return e.file.fileName + "(" + (e.file.getLineAndCharacterOfPosition(e.start).line + 1) + "): " + ts.flattenDiagnosticMessageText(e.messageText, os.EOL); }) }; } diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index c164b9290a2..cfab2663ee4 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -4035,6 +4035,9 @@ declare module "typescript" { stripInternal?: boolean; >stripInternal : boolean + preserveNewLines?: boolean; +>preserveNewLines : boolean + [option: string]: string | number | boolean; >option : string } diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index ca70270ce5a..c9d50a0a450 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1303,6 +1303,7 @@ declare module "typescript" { version?: boolean; watch?: boolean; stripInternal?: boolean; + preserveNewLines?: boolean; [option: string]: string | number | boolean; } const enum ModuleKind { @@ -2062,21 +2063,33 @@ function watch(rootFileNames, options) { var files = {}; // initialize the list of files rootFileNames.forEach(function (fileName) { - files[fileName] = { version: 0 }; + files[fileName] = { + version: 0 + }; }); // Create the language service host to allow the LS to communicate with the host var servicesHost = { - getScriptFileNames: function () { return rootFileNames; }, - getScriptVersion: function (fileName) { return files[fileName] && files[fileName].version.toString(); }, + getScriptFileNames: function () { + return rootFileNames; + }, + getScriptVersion: function (fileName) { + return files[fileName] && files[fileName].version.toString(); + }, getScriptSnapshot: function (fileName) { if (!fs.existsSync(fileName)) { return undefined; } return ts.ScriptSnapshot.fromString(fs.readFileSync(fileName).toString()); }, - getCurrentDirectory: function () { return process.cwd(); }, - getCompilationSettings: function () { return options; }, - getDefaultLibFileName: function (options) { return ts.getDefaultLibFilePath(options); } + getCurrentDirectory: function () { + return process.cwd(); + }, + getCompilationSettings: function () { + return options; + }, + getDefaultLibFileName: function (options) { + return ts.getDefaultLibFilePath(options); + } }; // Create the language service files var services = ts.createLanguageService(servicesHost, ts.createDocumentRegistry()); @@ -2085,7 +2098,10 @@ function watch(rootFileNames, options) { // First time around, emit all files emitFile(fileName); // Add a watch on the file to handle next change - fs.watchFile(fileName, { persistent: true, interval: 250 }, function (curr, prev) { + fs.watchFile(fileName, { + persistent: true, + interval: 250 + }, function (curr, prev) { // Check timestamp if (+curr.mtime <= +prev.mtime) { return; @@ -2110,9 +2126,7 @@ function watch(rootFileNames, options) { }); } function logErrors(fileName) { - var allDiagnostics = services.getCompilerOptionsDiagnostics() - .concat(services.getSyntacticDiagnostics(fileName)) - .concat(services.getSemanticDiagnostics(fileName)); + var allDiagnostics = services.getCompilerOptionsDiagnostics().concat(services.getSyntacticDiagnostics(fileName)).concat(services.getSemanticDiagnostics(fileName)); allDiagnostics.forEach(function (diagnostic) { if (diagnostic.file) { var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); @@ -2125,7 +2139,10 @@ function watch(rootFileNames, options) { } } // Initialize files constituting the program as all .ts files in the current directory -var currentDirectoryFiles = fs.readdirSync(process.cwd()). - filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); +var currentDirectoryFiles = fs.readdirSync(process.cwd()).filter(function (fileName) { + return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; +}); // Start the watcher -watch(currentDirectoryFiles, { module: 1 /* CommonJS */ }); +watch(currentDirectoryFiles, { + module: 1 /* CommonJS */ +}); diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 5913aebd1da..9f438cb3bdb 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -4208,6 +4208,9 @@ declare module "typescript" { stripInternal?: boolean; >stripInternal : boolean + preserveNewLines?: boolean; +>preserveNewLines : boolean + [option: string]: string | number | boolean; >option : string } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js index 90bed5cfd91..74a8a66a8bc 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js @@ -17,7 +17,10 @@ var cl = Point.Origin; //// [function.js] function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } //// [test.js] var cl; diff --git a/tests/baselines/reference/ArrowFunctionExpression1.js b/tests/baselines/reference/ArrowFunctionExpression1.js index 21c71af243c..baa75809f65 100644 --- a/tests/baselines/reference/ArrowFunctionExpression1.js +++ b/tests/baselines/reference/ArrowFunctionExpression1.js @@ -2,4 +2,5 @@ var v = (public x: string) => { }; //// [ArrowFunctionExpression1.js] -var v = function (x) { }; +var v = function (x) { +}; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js index b27c2ce5a30..a3ccfbe2f41 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js @@ -58,7 +58,8 @@ var clodule1 = (function () { })(); var clodule1; (function (clodule1) { - function f(x) { } + function f(x) { + } })(clodule1 || (clodule1 = {})); var clodule2 = (function () { function clodule2() { @@ -81,7 +82,9 @@ var clodule3 = (function () { })(); var clodule3; (function (clodule3) { - clodule3.y = { id: T }; + clodule3.y = { + id: T + }; })(clodule3 || (clodule3 = {})); var clodule4 = (function () { function clodule4() { diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js index 255e74631a3..cf39aa6c11b 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js @@ -19,7 +19,8 @@ module clodule { var clodule = (function () { function clodule() { } - clodule.fn = function (id) { }; + clodule.fn = function (id) { + }; return clodule; })(); var clodule; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js index 76ba858306c..69f72e3b4a7 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js @@ -19,7 +19,8 @@ module clodule { var clodule = (function () { function clodule() { } - clodule.fn = function (id) { }; + clodule.fn = function (id) { + }; return clodule; })(); var clodule; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js index 5f01b6acff1..827557bdbad 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js @@ -19,7 +19,9 @@ module clodule { var clodule = (function () { function clodule() { } - clodule.sfn = function (id) { return 42; }; + clodule.sfn = function (id) { + return 42; + }; return clodule; })(); var clodule; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js index a86bc7d2e90..13483b591d9 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js @@ -28,12 +28,19 @@ var Point = (function () { this.x = x; this.y = y; } - Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246 + Point.Origin = function () { + return { + x: 0, + y: 0 + }; + }; // unexpected error here bug 840246 return Point; })(); var Point; (function (Point) { - function Origin() { return null; } + function Origin() { + return null; + } Point.Origin = Origin; //expected duplicate identifier error })(Point || (Point = {})); var A; @@ -43,13 +50,20 @@ var A; this.x = x; this.y = y; } - Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246 + Point.Origin = function () { + return { + x: 0, + y: 0 + }; + }; // unexpected error here bug 840246 return Point; })(); A.Point = Point; var Point; (function (Point) { - function Origin() { return ""; } + function Origin() { + return ""; + } Point.Origin = Origin; //expected duplicate identifier error })(Point = A.Point || (A.Point = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js index f462ea9eaa9..188a69a18f7 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js @@ -28,12 +28,19 @@ var Point = (function () { this.x = x; this.y = y; } - Point.Origin = function () { return { x: 0, y: 0 }; }; + Point.Origin = function () { + return { + x: 0, + y: 0 + }; + }; return Point; })(); var Point; (function (Point) { - function Origin() { return ""; } // not an error, since not exported + function Origin() { + return ""; + } // not an error, since not exported })(Point || (Point = {})); var A; (function (A) { @@ -42,12 +49,19 @@ var A; this.x = x; this.y = y; } - Point.Origin = function () { return { x: 0, y: 0 }; }; + Point.Origin = function () { + return { + x: 0, + y: 0 + }; + }; return Point; })(); A.Point = Point; var Point; (function (Point) { - function Origin() { return ""; } // not an error since not exported + function Origin() { + return ""; + } // not an error since not exported })(Point = A.Point || (A.Point = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js index 45958ad62d4..c2c20f7f7ff 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js @@ -28,7 +28,10 @@ var Point = (function () { this.x = x; this.y = y; } - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; return Point; })(); var Point; @@ -42,7 +45,10 @@ var A; this.x = x; this.y = y; } - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; return Point; })(); A.Point = Point; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js index ae56fd1acdc..241e1db7b0d 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js @@ -28,7 +28,10 @@ var Point = (function () { this.x = x; this.y = y; } - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; return Point; })(); var Point; @@ -42,7 +45,10 @@ var A; this.x = x; this.y = y; } - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; return Point; })(); A.Point = Point; diff --git a/tests/baselines/reference/ClassDeclaration11.js b/tests/baselines/reference/ClassDeclaration11.js index 6284af07676..6c4ba4ac6ec 100644 --- a/tests/baselines/reference/ClassDeclaration11.js +++ b/tests/baselines/reference/ClassDeclaration11.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/ClassDeclaration13.js b/tests/baselines/reference/ClassDeclaration13.js index 7791b77eae6..4c4324eb1e1 100644 --- a/tests/baselines/reference/ClassDeclaration13.js +++ b/tests/baselines/reference/ClassDeclaration13.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); diff --git a/tests/baselines/reference/ClassDeclaration21.js b/tests/baselines/reference/ClassDeclaration21.js index b5144b607d1..94cf3587c8d 100644 --- a/tests/baselines/reference/ClassDeclaration21.js +++ b/tests/baselines/reference/ClassDeclaration21.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype[1] = function () { }; + C.prototype[1] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/ClassDeclaration22.js b/tests/baselines/reference/ClassDeclaration22.js index 0074813e77e..c44ba4ba43b 100644 --- a/tests/baselines/reference/ClassDeclaration22.js +++ b/tests/baselines/reference/ClassDeclaration22.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype["bar"] = function () { }; + C.prototype["bar"] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/ES5SymbolProperty2.js b/tests/baselines/reference/ES5SymbolProperty2.js index effd1e610f4..a1efd6ae7ba 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.js +++ b/tests/baselines/reference/ES5SymbolProperty2.js @@ -17,7 +17,8 @@ var M; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = function () { }; + C.prototype[Symbol.iterator] = function () { + }; return C; })(); M.C = C; diff --git a/tests/baselines/reference/ES5SymbolProperty3.js b/tests/baselines/reference/ES5SymbolProperty3.js index 52ea7e091ee..7ef892cb3c4 100644 --- a/tests/baselines/reference/ES5SymbolProperty3.js +++ b/tests/baselines/reference/ES5SymbolProperty3.js @@ -12,7 +12,8 @@ var Symbol; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = 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..d4022066bb8 100644 --- a/tests/baselines/reference/ES5SymbolProperty4.js +++ b/tests/baselines/reference/ES5SymbolProperty4.js @@ -12,7 +12,8 @@ var Symbol; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = 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..c433b0ab443 100644 --- a/tests/baselines/reference/ES5SymbolProperty5.js +++ b/tests/baselines/reference/ES5SymbolProperty5.js @@ -12,7 +12,8 @@ var Symbol; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = 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..949ce722aa7 100644 --- a/tests/baselines/reference/ES5SymbolProperty6.js +++ b/tests/baselines/reference/ES5SymbolProperty6.js @@ -9,7 +9,8 @@ class C { var C = (function () { function C() { } - C.prototype[Symbol.iterator] = 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..f98e792e8cd 100644 --- a/tests/baselines/reference/ES5SymbolProperty7.js +++ b/tests/baselines/reference/ES5SymbolProperty7.js @@ -12,7 +12,8 @@ var Symbol; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = function () { }; + C.prototype[Symbol.iterator] = function () { + }; return C; })(); (new C)[Symbol.iterator]; diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index bfa243937d6..8fa04691498 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -35,7 +35,10 @@ var A; return Point; })(); A.Point = Point; - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; var Point3d = (function (_super) { __extends(Point3d, _super); function Point3d() { @@ -44,7 +47,11 @@ var A; return Point3d; })(Point); A.Point3d = Point3d; - A.Origin3d = { x: 0, y: 0, z: 0 }; + A.Origin3d = { + x: 0, + y: 0, + z: 0 + }; var Line = (function () { function Line(start, end) { this.start = start; diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js index 71a43788c55..9c7e3d5db2b 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js @@ -38,7 +38,10 @@ var A; } return Point; })(); - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; var Point3d = (function (_super) { __extends(Point3d, _super); function Point3d() { @@ -47,7 +50,11 @@ var A; return Point3d; })(Point); A.Point3d = Point3d; - A.Origin3d = { x: 0, y: 0, z: 0 }; + A.Origin3d = { + x: 0, + y: 0, + z: 0 + }; var Line = (function () { function Line(start, end) { this.start = start; diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js index 21d969d242c..56f50afa97b 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js @@ -33,7 +33,10 @@ var A; })(); A.Line = Line; function fromOrigin(p) { - return new Line({ x: 0, y: 0 }, p); + return new Line({ + x: 0, + y: 0 + }, p); } A.fromOrigin = fromOrigin; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js index 99831f10629..d669ce248d7 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js @@ -32,7 +32,10 @@ var A; })(); A.Line = Line; function fromOrigin(p) { - return new Line({ x: 0, y: 0 }, p); + return new Line({ + x: 0, + y: 0 + }, p); } A.fromOrigin = fromOrigin; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js index 3037e33d880..a7ad139f68e 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js @@ -32,7 +32,10 @@ var A; return Line; })(); function fromOrigin(p) { - return new Line({ x: 0, y: 0 }, p); + return new Line({ + x: 0, + y: 0 + }, p); } A.fromOrigin = fromOrigin; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index e2b32a3bca4..a5ce37fb363 100644 --- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -25,6 +25,13 @@ module A { //// [ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js] var A; (function (A) { - A.Origin = { x: 0, y: 0 }; - A.Origin3d = { x: 0, y: 0, z: 0 }; + A.Origin = { + x: 0, + y: 0 + }; + A.Origin3d = { + x: 0, + y: 0, + z: 0 + }; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js index 7625500a1d0..77db9879e3b 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js @@ -26,6 +26,13 @@ module A { //// [ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js] var A; (function (A) { - A.Origin = { x: 0, y: 0 }; - A.Origin3d = { x: 0, y: 0, z: 0 }; + A.Origin = { + x: 0, + y: 0 + }; + A.Origin3d = { + x: 0, + y: 0, + z: 0 + }; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js index df6645df3b3..c2c4b64ece6 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js @@ -38,7 +38,10 @@ var A; function Line(start, end) { } Line.fromOrigin = function (p) { - return new Line({ x: 0, y: 0 }, p); + return new Line({ + x: 0, + y: 0 + }, p); }; return Line; })(); diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js index 46361dd41bb..50da60f7113 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js @@ -21,6 +21,12 @@ var A; } return Point; })(); - A.Origin = { x: 0, y: 0 }; - A.Unity = { start: new Point(0, 0), end: new Point(1, 0) }; + 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/ExportVariableWithAccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js index 591845b627e..a4d203cc363 100644 --- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js @@ -15,5 +15,8 @@ module A { var A; (function (A) { // valid since Point is exported - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js index d63edb65569..de0b6e706ad 100644 --- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js @@ -22,7 +22,14 @@ module A { var A; (function (A) { // valid since Point is exported - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; // invalid Point3d is not exported - A.Origin3d = { x: 0, y: 0, z: 0 }; + A.Origin3d = { + x: 0, + y: 0, + z: 0 + }; })(A || (A = {})); diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js index 369a5b4dd52..26b2b17de38 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js @@ -47,7 +47,10 @@ var cl = B.Point.Origin; var A; (function (A) { function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } A.Point = Point; })(A || (A = {})); @@ -56,7 +59,10 @@ var A; (function (A) { var Point; (function (Point) { - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; })(Point = A.Point || (A.Point = {})); })(A || (A = {})); //// [test.js] @@ -69,12 +75,18 @@ var cl = A.Point.Origin; // not expected to be an error. var B; (function (B) { function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } B.Point = Point; var Point; (function (Point) { - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; })(Point = B.Point || (B.Point = {})); })(B || (B = {})); var fn; diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js index 13302ea391a..8c84896b926 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js @@ -26,7 +26,10 @@ var cl = B.Point.Origin; var A; (function (A) { function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } A.Point = Point; })(A || (A = {})); @@ -35,7 +38,10 @@ var B; (function (B) { var Point; (function (Point) { - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; })(Point = B.Point || (B.Point = {})); })(B || (B = {})); //// [test.js] diff --git a/tests/baselines/reference/FunctionDeclaration10_es6.js b/tests/baselines/reference/FunctionDeclaration10_es6.js index 51694533964..96d32200564 100644 --- a/tests/baselines/reference/FunctionDeclaration10_es6.js +++ b/tests/baselines/reference/FunctionDeclaration10_es6.js @@ -4,5 +4,7 @@ function * foo(a = yield => yield) { //// [FunctionDeclaration10_es6.js] function foo(a) { - if (a === void 0) { a = function (yield) { return yield; }; } + if (a === void 0) { a = function (yield) { + return yield; + }; } } diff --git a/tests/baselines/reference/FunctionDeclaration12_es6.js b/tests/baselines/reference/FunctionDeclaration12_es6.js index d9c1739cb49..da9cea3f9c6 100644 --- a/tests/baselines/reference/FunctionDeclaration12_es6.js +++ b/tests/baselines/reference/FunctionDeclaration12_es6.js @@ -2,4 +2,5 @@ var v = function * yield() { } //// [FunctionDeclaration12_es6.js] -var v = , yield = function () { }; +var v = , yield = function () { +}; diff --git a/tests/baselines/reference/FunctionDeclaration4.js b/tests/baselines/reference/FunctionDeclaration4.js index b50970965f0..53e040b28fc 100644 --- a/tests/baselines/reference/FunctionDeclaration4.js +++ b/tests/baselines/reference/FunctionDeclaration4.js @@ -3,4 +3,5 @@ function foo(); function bar() { } //// [FunctionDeclaration4.js] -function bar() { } +function bar() { +} diff --git a/tests/baselines/reference/FunctionDeclaration6.js b/tests/baselines/reference/FunctionDeclaration6.js index 721d4d80b6d..093fac7ed7c 100644 --- a/tests/baselines/reference/FunctionDeclaration6.js +++ b/tests/baselines/reference/FunctionDeclaration6.js @@ -6,5 +6,6 @@ //// [FunctionDeclaration6.js] { - function bar() { } + function bar() { + } } diff --git a/tests/baselines/reference/FunctionExpression1_es6.js b/tests/baselines/reference/FunctionExpression1_es6.js index 97e5d28887d..7c8d82f4ca8 100644 --- a/tests/baselines/reference/FunctionExpression1_es6.js +++ b/tests/baselines/reference/FunctionExpression1_es6.js @@ -2,4 +2,5 @@ var v = function * () { } //// [FunctionExpression1_es6.js] -var v = function () { }; +var v = function () { +}; diff --git a/tests/baselines/reference/FunctionExpression2_es6.js b/tests/baselines/reference/FunctionExpression2_es6.js index 87960e37128..0a2468bcb8c 100644 --- a/tests/baselines/reference/FunctionExpression2_es6.js +++ b/tests/baselines/reference/FunctionExpression2_es6.js @@ -2,4 +2,5 @@ var v = function * foo() { } //// [FunctionExpression2_es6.js] -var v = function foo() { }; +var v = function foo() { +}; diff --git a/tests/baselines/reference/FunctionPropertyAssignments1_es6.js b/tests/baselines/reference/FunctionPropertyAssignments1_es6.js index 0176b412713..49c2605e177 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments1_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments1_es6.js @@ -2,4 +2,7 @@ var v = { *foo() { } } //// [FunctionPropertyAssignments1_es6.js] -var v = { foo: function () { } }; +var v = { + foo: function () { + } +}; diff --git a/tests/baselines/reference/FunctionPropertyAssignments2_es6.js b/tests/baselines/reference/FunctionPropertyAssignments2_es6.js index fc86a6a48d6..996bd08af0b 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments2_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments2_es6.js @@ -2,4 +2,7 @@ var v = { *() { } } //// [FunctionPropertyAssignments2_es6.js] -var v = { : function () { } }; +var v = { + : function () { + } +}; diff --git a/tests/baselines/reference/FunctionPropertyAssignments3_es6.js b/tests/baselines/reference/FunctionPropertyAssignments3_es6.js index 89963edbc6e..64edd61828c 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments3_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments3_es6.js @@ -2,4 +2,7 @@ var v = { *{ } } //// [FunctionPropertyAssignments3_es6.js] -var v = { : function () { } }; +var v = { + : function () { + } +}; diff --git a/tests/baselines/reference/FunctionPropertyAssignments4_es6.js b/tests/baselines/reference/FunctionPropertyAssignments4_es6.js index 71076523414..ee6e35defe8 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments4_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments4_es6.js @@ -2,4 +2,6 @@ var v = { * } //// [FunctionPropertyAssignments4_es6.js] -var v = { : function () { } }; +var v = { + : function () { } +}; diff --git a/tests/baselines/reference/FunctionPropertyAssignments5_es6.js b/tests/baselines/reference/FunctionPropertyAssignments5_es6.js index 51e5d0000e4..f41bd0d3ffa 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments5_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments5_es6.js @@ -3,6 +3,7 @@ var v = { *[foo()]() { } } //// [FunctionPropertyAssignments5_es6.js] var v = (_a = {}, - _a[foo()] = function () { }, + _a[foo()] = function () { + }, _a); var _a; diff --git a/tests/baselines/reference/FunctionPropertyAssignments6_es6.js b/tests/baselines/reference/FunctionPropertyAssignments6_es6.js index 60f3677f108..f7e9576c7a0 100644 --- a/tests/baselines/reference/FunctionPropertyAssignments6_es6.js +++ b/tests/baselines/reference/FunctionPropertyAssignments6_es6.js @@ -2,4 +2,7 @@ var v = { *() { } } //// [FunctionPropertyAssignments6_es6.js] -var v = { : function () { } }; +var v = { + : function () { + } +}; diff --git a/tests/baselines/reference/MemberAccessorDeclaration15.js b/tests/baselines/reference/MemberAccessorDeclaration15.js index 85bbfa62238..41ed265a878 100644 --- a/tests/baselines/reference/MemberAccessorDeclaration15.js +++ b/tests/baselines/reference/MemberAccessorDeclaration15.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js index 121376d5265..86e7c9d418a 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = 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..efd60844dc7 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = 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..357f9175b42 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[foo] = 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..9c6d76bfca5 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype. = function () { }; + C.prototype. = function () { + }; return C; })(); diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js index 8f942d87f9f..211713c6e14 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js index e9b8f44f895..6b110cbb0f2 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js @@ -34,7 +34,10 @@ var A; (function (A) { var Point; (function (Point) { - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; })(Point = A.Point || (A.Point = {})); })(A || (A = {})); //// [function.js] @@ -42,7 +45,10 @@ var A; (function (A) { // duplicate identifier error function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } A.Point = Point; })(A || (A = {})); @@ -51,11 +57,17 @@ var B; (function (B) { var Point; (function (Point) { - Point.Origin = { x: 0, y: 0 }; + Point.Origin = { + x: 0, + y: 0 + }; })(Point = B.Point || (B.Point = {})); // duplicate identifier error function Point() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } B.Point = Point; })(B || (B = {})); diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js index e31ca5d5885..0211c85af9d 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js @@ -54,9 +54,15 @@ var B; var Geometry; (function (Geometry) { var Lines = B; - Geometry.Origin = { x: 0, y: 0 }; + Geometry.Origin = { + x: 0, + y: 0 + }; // this is valid since B.Line _is_ visible outside Geometry - Geometry.Unit = new Lines.Line(Geometry.Origin, { x: 1, y: 0 }); + Geometry.Unit = new Lines.Line(Geometry.Origin, { + x: 1, + y: 0 + }); })(Geometry || (Geometry = {})); // expected to work since all are exported var p; diff --git a/tests/baselines/reference/Protected4.js b/tests/baselines/reference/Protected4.js index 9c23a1be884..665a182ef33 100644 --- a/tests/baselines/reference/Protected4.js +++ b/tests/baselines/reference/Protected4.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.m = function () { }; + C.prototype.m = function () { + }; return C; })(); diff --git a/tests/baselines/reference/Protected5.js b/tests/baselines/reference/Protected5.js index 8426a8765d7..8834cc488cb 100644 --- a/tests/baselines/reference/Protected5.js +++ b/tests/baselines/reference/Protected5.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.m = function () { }; + C.m = function () { + }; return C; })(); diff --git a/tests/baselines/reference/Protected6.js b/tests/baselines/reference/Protected6.js index 10b59551737..004f30b27f8 100644 --- a/tests/baselines/reference/Protected6.js +++ b/tests/baselines/reference/Protected6.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.m = function () { }; + C.m = function () { + }; return C; })(); diff --git a/tests/baselines/reference/Protected7.js b/tests/baselines/reference/Protected7.js index 16c24edb8cb..466f6909d67 100644 --- a/tests/baselines/reference/Protected7.js +++ b/tests/baselines/reference/Protected7.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.m = function () { }; + C.prototype.m = function () { + }; return C; })(); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js index deb2f3aa59d..52810fa0178 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js @@ -56,7 +56,10 @@ var A; function Point() { } Point.prototype.fromCarthesian = function (p) { - return { x: p.x, y: p.y }; + return { + x: p.x, + y: p.y + }; }; return Point; })(); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js index 125a803ff39..227b28f44db 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js @@ -47,11 +47,17 @@ var A; var Utils; (function (Utils) { function mirror(p) { - return { x: p.y, y: p.x }; + return { + x: p.y, + y: p.x + }; } Utils.mirror = mirror; })(Utils = A.Utils || (A.Utils = {})); - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; })(A || (A = {})); //// [part2.js] var A; @@ -78,4 +84,7 @@ var o = A.Origin; var o = A.Utils.mirror(o); var p; var p; -var p = new A.Utils.Plane(o, { x: 1, y: 1 }); +var p = new A.Utils.Plane(o, { + x: 1, + y: 1 +}); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index c7f55d0a2df..3f5f3bd8986 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -35,17 +35,26 @@ var A; var Utils; (function (Utils) { function mirror(p) { - return { x: p.y, y: p.x }; + return { + x: p.y, + y: p.x + }; } Utils.mirror = mirror; })(Utils = A.Utils || (A.Utils = {})); - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; })(A = exports.A || (exports.A = {})); //// [part2.js] var A; (function (A) { // collision with 'Origin' var in other part of merged module - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; var Utils; (function (Utils) { var Plane = (function () { diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js index a854dff15c6..32b5ed538d8 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js @@ -38,7 +38,10 @@ var Root; var Utils; (function (Utils) { function mirror(p) { - return { x: p.y, y: p.x }; + return { + x: p.y, + y: p.x + }; } Utils.mirror = mirror; })(Utils = A.Utils || (A.Utils = {})); @@ -50,7 +53,10 @@ var otherRoot; var A; (function (A) { // have to be fully qualified since in different root - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; var Utils; (function (Utils) { var Plane = (function () { diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js index 82c9afd0787..ba77d51ef69 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js @@ -45,7 +45,10 @@ var A; var Utils; (function (Utils) { function mirror(p) { - return { x: p.y, y: p.x }; + return { + x: p.y, + y: p.x + }; } Utils.mirror = mirror; })(Utils = A.Utils || (A.Utils = {})); @@ -53,7 +56,10 @@ var A; //// [part2.js] var A; (function (A) { - A.Origin = { x: 0, y: 0 }; + A.Origin = { + x: 0, + y: 0 + }; var Utils; (function (Utils) { var Plane = (function () { @@ -74,4 +80,7 @@ var o = A.Origin; var o = A.Utils.mirror(o); var p; var p; -var p = new A.Utils.Plane(o, { x: 1, y: 1 }); +var p = new A.Utils.Plane(o, { + x: 1, + y: 1 +}); diff --git a/tests/baselines/reference/YieldExpression10_es6.js b/tests/baselines/reference/YieldExpression10_es6.js index 3bae1b645fe..345f76fc190 100644 --- a/tests/baselines/reference/YieldExpression10_es6.js +++ b/tests/baselines/reference/YieldExpression10_es6.js @@ -6,7 +6,8 @@ var v = { * foo() { //// [YieldExpression10_es6.js] -var v = { foo: function () { +var v = { + foo: function () { ; } }; diff --git a/tests/baselines/reference/YieldExpression13_es6.js b/tests/baselines/reference/YieldExpression13_es6.js index 093759e6bd9..328fc80dbdd 100644 --- a/tests/baselines/reference/YieldExpression13_es6.js +++ b/tests/baselines/reference/YieldExpression13_es6.js @@ -2,4 +2,6 @@ function* foo() { yield } //// [YieldExpression13_es6.js] -function foo() { ; } +function foo() { + ; +} diff --git a/tests/baselines/reference/YieldExpression17_es6.js b/tests/baselines/reference/YieldExpression17_es6.js index cefe4ca28df..5ac8093395a 100644 --- a/tests/baselines/reference/YieldExpression17_es6.js +++ b/tests/baselines/reference/YieldExpression17_es6.js @@ -2,4 +2,8 @@ var v = { get foo() { yield foo; } } //// [YieldExpression17_es6.js] -var v = { get foo() { ; } }; +var v = { + get foo() { + ; + } +}; diff --git a/tests/baselines/reference/accessibilityModifiers.js b/tests/baselines/reference/accessibilityModifiers.js index ebc801ac136..901b3a29c2e 100644 --- a/tests/baselines/reference/accessibilityModifiers.js +++ b/tests/baselines/reference/accessibilityModifiers.js @@ -50,36 +50,48 @@ class E { var C = (function () { function C() { } - C.privateMethod = function () { }; + C.privateMethod = function () { + }; Object.defineProperty(C, "privateGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "privateSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); - C.protectedMethod = function () { }; + C.protectedMethod = function () { + }; Object.defineProperty(C, "protectedGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "protectedSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); - C.publicMethod = function () { }; + C.publicMethod = function () { + }; Object.defineProperty(C, "publicGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "publicSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); @@ -89,36 +101,48 @@ var C = (function () { var D = (function () { function D() { } - D.privateMethod = function () { }; + D.privateMethod = function () { + }; Object.defineProperty(D, "privateGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(D, "privateSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); - D.protectedMethod = function () { }; + D.protectedMethod = function () { + }; Object.defineProperty(D, "protectedGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(D, "protectedSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); - D.publicMethod = function () { }; + D.publicMethod = function () { + }; Object.defineProperty(D, "publicGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(D, "publicSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); @@ -128,14 +152,18 @@ var D = (function () { var E = (function () { function E() { } - E.prototype.method = function () { }; + E.prototype.method = function () { + }; Object.defineProperty(E.prototype, "getter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(E.prototype, "setter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/accessorParameterAccessibilityModifier.js b/tests/baselines/reference/accessorParameterAccessibilityModifier.js index 8b5ee6196e0..89a511e6c5c 100644 --- a/tests/baselines/reference/accessorParameterAccessibilityModifier.js +++ b/tests/baselines/reference/accessorParameterAccessibilityModifier.js @@ -10,12 +10,14 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "X", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, "X", { - set: function (v2) { }, + set: function (v2) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/accessorWithES3.js b/tests/baselines/reference/accessorWithES3.js index 1eecaa68d64..6eba5238a91 100644 --- a/tests/baselines/reference/accessorWithES3.js +++ b/tests/baselines/reference/accessorWithES3.js @@ -47,8 +47,11 @@ var D = (function () { return D; })(); var x = { - get a() { return 1; } + get a() { + return 1; + } }; var y = { - set b(v) { } + set b(v) { + } }; diff --git a/tests/baselines/reference/accessorWithES5.js b/tests/baselines/reference/accessorWithES5.js index 746703bce52..1a3690556e0 100644 --- a/tests/baselines/reference/accessorWithES5.js +++ b/tests/baselines/reference/accessorWithES5.js @@ -44,8 +44,11 @@ var D = (function () { return D; })(); var x = { - get a() { return 1; } + get a() { + return 1; + } }; var y = { - set b(v) { } + set b(v) { + } }; diff --git a/tests/baselines/reference/accessorWithoutBody1.js b/tests/baselines/reference/accessorWithoutBody1.js index e06e305e161..8f357b89490 100644 --- a/tests/baselines/reference/accessorWithoutBody1.js +++ b/tests/baselines/reference/accessorWithoutBody1.js @@ -2,4 +2,6 @@ var v = { get foo() } //// [accessorWithoutBody1.js] -var v = { get foo() { } }; +var v = { + get foo() { } +}; diff --git a/tests/baselines/reference/accessorWithoutBody2.js b/tests/baselines/reference/accessorWithoutBody2.js index 3b5a821d580..d9405daeb93 100644 --- a/tests/baselines/reference/accessorWithoutBody2.js +++ b/tests/baselines/reference/accessorWithoutBody2.js @@ -2,4 +2,6 @@ var v = { set foo(a) } //// [accessorWithoutBody2.js] -var v = { set foo(a) { } }; +var v = { + set foo(a) { } +}; diff --git a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js index 8c01173a13c..d8cb761bb9b 100644 --- a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js +++ b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js @@ -20,7 +20,9 @@ var C = (function () { } Object.defineProperty(C.prototype, "x", { get: function () { - return function (x) { return ""; }; + return function (x) { + return ""; + }; }, set: function (v) { }, diff --git a/tests/baselines/reference/accessorsNotAllowedInES3.js b/tests/baselines/reference/accessorsNotAllowedInES3.js index 0843a39191c..7dab1283e84 100644 --- a/tests/baselines/reference/accessorsNotAllowedInES3.js +++ b/tests/baselines/reference/accessorsNotAllowedInES3.js @@ -11,10 +11,16 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "x", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); return C; })(); -var y = { get foo() { return 3; } }; +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..6a3b3773aa6 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 @@ -18,26 +18,40 @@ var LanguageSpec_section_4_5_error_cases = (function () { function LanguageSpec_section_4_5_error_cases() { } Object.defineProperty(LanguageSpec_section_4_5_error_cases.prototype, "AnnotatedSetter_SetterFirst", { - get: function () { return ""; }, - set: function (a) { }, + get: function () { + return ""; + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_error_cases.prototype, "AnnotatedSetter_SetterLast", { - get: function () { return ""; }, - set: function (a) { }, + get: function () { + return ""; + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_error_cases.prototype, "AnnotatedGetter_GetterFirst", { - get: function () { return ""; }, - set: function (aStr) { aStr = 0; }, + get: function () { + return ""; + }, + set: function (aStr) { + aStr = 0; + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_error_cases.prototype, "AnnotatedGetter_GetterLast", { - get: function () { return ""; }, - set: function (aStr) { aStr = 0; }, + get: function () { + return ""; + }, + set: function (aStr) { + aStr = 0; + }, enumerable: true, configurable: true }); 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 9aa7ce2f408..b140e565b29 100644 --- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js +++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js @@ -47,38 +47,56 @@ var LanguageSpec_section_4_5_inference = (function () { function LanguageSpec_section_4_5_inference() { } Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredGetterFromSetterAnnotation", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredGetterFromSetterAnnotation_GetterFirst", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredFromGetter", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredFromGetter_SetterFirst", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredSetterFromGetterAnnotation", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(LanguageSpec_section_4_5_inference.prototype, "InferredSetterFromGetterAnnotation_GetterFirst", { - get: function () { return new B(); }, - set: function (a) { }, + get: function () { + return new B(); + }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js index 26a77e917d9..ca3e8435e05 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js @@ -40,11 +40,13 @@ var r19 = a + { a: '' }; var r20 = a + ((a: string) => { return a }); //// [additionOperatorWithAnyAndEveryType.js] -function foo() { } +function foo() { +} var C = (function () { function C() { } - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var E; @@ -83,5 +85,9 @@ var r15 = a + 0 /* a */; var r16 = a + M; var r17 = a + ''; var r18 = a + 123; -var r19 = a + { a: '' }; -var r20 = a + (function (a) { return a; }); +var r19 = a + { + a: '' +}; +var r20 = a + (function (a) { + return a; +}); diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js index 7bd31c7ae53..baf4fadedb3 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js @@ -41,11 +41,13 @@ var r19 = E.a + C.foo(); var r20 = E.a + M; //// [additionOperatorWithInvalidOperands.js] -function foo() { } +function foo() { +} var C = (function () { function C() { } - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var E; diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js index 79d3c0b9b8d..5ec03e15b6c 100644 --- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js +++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.js @@ -25,7 +25,9 @@ var r11 = null + (() => { }); //// [additionOperatorWithNullValueAndInvalidOperator.js] // If one operand is the null or undefined value, it is treated as having the type of the other operand. -function foo() { return undefined; } +function foo() { + return undefined; +} var a; var b; var c; @@ -40,6 +42,9 @@ var r6 = null + c; // other cases var r7 = null + d; var r8 = null + true; -var r9 = null + { a: '' }; +var r9 = null + { + a: '' +}; var r10 = null + foo(); -var r11 = null + (function () { }); +var r11 = null + (function () { +}); diff --git a/tests/baselines/reference/additionOperatorWithStringAndEveryType.js b/tests/baselines/reference/additionOperatorWithStringAndEveryType.js index ecce65ba577..35c6056574e 100644 --- a/tests/baselines/reference/additionOperatorWithStringAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithStringAndEveryType.js @@ -75,5 +75,7 @@ var r15 = x + E; var r16 = x + 0 /* a */; var r17 = x + ''; var r18 = x + 0; -var r19 = x + { a: '' }; +var r19 = x + { + a: '' +}; var r20 = x + []; diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.js b/tests/baselines/reference/additionOperatorWithTypeParameter.js index a568f420a32..23a6b95b147 100644 --- a/tests/baselines/reference/additionOperatorWithTypeParameter.js +++ b/tests/baselines/reference/additionOperatorWithTypeParameter.js @@ -74,6 +74,7 @@ function foo(t, u) { var r16 = t + undefined; var r17 = t + t; var r18 = t + u; - var r19 = t + (function () { }); + var r19 = t + (function () { + }); var r20 = t + []; } diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js index 98935db2b86..6bf55f351a5 100644 --- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js +++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.js @@ -25,7 +25,9 @@ var r11 = undefined + (() => { }); //// [additionOperatorWithUndefinedValueAndInvalidOperands.js] // If one operand is the null or undefined value, it is treated as having the type of the other operand. -function foo() { return undefined; } +function foo() { + return undefined; +} var a; var b; var c; @@ -40,6 +42,9 @@ var r6 = undefined + c; // other cases var r7 = undefined + d; var r8 = undefined + true; -var r9 = undefined + { a: '' }; +var r9 = undefined + { + a: '' +}; var r10 = undefined + foo(); -var r11 = undefined + (function () { }); +var r11 = undefined + (function () { +}); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 5712abf3443..1c7f8381be0 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -46,5 +46,9 @@ var VisualizationModel = (function (_super) { exports.VisualizationModel = VisualizationModel; //// [aliasUsageInArray_main.js] var moduleA = require("aliasUsageInArray_moduleA"); -var xs = [moduleA]; -var xs2 = [moduleA]; +var xs = [ + moduleA +]; +var xs2 = [ + moduleA +]; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index 661c8fd91e7..e101cd49aba 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -45,5 +45,9 @@ var VisualizationModel = (function (_super) { exports.VisualizationModel = VisualizationModel; //// [aliasUsageInFunctionExpression_main.js] var moduleA = require("aliasUsageInFunctionExpression_moduleA"); -var f = function (x) { return x; }; -f = function (x) { return moduleA; }; +var f = function (x) { + return x; +}; +f = function (x) { + return moduleA; +}; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index 1070036adea..fc0cd51be50 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -52,5 +52,9 @@ var moduleA = require("aliasUsageInGenericFunction_moduleA"); function foo(x) { return x; } -var r = foo({ a: moduleA }); -var r2 = foo({ a: null }); +var r = foo({ + a: moduleA +}); +var r2 = foo({ + a: null +}); diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index 50ccfaf944d..7e6cc1340e8 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -46,6 +46,14 @@ var VisualizationModel = (function (_super) { exports.VisualizationModel = VisualizationModel; //// [aliasUsageInObjectLiteral_main.js] var moduleA = require("aliasUsageInObjectLiteral_moduleA"); -var a = { x: moduleA }; -var b = { x: moduleA }; -var c = { y: { z: moduleA } }; +var a = { + x: moduleA +}; +var b = { + x: moduleA +}; +var c = { + y: { + z: moduleA + } +}; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index 07a382ebca1..8a29a7f998b 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -53,5 +53,9 @@ var i; var d1 = i || moduleA; var d2 = i || moduleA; var d2 = moduleA || i; -var e = null || { x: moduleA }; -var f = null ? { x: moduleA } : null; +var e = null || { + x: moduleA +}; +var f = null ? { + x: moduleA +} : null; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index fb909181529..4b6debf4c98 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -21,7 +21,9 @@ export var a = function () { //// [aliasUsedAsNameValue_0.js] exports.id; //// [aliasUsedAsNameValue_1.js] -function b(a) { return null; } +function b(a) { + return null; +} exports.b = b; //// [aliasUsedAsNameValue_2.js] /// diff --git a/tests/baselines/reference/ambientClassOverloadForFunction.js b/tests/baselines/reference/ambientClassOverloadForFunction.js index 402eca63381..cf3a59a465d 100644 --- a/tests/baselines/reference/ambientClassOverloadForFunction.js +++ b/tests/baselines/reference/ambientClassOverloadForFunction.js @@ -5,4 +5,6 @@ function foo() { return null; } //// [ambientClassOverloadForFunction.js] ; -function foo() { return null; } +function foo() { + return null; +} diff --git a/tests/baselines/reference/ambiguousGenericAssertion1.js b/tests/baselines/reference/ambiguousGenericAssertion1.js index 8d40873036c..06804387585 100644 --- a/tests/baselines/reference/ambiguousGenericAssertion1.js +++ b/tests/baselines/reference/ambiguousGenericAssertion1.js @@ -6,8 +6,12 @@ var r3 = <(x: T) => T>f; // ambiguous, appears to the parser as a << operatio //// [ambiguousGenericAssertion1.js] -function f(x) { return null; } -var r = function (x) { return x; }; +function f(x) { + return null; +} +var r = function (x) { + return x; +}; var r2 = f; // valid var r3 = << T > (x), T; T > f; // ambiguous, appears to the parser as a << operation diff --git a/tests/baselines/reference/ambiguousOverload.js b/tests/baselines/reference/ambiguousOverload.js index 642f09dca16..fd373c075a2 100644 --- a/tests/baselines/reference/ambiguousOverload.js +++ b/tests/baselines/reference/ambiguousOverload.js @@ -12,11 +12,15 @@ var x2: string = foof2("s", null); var y2: number = foof2("s", null); //// [ambiguousOverload.js] -function foof(bar) { return bar; } +function foof(bar) { + return bar; +} ; var x = foof("s", null); var y = foof("s", null); -function foof2(bar) { return bar; } +function foof2(bar) { + return bar; +} ; var x2 = foof2("s", null); var y2 = foof2("s", null); diff --git a/tests/baselines/reference/anonterface.js b/tests/baselines/reference/anonterface.js index 12bfbc4ec9d..59d055b29d7 100644 --- a/tests/baselines/reference/anonterface.js +++ b/tests/baselines/reference/anonterface.js @@ -28,4 +28,6 @@ var M; M.C = C; })(M || (M = {})); var c = new M.C(); -c.m(function (n) { return "hello: " + n; }, 18); +c.m(function (n) { + return "hello: " + n; +}, 18); diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js index 04e3e91761d..bc9ebb02f42 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.js +++ b/tests/baselines/reference/anyAssignabilityInInheritance.js @@ -118,7 +118,8 @@ var E; E[E["A"] = 0] = "A"; })(E || (E = {})); var r3 = foo3(a); // any -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/anyAssignableToEveryType2.js b/tests/baselines/reference/anyAssignableToEveryType2.js index 530d8eb0439..41cedb73215 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.js +++ b/tests/baselines/reference/anyAssignableToEveryType2.js @@ -146,7 +146,8 @@ var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/anyDeclare.js b/tests/baselines/reference/anyDeclare.js index 8bb2f55eb84..a46a2529491 100644 --- a/tests/baselines/reference/anyDeclare.js +++ b/tests/baselines/reference/anyDeclare.js @@ -10,5 +10,6 @@ module myMod { var myMod; (function (myMod) { var myFn; - function myFn() { } + function myFn() { + } })(myMod || (myMod = {})); diff --git a/tests/baselines/reference/anyIdenticalToItself.js b/tests/baselines/reference/anyIdenticalToItself.js index b7b9b25e418..dc221b69aa7 100644 --- a/tests/baselines/reference/anyIdenticalToItself.js +++ b/tests/baselines/reference/anyIdenticalToItself.js @@ -13,7 +13,8 @@ class C { } //// [anyIdenticalToItself.js] -function foo(x, y) { } +function foo(x, y) { +} var C = (function () { function C() { } diff --git a/tests/baselines/reference/anyInferenceAnonymousFunctions.js b/tests/baselines/reference/anyInferenceAnonymousFunctions.js index df921965994..03e45113b26 100644 --- a/tests/baselines/reference/anyInferenceAnonymousFunctions.js +++ b/tests/baselines/reference/anyInferenceAnonymousFunctions.js @@ -25,6 +25,12 @@ paired.reduce(function (a1, a2) { paired.reduce(function (b1, b2) { return b1.concat({}); }, []); -paired.reduce(function (b3, b4) { return b3.concat({}); }, []); -paired.map(function (c1) { return c1.count; }); -paired.map(function (c2) { return c2.count; }); +paired.reduce(function (b3, b4) { + return b3.concat({}); +}, []); +paired.map(function (c1) { + return c1.count; +}); +paired.map(function (c2) { + return c2.count; +}); diff --git a/tests/baselines/reference/arrayAssignmentTest1.js b/tests/baselines/reference/arrayAssignmentTest1.js index 0abfa889bed..aed3d0cdf06 100644 --- a/tests/baselines/reference/arrayAssignmentTest1.js +++ b/tests/baselines/reference/arrayAssignmentTest1.js @@ -95,8 +95,12 @@ var __extends = this.__extends || function (d, b) { var C1 = (function () { function C1() { } - C1.prototype.IM1 = function () { return null; }; - C1.prototype.C1M1 = function () { return null; }; + C1.prototype.IM1 = function () { + return null; + }; + C1.prototype.C1M1 = function () { + return null; + }; return C1; })(); var C2 = (function (_super) { @@ -104,13 +108,17 @@ var C2 = (function (_super) { function C2() { _super.apply(this, arguments); } - C2.prototype.C2M1 = function () { return null; }; + C2.prototype.C2M1 = function () { + return null; + }; return C2; })(C1); var C3 = (function () { function C3() { } - C3.prototype.CM3M1 = function () { return 3; }; + C3.prototype.CM3M1 = function () { + return 3; + }; return C3; })(); /* @@ -129,8 +137,12 @@ var c1 = new C1(); var i1 = c1; var c2 = new C2(); var c3 = new C3(); -var o1 = { one: 1 }; -var f1 = function () { return new C1(); }; +var o1 = { + one: 1 +}; +var f1 = function () { + return new C1(); +}; var arr_any = []; var arr_i1 = []; var arr_c1 = []; diff --git a/tests/baselines/reference/arrayAssignmentTest2.js b/tests/baselines/reference/arrayAssignmentTest2.js index 977862866ed..0e6a9837573 100644 --- a/tests/baselines/reference/arrayAssignmentTest2.js +++ b/tests/baselines/reference/arrayAssignmentTest2.js @@ -69,8 +69,12 @@ var __extends = this.__extends || function (d, b) { var C1 = (function () { function C1() { } - C1.prototype.IM1 = function () { return null; }; - C1.prototype.C1M1 = function () { return null; }; + C1.prototype.IM1 = function () { + return null; + }; + C1.prototype.C1M1 = function () { + return null; + }; return C1; })(); var C2 = (function (_super) { @@ -78,13 +82,17 @@ var C2 = (function (_super) { function C2() { _super.apply(this, arguments); } - C2.prototype.C2M1 = function () { return null; }; + C2.prototype.C2M1 = function () { + return null; + }; return C2; })(C1); var C3 = (function () { function C3() { } - C3.prototype.CM3M1 = function () { return 3; }; + C3.prototype.CM3M1 = function () { + return 3; + }; return C3; })(); /* @@ -103,8 +111,12 @@ var c1 = new C1(); var i1 = c1; var c2 = new C2(); var c3 = new C3(); -var o1 = { one: 1 }; -var f1 = function () { return new C1(); }; +var o1 = { + one: 1 +}; +var f1 = function () { + return new C1(); +}; var arr_any = []; var arr_i1 = []; var arr_c1 = []; @@ -118,7 +130,9 @@ arr_c3 = arr_c2_2; // should be an error - is arr_c3 = arr_c1_2; // should be an error - is arr_c3 = arr_i1_2; // should be an error - is arr_any = f1; // should be an error - is -arr_any = function () { return null; }; // should be an error - is +arr_any = function () { + return null; +}; // should be an error - is arr_any = o1; // should be an error - is arr_any = a1; // should be ok - is arr_any = c1; // should be an error - is diff --git a/tests/baselines/reference/arrayAssignmentTest4.js b/tests/baselines/reference/arrayAssignmentTest4.js index c38cdebc06c..43c7f2f4144 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.js +++ b/tests/baselines/reference/arrayAssignmentTest4.js @@ -30,7 +30,9 @@ arr_any = c3; // should be an error - is var C3 = (function () { function C3() { } - C3.prototype.CM3M1 = function () { return 3; }; + C3.prototype.CM3M1 = function () { + return 3; + }; return C3; })(); /* @@ -45,7 +47,11 @@ Type 1 of any[]: */ var c3 = new C3(); -var o1 = { one: 1 }; +var o1 = { + one: 1 +}; var arr_any = []; -arr_any = function () { return null; }; // should be an error - is +arr_any = function () { + return null; +}; // should be an error - is arr_any = c3; // should be an error - is diff --git a/tests/baselines/reference/arrayAugment.js b/tests/baselines/reference/arrayAugment.js index 20cf510712a..fcd2ee6987b 100644 --- a/tests/baselines/reference/arrayAugment.js +++ b/tests/baselines/reference/arrayAugment.js @@ -9,6 +9,8 @@ var y: string[][]; // Expect no error here //// [arrayAugment.js] -var x = ['']; +var x = [ + '' +]; var y = x.split(4); var y; // Expect no error here diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js index f8e158e5b02..29da9f0737d 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.js +++ b/tests/baselines/reference/arrayBestCommonTypes.js @@ -141,34 +141,170 @@ var EmptyTypes; return null; }; f.prototype.x = function () { - (this.voidIfAny([4, 2][0])); - (this.voidIfAny([4, 2, undefined][0])); - (this.voidIfAny([undefined, 2, 4][0])); - (this.voidIfAny([null, 2, 4][0])); - (this.voidIfAny([2, 4, null][0])); - (this.voidIfAny([undefined, 4, null][0])); - (this.voidIfAny(['', "q"][0])); - (this.voidIfAny(['', "q", undefined][0])); - (this.voidIfAny([undefined, "q", ''][0])); - (this.voidIfAny([null, "q", ''][0])); - (this.voidIfAny(["q", '', null][0])); - (this.voidIfAny([undefined, '', null][0])); - (this.voidIfAny([[3, 4], [null]][0][0])); - var t1 = [{ x: 7, y: new derived() }, { x: 5, y: new base() }]; - var t2 = [{ x: true, y: new derived() }, { x: false, y: new base() }]; - var t3 = [{ x: undefined, y: new base() }, { x: '', y: new derived() }]; + (this.voidIfAny([ + 4, + 2 + ][0])); + (this.voidIfAny([ + 4, + 2, + undefined + ][0])); + (this.voidIfAny([ + undefined, + 2, + 4 + ][0])); + (this.voidIfAny([ + null, + 2, + 4 + ][0])); + (this.voidIfAny([ + 2, + 4, + null + ][0])); + (this.voidIfAny([ + undefined, + 4, + null + ][0])); + (this.voidIfAny([ + '', + "q" + ][0])); + (this.voidIfAny([ + '', + "q", + undefined + ][0])); + (this.voidIfAny([ + undefined, + "q", + '' + ][0])); + (this.voidIfAny([ + null, + "q", + '' + ][0])); + (this.voidIfAny([ + "q", + '', + null + ][0])); + (this.voidIfAny([ + undefined, + '', + null + ][0])); + (this.voidIfAny([ + [ + 3, + 4 + ], + [ + null + ] + ][0][0])); + var t1 = [ + { + x: 7, + y: new derived() + }, + { + x: 5, + y: new base() + } + ]; + var t2 = [ + { + x: true, + y: new derived() + }, + { + x: false, + y: new base() + } + ]; + var t3 = [ + { + x: undefined, + y: new base() + }, + { + x: '', + y: new derived() + } + ]; var anyObj = null; // Order matters here so test all the variants - var a1 = [{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }]; - var a2 = [{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }]; - var a3 = [{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }]; + var a1 = [ + { + x: 0, + y: 'a' + }, + { + x: 'a', + y: 'a' + }, + { + x: anyObj, + y: 'a' + } + ]; + var a2 = [ + { + x: anyObj, + y: 'a' + }, + { + x: 0, + y: 'a' + }, + { + x: 'a', + y: 'a' + } + ]; + var a3 = [ + { + x: 0, + y: 'a' + }, + { + x: anyObj, + y: 'a' + }, + { + x: 'a', + y: 'a' + } + ]; var ifaceObj = null; var baseObj = new base(); var base2Obj = new base2(); - var b1 = [baseObj, base2Obj, ifaceObj]; - var b2 = [base2Obj, baseObj, ifaceObj]; - var b3 = [baseObj, ifaceObj, base2Obj]; - var b4 = [ifaceObj, baseObj, base2Obj]; + var b1 = [ + baseObj, + base2Obj, + ifaceObj + ]; + var b2 = [ + base2Obj, + baseObj, + ifaceObj + ]; + var b3 = [ + baseObj, + ifaceObj, + base2Obj + ]; + var b4 = [ + ifaceObj, + baseObj, + base2Obj + ]; }; return f; })(); @@ -200,34 +336,170 @@ var NonEmptyTypes; return null; }; f.prototype.x = function () { - (this.voidIfAny([4, 2][0])); - (this.voidIfAny([4, 2, undefined][0])); - (this.voidIfAny([undefined, 2, 4][0])); - (this.voidIfAny([null, 2, 4][0])); - (this.voidIfAny([2, 4, null][0])); - (this.voidIfAny([undefined, 4, null][0])); - (this.voidIfAny(['', "q"][0])); - (this.voidIfAny(['', "q", undefined][0])); - (this.voidIfAny([undefined, "q", ''][0])); - (this.voidIfAny([null, "q", ''][0])); - (this.voidIfAny(["q", '', null][0])); - (this.voidIfAny([undefined, '', null][0])); - (this.voidIfAny([[3, 4], [null]][0][0])); - var t1 = [{ x: 7, y: new derived() }, { x: 5, y: new base() }]; - var t2 = [{ x: true, y: new derived() }, { x: false, y: new base() }]; - var t3 = [{ x: undefined, y: new base() }, { x: '', y: new derived() }]; + (this.voidIfAny([ + 4, + 2 + ][0])); + (this.voidIfAny([ + 4, + 2, + undefined + ][0])); + (this.voidIfAny([ + undefined, + 2, + 4 + ][0])); + (this.voidIfAny([ + null, + 2, + 4 + ][0])); + (this.voidIfAny([ + 2, + 4, + null + ][0])); + (this.voidIfAny([ + undefined, + 4, + null + ][0])); + (this.voidIfAny([ + '', + "q" + ][0])); + (this.voidIfAny([ + '', + "q", + undefined + ][0])); + (this.voidIfAny([ + undefined, + "q", + '' + ][0])); + (this.voidIfAny([ + null, + "q", + '' + ][0])); + (this.voidIfAny([ + "q", + '', + null + ][0])); + (this.voidIfAny([ + undefined, + '', + null + ][0])); + (this.voidIfAny([ + [ + 3, + 4 + ], + [ + null + ] + ][0][0])); + var t1 = [ + { + x: 7, + y: new derived() + }, + { + x: 5, + y: new base() + } + ]; + var t2 = [ + { + x: true, + y: new derived() + }, + { + x: false, + y: new base() + } + ]; + var t3 = [ + { + x: undefined, + y: new base() + }, + { + x: '', + y: new derived() + } + ]; var anyObj = null; // Order matters here so test all the variants - var a1 = [{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }]; - var a2 = [{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }]; - var a3 = [{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }]; + var a1 = [ + { + x: 0, + y: 'a' + }, + { + x: 'a', + y: 'a' + }, + { + x: anyObj, + y: 'a' + } + ]; + var a2 = [ + { + x: anyObj, + y: 'a' + }, + { + x: 0, + y: 'a' + }, + { + x: 'a', + y: 'a' + } + ]; + var a3 = [ + { + x: 0, + y: 'a' + }, + { + x: anyObj, + y: 'a' + }, + { + x: 'a', + y: 'a' + } + ]; var ifaceObj = null; var baseObj = new base(); var base2Obj = new base2(); - var b1 = [baseObj, base2Obj, ifaceObj]; - var b2 = [base2Obj, baseObj, ifaceObj]; - var b3 = [baseObj, ifaceObj, base2Obj]; - var b4 = [ifaceObj, baseObj, base2Obj]; + var b1 = [ + baseObj, + base2Obj, + ifaceObj + ]; + var b2 = [ + base2Obj, + baseObj, + ifaceObj + ]; + var b3 = [ + baseObj, + ifaceObj, + base2Obj + ]; + var b4 = [ + ifaceObj, + baseObj, + base2Obj + ]; }; return f; })(); diff --git a/tests/baselines/reference/arrayCast.js b/tests/baselines/reference/arrayCast.js index 214bf642250..7a6482fb39b 100644 --- a/tests/baselines/reference/arrayCast.js +++ b/tests/baselines/reference/arrayCast.js @@ -9,6 +9,15 @@ //// [arrayCast.js] // Should fail. Even though the array is contextually typed with { id: number }[], it still // has type { foo: string }[], which is not assignable to { id: number }[]. -[{ foo: "s" }]; +[ + { + foo: "s" + } +]; // Should succeed, as the {} element causes the type of the array to be {}[] -[{ foo: "s" }, {}]; +[ + { + foo: "s" + }, + {} +]; diff --git a/tests/baselines/reference/arrayConcatMap.js b/tests/baselines/reference/arrayConcatMap.js index 715ca158a43..992c8eb7ce3 100644 --- a/tests/baselines/reference/arrayConcatMap.js +++ b/tests/baselines/reference/arrayConcatMap.js @@ -3,5 +3,14 @@ var x = [].concat([{ a: 1 }], [{ a: 2 }]) .map(b => b.a); //// [arrayConcatMap.js] -var x = [].concat([{ a: 1 }], [{ a: 2 }]) - .map(function (b) { return b.a; }); +var x = [].concat([ + { + a: 1 + } +], [ + { + a: 2 + } +]).map(function (b) { + return b.a; +}); diff --git a/tests/baselines/reference/arrayLiteral.js b/tests/baselines/reference/arrayLiteral.js index ae210aabd42..f2d6c998175 100644 --- a/tests/baselines/reference/arrayLiteral.js +++ b/tests/baselines/reference/arrayLiteral.js @@ -19,11 +19,21 @@ var y2: number[] = new Array(); // valid uses of array literals var x = []; var x = new Array(1); -var y = [1]; -var y = [1, 2]; +var y = [ + 1 +]; +var y = [ + 1, + 2 +]; var y = new Array(); var x2 = []; var x2 = new Array(1); -var y2 = [1]; -var y2 = [1, 2]; +var y2 = [ + 1 +]; +var y2 = [ + 1, + 2 +]; var y2 = new Array(); diff --git a/tests/baselines/reference/arrayLiteral1.js b/tests/baselines/reference/arrayLiteral1.js index b84e7414f24..8949ae684f0 100644 --- a/tests/baselines/reference/arrayLiteral1.js +++ b/tests/baselines/reference/arrayLiteral1.js @@ -2,4 +2,7 @@ var v30 = [1, 2]; //// [arrayLiteral1.js] -var v30 = [1, 2]; +var v30 = [ + 1, + 2 +]; diff --git a/tests/baselines/reference/arrayLiteral2.js b/tests/baselines/reference/arrayLiteral2.js index fb1b8059305..42d05fe9169 100644 --- a/tests/baselines/reference/arrayLiteral2.js +++ b/tests/baselines/reference/arrayLiteral2.js @@ -2,4 +2,7 @@ var v30 = [1, 2], v31; //// [arrayLiteral2.js] -var v30 = [1, 2], v31; +var v30 = [ + 1, + 2 +], v31; diff --git a/tests/baselines/reference/arrayLiteralContextualType.js b/tests/baselines/reference/arrayLiteralContextualType.js index 0edf5c45164..c86347cb028 100644 --- a/tests/baselines/reference/arrayLiteralContextualType.js +++ b/tests/baselines/reference/arrayLiteralContextualType.js @@ -44,8 +44,10 @@ var Elephant = (function () { } return Elephant; })(); -function foo(animals) { } -function bar(animals) { } +function foo(animals) { +} +function bar(animals) { +} foo([ new Giraffe(), new Elephant() @@ -54,6 +56,9 @@ bar([ new Giraffe(), new Elephant() ]); // Legal because of the contextual type IAnimal provided by the parameter -var arr = [new Giraffe(), new Elephant()]; +var arr = [ + new Giraffe(), + new Elephant() +]; foo(arr); // ok because arr is Array not {}[] bar(arr); // ok because arr is Array not {}[] diff --git a/tests/baselines/reference/arrayLiteralSpread.js b/tests/baselines/reference/arrayLiteralSpread.js index 73a60714526..6cb0335e55d 100644 --- a/tests/baselines/reference/arrayLiteralSpread.js +++ b/tests/baselines/reference/arrayLiteralSpread.js @@ -25,7 +25,11 @@ function f2() { //// [arrayLiteralSpread.js] function f0() { - var a = [1, 2, 3]; + var a = [ + 1, + 2, + 3 + ]; var a1 = a; var a2 = [1].concat(a); var a3 = [1, 2].concat(a); @@ -36,11 +40,17 @@ function f0() { var a8 = a.concat(a, a); } function f1() { - var a = [1, 2, 3]; + var a = [ + 1, + 2, + 3 + ]; var b = ["hello"].concat(a, [true]); var b; } function f2() { var a = []; - var b = [5]; + var b = [ + 5 + ]; } diff --git a/tests/baselines/reference/arrayLiteralTypeInference.js b/tests/baselines/reference/arrayLiteralTypeInference.js index 28aa143fa61..8d74e6f1444 100644 --- a/tests/baselines/reference/arrayLiteralTypeInference.js +++ b/tests/baselines/reference/arrayLiteralTypeInference.js @@ -78,8 +78,14 @@ var ActionB = (function (_super) { return ActionB; })(Action); var x1 = [ - { id: 2, trueness: false }, - { id: 3, name: "three" } + { + id: 2, + trueness: false + }, + { + id: 3, + name: "three" + } ]; var x2 = [ new ActionA(), @@ -91,8 +97,14 @@ var x3 = [ new ActionB() ]; var z1 = [ - { id: 2, trueness: false }, - { id: 3, name: "three" } + { + id: 2, + trueness: false + }, + { + id: 3, + name: "three" + } ]; var z2 = [ new ActionA(), diff --git a/tests/baselines/reference/arrayLiteralWidened.js b/tests/baselines/reference/arrayLiteralWidened.js index a250c47849d..02f9e0c6544 100644 --- a/tests/baselines/reference/arrayLiteralWidened.js +++ b/tests/baselines/reference/arrayLiteralWidened.js @@ -17,10 +17,43 @@ var c = [[[null]],[undefined]] //// [arrayLiteralWidened.js] // array literals are widened upon assignment according to their element type var a = []; // any[] -var a = [null, null]; -var a = [undefined, undefined]; -var b = [[], [null, null]]; // any[][] -var b = [[], []]; -var b = [[undefined, undefined]]; -var c = [[[]]]; // any[][][] -var c = [[[null]], [undefined]]; +var a = [ + null, + null +]; +var a = [ + undefined, + undefined +]; +var b = [ + [], + [ + null, + null + ] +]; // any[][] +var b = [ + [], + [] +]; +var b = [ + [ + undefined, + undefined + ] +]; +var c = [ + [ + [] + ] +]; // any[][][] +var c = [ + [ + [ + null + ] + ], + [ + undefined + ] +]; diff --git a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.js b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.js index b4f869d499e..9855abefb2c 100644 --- a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.js +++ b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.js @@ -20,10 +20,48 @@ var gs = [(b: { x: number; z?: number }) => 2, (a: { x: number; y?: number }) => var a; var b; var c; -var as = [a, b]; // { x: number; y?: number };[] -var bs = [b, a]; // { x: number; z?: number };[] -var cs = [a, b, c]; // { x: number; y?: number };[] -var ds = [function (x) { return 1; }, function (x) { return 2; }]; // { (x:Object) => number }[] -var es = [function (x) { return 2; }, function (x) { return 1; }]; // { (x:string) => number }[] -var fs = [function (a) { return 1; }, function (b) { return 2; }]; // (a: { x: number; y?: number }) => number[] -var gs = [function (b) { return 2; }, function (a) { return 1; }]; // (b: { x: number; z?: number }) => number[] +var as = [ + a, + b +]; // { x: number; y?: number };[] +var bs = [ + b, + a +]; // { x: number; z?: number };[] +var cs = [ + a, + b, + c +]; // { x: number; y?: number };[] +var ds = [ + function (x) { + return 1; + }, + function (x) { + return 2; + } +]; // { (x:Object) => number }[] +var es = [ + function (x) { + return 2; + }, + function (x) { + return 1; + } +]; // { (x:string) => number }[] +var fs = [ + function (a) { + return 1; + }, + function (b) { + return 2; + } +]; // (a: { x: number; y?: number }) => number[] +var gs = [ + function (b) { + return 2; + }, + function (a) { + return 1; + } +]; // (b: { x: number; z?: number }) => number[] diff --git a/tests/baselines/reference/arrayLiterals.js b/tests/baselines/reference/arrayLiterals.js index 16e5ec7eee4..e55d14e2994 100644 --- a/tests/baselines/reference/arrayLiterals.js +++ b/tests/baselines/reference/arrayLiterals.js @@ -44,24 +44,91 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -var arr1 = [[], [1], ['']]; -var arr2 = [[null], [1], ['']]; +var arr1 = [ + [], + [ + 1 + ], + [ + '' + ] +]; +var arr2 = [ + [ + null + ], + [ + 1 + ], + [ + '' + ] +]; // Array literal with elements of only EveryType E has type E[] -var stringArrArr = [[''], [""]]; -var stringArr = ['', ""]; -var numberArr = [0, 0.0, 0x00, 1e1]; -var boolArr = [false, true, false, true]; +var stringArrArr = [ + [ + '' + ], + [ + "" + ] +]; +var stringArr = [ + '', + "" +]; +var numberArr = [ + 0, + 0.0, + 0x00, + 1e1 +]; +var boolArr = [ + false, + true, + false, + true +]; var C = (function () { function C() { } return C; })(); -var classArr = [new C(), new C()]; -var classTypeArray = [C, C, C]; +var classArr = [ + new C(), + new C() +]; +var classTypeArray = [ + C, + C, + C +]; var classTypeArray; // Should OK, not be a parse error // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[] -var context1 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }]; -var context2 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }]; +var context1 = [ + { + a: '', + b: 0, + c: '' + }, + { + a: "", + b: 3, + c: 0 + } +]; +var context2 = [ + { + a: '', + b: 0, + c: '' + }, + { + a: "", + b: 3, + c: 0 + } +]; // Contextual type C with numeric index signature of type Base makes array literal of Derived have type Base[] var Base = (function () { function Base() { @@ -84,6 +151,12 @@ var Derived2 = (function (_super) { return Derived2; })(Base); ; -var context3 = [new Derived1(), new Derived2()]; +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[] -var context4 = [new Derived1(), new Derived1()]; +var context4 = [ + new Derived1(), + new Derived1() +]; diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js index f15215a88eb..cce02199052 100644 --- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js +++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js @@ -52,8 +52,20 @@ var MyList = (function () { var list; var list2; var myList; -var xs = [list, myList]; // {}[] -var ys = [list, list2]; // {}[] -var zs = [list, null]; // List[] +var xs = [ + list, + myList +]; // {}[] +var ys = [ + list, + list2 +]; // {}[] +var zs = [ + list, + null +]; // List[] var myDerivedList; -var as = [list, myDerivedList]; // List[] +var as = [ + list, + myDerivedList +]; // List[] diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.js b/tests/baselines/reference/arrayOfFunctionTypes3.js index c0829418dd7..036fc2d85ae 100644 --- a/tests/baselines/reference/arrayOfFunctionTypes3.js +++ b/tests/baselines/reference/arrayOfFunctionTypes3.js @@ -28,25 +28,42 @@ var r7 = r6(''); // any not string //// [arrayOfFunctionTypes3.js] // valid uses of arrays of function types -var x = [function () { return 1; }, function () { }]; +var x = [ + function () { + return 1; + }, + function () { + } +]; var r2 = x[0](); var C = (function () { function C() { } return C; })(); -var y = [C, C]; +var y = [ + C, + C +]; var r3 = new y[0](); var a; var b; var c; -var z = [a, b, c]; +var z = [ + a, + b, + c +]; var r4 = z[0]; var r5 = r4(''); // any not string var r5b = r4(1); var a2; var b2; var c2; -var z2 = [a2, b2, c2]; +var z2 = [ + a2, + b2, + c2 +]; var r6 = z2[0]; var r7 = r6(''); // any not string diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js index 6fcdae657e9..3b0f2c11aa7 100644 --- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js +++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js @@ -7,6 +7,7 @@ class X { var X = (function () { function X() { } - X.prototype.f = function (a) { }; + X.prototype.f = function (a) { + }; return X; })(); diff --git a/tests/baselines/reference/arraySigChecking.js b/tests/baselines/reference/arraySigChecking.js index 16189305ead..82ef3d059ef 100644 --- a/tests/baselines/reference/arraySigChecking.js +++ b/tests/baselines/reference/arraySigChecking.js @@ -34,13 +34,22 @@ isEmpty(['a']); //// [arraySigChecking.js] var myVar; -var strArray = [myVar.voidFn()]; +var strArray = [ + myVar.voidFn() +]; var myArray; -myArray = [[1, 2]]; +myArray = [ + [ + 1, + 2 + ] +]; function isEmpty(l) { return l.length === 0; } isEmpty([]); isEmpty(new Array(3)); isEmpty(new Array(3)); -isEmpty(['a']); +isEmpty([ + 'a' +]); diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js index a10e3955ae0..3a47b787418 100644 --- a/tests/baselines/reference/arrowFunctionContexts.js +++ b/tests/baselines/reference/arrowFunctionContexts.js @@ -105,7 +105,9 @@ var __extends = this.__extends || function (d, b) { }; // Arrow function used in with statement with (window) { - var p = function () { return this; }; + var p = function () { + return this; + }; } // Arrow function as argument to super call var Base = (function () { @@ -117,35 +119,55 @@ var Derived = (function (_super) { __extends(Derived, _super); function Derived() { var _this = this; - _super.call(this, function () { return _this; }); + _super.call(this, function () { + return _this; + }); } return Derived; })(Base); // Arrow function as function argument -window.setTimeout(function () { return null; }, 100); +window.setTimeout(function () { + return null; +}, 100); // Arrow function as value in array literal -var obj = function (n) { return ''; }; +var obj = function (n) { + return ''; +}; var obj; // OK -var arr = [function (n) { return ''; }]; +var arr = [ + function (n) { + return ''; + } +]; var arr; // Incorrect error here (bug 829597) // Arrow function as enum value var E; (function (E) { - E[E["x"] = function () { return 4; }] = "x"; - E[E["y"] = (function () { return _this; }).length] = "y"; // error, can't use this in enum + E[E["x"] = function () { + return 4; + }] = "x"; + E[E["y"] = (function () { + return _this; + }).length] = "y"; // error, can't use this in enum })(E || (E = {})); // Arrow function as module variable initializer var M; (function (M) { - M.a = function (s) { return ''; }; - var b = function (s) { return s; }; + M.a = function (s) { + return ''; + }; + var b = function (s) { + return s; + }; })(M || (M = {})); // Repeat above for module members that are functions? (necessary to redo all of them?) var M2; (function (M2) { // Arrow function used in with statement with (window) { - var p = function () { return this; }; + var p = function () { + return this; + }; } // Arrow function as argument to super call var Base = (function () { @@ -157,37 +179,69 @@ var M2; __extends(Derived, _super); function Derived() { var _this = this; - _super.call(this, function () { return _this; }); + _super.call(this, function () { + return _this; + }); } return Derived; })(Base); // Arrow function as function argument - window.setTimeout(function () { return null; }, 100); + window.setTimeout(function () { + return null; + }, 100); // Arrow function as value in array literal - var obj = function (n) { return ''; }; + var obj = function (n) { + return ''; + }; var obj; // OK - var arr = [function (n) { return ''; }]; + var arr = [ + function (n) { + return ''; + } + ]; var arr; // Incorrect error here (bug 829597) // Arrow function as enum value var E; (function (E) { - E[E["x"] = function () { return 4; }] = "x"; - E[E["y"] = (function () { return _this; }).length] = "y"; + E[E["x"] = function () { + return 4; + }] = "x"; + E[E["y"] = (function () { + return _this; + }).length] = "y"; })(E || (E = {})); // Arrow function as module variable initializer var M; (function (M) { - M.a = function (s) { return ''; }; - var b = function (s) { return s; }; + M.a = function (s) { + return ''; + }; + var b = function (s) { + return s; + }; })(M || (M = {})); })(M2 || (M2 = {})); // (ParamList) => { ... } is a generic arrow function -var generic1 = function (n) { return [n]; }; +var generic1 = function (n) { + return [ + n + ]; +}; var generic1; // Incorrect error, Bug 829597 -var generic2 = function (n) { return [n]; }; +var generic2 = function (n) { + return [ + n + ]; +}; var generic2; // ((ParamList) => { ... } ) is a type assertion to an arrow function -var asserted1 = (function (n) { return [n]; }); +var asserted1 = (function (n) { + return [ + n + ]; +}); var asserted1; -var asserted2 = (function (n) { return n; }); +var asserted2 = (function (n) { + return n; +}); var asserted2; diff --git a/tests/baselines/reference/arrowFunctionExpressions.js b/tests/baselines/reference/arrowFunctionExpressions.js index 68516b52cb2..760ba23627b 100644 --- a/tests/baselines/reference/arrowFunctionExpressions.js +++ b/tests/baselines/reference/arrowFunctionExpressions.js @@ -90,49 +90,84 @@ function tryCatchFn() { //// [arrowFunctionExpressions.js] // ArrowFormalParameters => AssignmentExpression is equivalent to ArrowFormalParameters => { return AssignmentExpression; } -var a = function (p) { return p.length; }; -var a = function (p) { return p.length; }; +var a = function (p) { + return p.length; +}; +var a = function (p) { + return p.length; +}; // Identifier => Block is equivalent to(Identifier) => Block -var b = function (j) { return 0; }; -var b = function (j) { return 0; }; +var b = function (j) { + return 0; +}; +var b = function (j) { + return 0; +}; // Identifier => AssignmentExpression is equivalent to(Identifier) => AssignmentExpression var c; -var d = function (n) { return c = n; }; -var d = function (n) { return c = n; }; +var d = function (n) { + return c = n; +}; +var d = function (n) { + return c = n; +}; var d; // Arrow function used in class member initializer // Arrow function used in class member function var MyClass = (function () { function MyClass() { var _this = this; - this.m = function (n) { return n + 1; }; - this.p = function (n) { return n && _this; }; + this.m = function (n) { + return n + 1; + }; + this.p = function (n) { + return n && _this; + }; } MyClass.prototype.fn = function () { var _this = this; - var m = function (n) { return n + 1; }; - var p = function (n) { return n && _this; }; + var m = function (n) { + return n + 1; + }; + 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 arrrr = function () { + return function (m) { + return function () { + return function (n) { + return m + n; + }; + }; + }; +}; var e = arrrr()(3)()(4); var e; // Arrow function used in arrow function used in function function someFn() { - var arr = function (n) { return function (p) { return p * n; }; }; + var arr = function (n) { + return function (p) { + return p * n; + }; + }; arr(3)(4).toExponential(); } // Arrow function used in function function someOtherFn() { - var arr = function (n) { return '' + n; }; + var arr = function (n) { + return '' + n; + }; arr(4).charAt(0); } // Arrow function used in nested function in function function outerFn() { function innerFn() { - var arrowFn = function () { }; + var arrowFn = function () { + }; var p = arrowFn(); var p; } @@ -140,7 +175,9 @@ function outerFn() { // Arrow function used in nested function in arrow function var f = function (n) { function fn(x) { - return function () { return n + x; }; + return function () { + return n + x; + }; } return fn(4); }; @@ -150,7 +187,9 @@ var g; function someOuterFn() { var arr = function (n) { function innerFn() { - return function () { return n.length; }; + return function () { + return n.length; + }; } return innerFn; }; @@ -162,12 +201,18 @@ h.toExponential(); function tryCatchFn() { var _this = this; try { - var x = function () { return _this; }; + var x = function () { + return _this; + }; } catch (e) { - var t = function () { return e + _this; }; + var t = function () { + return e + _this; + }; } finally { - var m = function () { return _this + ''; }; + var m = function () { + return _this + ''; + }; } } diff --git a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js index 0f9c3f81b3b..3cfc18d2cf7 100644 --- a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js +++ b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js @@ -11,4 +11,6 @@ var C = (function () { } return C; })(); -var c = new C(function () { return asdf; }); // should error +var c = new C(function () { + return asdf; +}); // should error diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement1.js b/tests/baselines/reference/arrowFunctionInExpressionStatement1.js index 9969a28b6ce..55a6d2781fb 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement1.js +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement1.js @@ -2,4 +2,6 @@ () => 0; //// [arrowFunctionInExpressionStatement1.js] -(function () { return 0; }); +(function () { + return 0; +}); diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js index 2cc6aca998e..63f3facd858 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js @@ -6,5 +6,7 @@ module M { //// [arrowFunctionInExpressionStatement2.js] var M; (function (M) { - (function () { return 0; }); + (function () { + return 0; + }); })(M || (M = {})); diff --git a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js index 931520294e9..51ddc0f6dac 100644 --- a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js +++ b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js @@ -8,4 +8,6 @@ var square = (x: number) => x * x; // Should error at semicolon. var f = ; var b = 1 * 2 * 3 * 4; -var square = function (x) { return x * x; }; +var square = function (x) { + return x * x; +}; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js index d53f33deadc..e3ff7583448 100644 --- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js @@ -2,4 +2,6 @@ var v = a => {} //// [arrowFunctionWithObjectLiteralBody1.js] -var v = function (a) { return {}; }; +var v = function (a) { + return {}; +}; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js index f2fc086c082..384cdc2d48b 100644 --- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js @@ -2,4 +2,6 @@ var v = a => {} //// [arrowFunctionWithObjectLiteralBody2.js] -var v = function (a) { return {}; }; +var v = function (a) { + return {}; +}; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js index 77f5c2d4c3d..f2d27ea4a63 100644 --- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js @@ -8,7 +8,27 @@ var c = () => ({ name: "foo", message: "bar" }); var d = () => ((({ name: "foo", message: "bar" }))); //// [arrowFunctionWithObjectLiteralBody5.js] -var a = function () { return { name: "foo", message: "bar" }; }; -var b = function () { return ({ name: "foo", message: "bar" }); }; -var c = function () { return ({ name: "foo", message: "bar" }); }; -var d = function () { return (({ name: "foo", message: "bar" })); }; +var a = function () { + return { + name: "foo", + message: "bar" + }; +}; +var b = function () { + return ({ + name: "foo", + message: "bar" + }); +}; +var c = function () { + return ({ + name: "foo", + message: "bar" + }); +}; +var d = function () { + return (({ + name: "foo", + message: "bar" + })); +}; diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js index 6128a6bef86..ac2af4046eb 100644 --- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js +++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.js @@ -8,7 +8,19 @@ var c = () => ({ name: "foo", message: "bar" }); var d = () => ((({ name: "foo", message: "bar" }))); //// [arrowFunctionWithObjectLiteralBody6.js] -var a = () => ({ name: "foo", message: "bar" }); -var b = () => ({ name: "foo", message: "bar" }); -var c = () => ({ name: "foo", message: "bar" }); -var d = () => (({ name: "foo", message: "bar" })); +var a = () => ({ + name: "foo", + message: "bar" +}); +var b = () => ({ + name: "foo", + message: "bar" +}); +var c = () => ({ + name: "foo", + message: "bar" +}); +var d = () => (({ + name: "foo", + message: "bar" +})); diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.js b/tests/baselines/reference/arrowFunctionsMissingTokens.js index e0e22578ac6..7bd24f07577 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.js +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.js @@ -69,22 +69,39 @@ module okay { //// [arrowFunctionsMissingTokens.js] var missingArrowsWithCurly; (function (missingArrowsWithCurly) { - var a = function () { }; - var b = function () { }; - var c = function (x) { }; - var d = function (x, y) { }; - var e = function (x, y) { }; + var a = function () { + }; + var b = function () { + }; + var c = function (x) { + }; + var d = function (x, y) { + }; + var e = function (x, y) { + }; })(missingArrowsWithCurly || (missingArrowsWithCurly = {})); var missingCurliesWithArrow; (function (missingCurliesWithArrow) { var withStatement; (function (withStatement) { - var a = function () { var k = 10; }; - var b = function () { var k = 10; }; - var c = function (x) { var k = 10; }; - var d = function (x, y) { var k = 10; }; - var e = function (x, y) { var k = 10; }; - var f = function () { var k = 10; }; + var a = function () { + var k = 10; + }; + var b = function () { + var k = 10; + }; + var c = function (x) { + var k = 10; + }; + var d = function (x, y) { + var k = 10; + }; + var e = function (x, y) { + var k = 10; + }; + var f = function () { + var k = 10; + }; })(withStatement || (withStatement = {})); var withoutStatement; (function (withoutStatement) { @@ -110,9 +127,14 @@ var ce_nEst_pas_une_arrow_function; })(ce_nEst_pas_une_arrow_function || (ce_nEst_pas_une_arrow_function = {})); var okay; (function (okay) { - var a = function () { }; - var b = function () { }; - var c = function (x) { }; - var d = function (x, y) { }; - var e = function (x, y) { }; + var a = function () { + }; + var b = function () { + }; + var c = function (x) { + }; + var d = function (x, y) { + }; + var e = function (x, y) { + }; })(okay || (okay = {})); diff --git a/tests/baselines/reference/asiArith.js b/tests/baselines/reference/asiArith.js index b5016af3117..6d7b964c8d0 100644 --- a/tests/baselines/reference/asiArith.js +++ b/tests/baselines/reference/asiArith.js @@ -37,9 +37,7 @@ y //// [asiArith.js] var x = 1; var y = 1; -var z = x - + + +y; +var z = x + + +y; var a = 1; var b = 1; -var c = x - - - -y; +var c = x - - -y; diff --git a/tests/baselines/reference/assign1.js b/tests/baselines/reference/assign1.js index fa18c8f287b..f29f5a2a9de 100644 --- a/tests/baselines/reference/assign1.js +++ b/tests/baselines/reference/assign1.js @@ -12,5 +12,8 @@ module M { //// [assign1.js] var M; (function (M) { - var x = { salt: 2, pepper: 0 }; + var x = { + salt: 2, + pepper: 0 + }; })(M || (M = {})); diff --git a/tests/baselines/reference/assignEveryTypeToAny.js b/tests/baselines/reference/assignEveryTypeToAny.js index 15aa6bcdd91..afe0d17cea1 100644 --- a/tests/baselines/reference/assignEveryTypeToAny.js +++ b/tests/baselines/reference/assignEveryTypeToAny.js @@ -91,8 +91,16 @@ var h; x = h; var i; x = i; -x = { f: function () { return 1; } }; -x = { f: function (x) { return x; } }; +x = { + f: function () { + return 1; + } +}; +x = { + f: function (x) { + return x; + } +}; function j(a) { x = a; } diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.js b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.js index fe6142cafe0..182ceec9821 100644 --- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.js +++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.js @@ -10,6 +10,11 @@ fn(function (a, b) { return true; }) //// [assignLambdaToNominalSubtypeOfFunction.js] -function fn(cb) { } -fn(function (a, b) { return true; }); -fn(function (a, b) { return true; }); +function fn(cb) { +} +fn(function (a, b) { + return true; +}); +fn(function (a, b) { + return true; +}); diff --git a/tests/baselines/reference/assignToExistingClass.js b/tests/baselines/reference/assignToExistingClass.js index f12979f3142..c739279c85b 100644 --- a/tests/baselines/reference/assignToExistingClass.js +++ b/tests/baselines/reference/assignToExistingClass.js @@ -28,7 +28,9 @@ var Test; } Tester.prototype.willThrowError = function () { Mocked = Mocked || function () { - return { myProp: "test" }; + return { + myProp: "test" + }; }; }; return Tester; diff --git a/tests/baselines/reference/assignToFn.js b/tests/baselines/reference/assignToFn.js index 2ff8ceedfa6..a565b9ab1ad 100644 --- a/tests/baselines/reference/assignToFn.js +++ b/tests/baselines/reference/assignToFn.js @@ -13,6 +13,10 @@ module M { //// [assignToFn.js] var M; (function (M) { - var x = { f: function (n) { return true; } }; + var x = { + f: function (n) { + return true; + } + }; x.f = "hello"; })(M || (M = {})); diff --git a/tests/baselines/reference/assignmentCompat1.js b/tests/baselines/reference/assignmentCompat1.js index 09546b7165e..99b6d592afd 100644 --- a/tests/baselines/reference/assignmentCompat1.js +++ b/tests/baselines/reference/assignmentCompat1.js @@ -6,7 +6,9 @@ x = y; y = x; //// [assignmentCompat1.js] -var x = { one: 1 }; +var x = { + one: 1 +}; var y; x = y; y = x; diff --git a/tests/baselines/reference/assignmentCompatBug2.js b/tests/baselines/reference/assignmentCompatBug2.js index 5545cc7d19c..6f4ebd585ed 100644 --- a/tests/baselines/reference/assignmentCompatBug2.js +++ b/tests/baselines/reference/assignmentCompatBug2.js @@ -39,33 +39,62 @@ b3 = { }; // error //// [assignmentCompatBug2.js] -var b2 = { a: 0 }; // error -b2 = { a: 0 }; // error -b2 = { b: 0, a: 0 }; +var b2 = { + a: 0 +}; // error +b2 = { + a: 0 +}; // error +b2 = { + b: 0, + a: 0 +}; var b3; b3 = { - f: function (n) { return 0; }, - g: function (s) { return 0; }, + f: function (n) { + return 0; + }, + g: function (s) { + return 0; + }, m: 0 }; // ok b3 = { - f: function (n) { return 0; }, - g: function (s) { return 0; } + f: function (n) { + return 0; + }, + g: function (s) { + return 0; + } }; // error b3 = { - f: function (n) { return 0; }, + f: function (n) { + return 0; + }, m: 0 }; // error b3 = { - f: function (n) { return 0; }, - g: function (s) { return 0; }, + f: function (n) { + return 0; + }, + g: function (s) { + return 0; + }, m: 0, n: 0, - k: function (a) { return null; } + k: function (a) { + return null; + } }; // ok b3 = { - f: function (n) { return 0; }, - g: function (s) { return 0; }, + f: function (n) { + return 0; + }, + g: function (s) { + return 0; + }, n: 0, - k: function (a) { return null; } + k: function (a) { + return null; + } }; // error diff --git a/tests/baselines/reference/assignmentCompatBug3.js b/tests/baselines/reference/assignmentCompatBug3.js index 049e7090335..6d3deedc5b8 100644 --- a/tests/baselines/reference/assignmentCompatBug3.js +++ b/tests/baselines/reference/assignmentCompatBug3.js @@ -28,8 +28,12 @@ foo(x + y); //// [assignmentCompatBug3.js] function makePoint(x, y) { return { - get x() { return x; }, - get y() { return y; }, + get x() { + return x; + }, + get y() { + return y; + }, //x: "yo", //y: "boo", dist: function () { @@ -49,7 +53,8 @@ var C = (function () { }); return C; })(); -function foo(test) { } +function foo(test) { +} var x; var y; foo(x); diff --git a/tests/baselines/reference/assignmentCompatBug5.js b/tests/baselines/reference/assignmentCompatBug5.js index ae444c3dad6..d769e9afd25 100644 --- a/tests/baselines/reference/assignmentCompatBug5.js +++ b/tests/baselines/reference/assignmentCompatBug5.js @@ -12,11 +12,22 @@ foo3((n) => { return; }); //// [assignmentCompatBug5.js] -function foo1(x) { } -foo1({ b: 5 }); -function foo2(x) { } -foo2(["s", "t"]); -function foo3(x) { } +function foo1(x) { +} +foo1({ + b: 5 +}); +function foo2(x) { +} +foo2([ + "s", + "t" +]); +function foo3(x) { +} ; -foo3(function (s) { }); -foo3(function (n) { return; }); +foo3(function (s) { +}); +foo3(function (n) { + return; +}); diff --git a/tests/baselines/reference/assignmentCompatForEnums.js b/tests/baselines/reference/assignmentCompatForEnums.js index 8db85399fa8..4bca6a514d2 100644 --- a/tests/baselines/reference/assignmentCompatForEnums.js +++ b/tests/baselines/reference/assignmentCompatForEnums.js @@ -22,7 +22,9 @@ var TokenType; })(TokenType || (TokenType = {})); ; var list = {}; -function returnType() { return null; } +function returnType() { + return null; +} function foo() { var x = returnType(); var x = list['one']; diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.js b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.js index c96c739bf3c..b56a09ff7e7 100644 --- a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.js +++ b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.js @@ -6,7 +6,17 @@ foo({ id: 1234, name: false }); // Error, name of wrong type foo({ name: "hello" }); // Error, id required but missing //// [assignmentCompatFunctionsWithOptionalArgs.js] -foo({ id: 1234 }); // Ok -foo({ id: 1234, name: "hello" }); // Ok -foo({ id: 1234, name: false }); // Error, name of wrong type -foo({ name: "hello" }); // Error, id required but missing +foo({ + id: 1234 +}); // Ok +foo({ + id: 1234, + name: "hello" +}); // Ok +foo({ + id: 1234, + name: false +}); // Error, name of wrong type +foo({ + name: "hello" +}); // Error, id required but missing diff --git a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js index bb6817bb60e..2eac9cdb476 100644 --- a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js +++ b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js @@ -20,8 +20,10 @@ Biz(new Foo()); var Foo = (function () { function Foo() { } - Foo.prototype.Boz = function () { }; + Foo.prototype.Boz = function () { + }; return Foo; })(); -function Biz(map) { } +function Biz(map) { +} Biz(new Foo()); diff --git a/tests/baselines/reference/assignmentCompatOnNew.js b/tests/baselines/reference/assignmentCompatOnNew.js index 1b8cfdcc3bf..bc3b7e6ba96 100644 --- a/tests/baselines/reference/assignmentCompatOnNew.js +++ b/tests/baselines/reference/assignmentCompatOnNew.js @@ -13,5 +13,6 @@ var Foo = (function () { return Foo; })(); ; -function bar(x) { } +function bar(x) { +} bar(Foo); // Error, but should be allowed diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.js b/tests/baselines/reference/assignmentCompatWithCallSignatures.js index 12fc6159fac..9cd0a8c8bac 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.js @@ -55,20 +55,40 @@ t = s; t = a2; a = s; a = a2; -t = function (x) { return 1; }; -t = function () { return 1; }; -t = function (x) { return ''; }; -a = function (x) { return 1; }; -a = function () { return 1; }; -a = function (x) { return ''; }; +t = function (x) { + return 1; +}; +t = function () { + return 1; +}; +t = function (x) { + return ''; +}; +a = function (x) { + return 1; +}; +a = function () { + return 1; +}; +a = function (x) { + return ''; +}; var s2; var a3; // these are errors t = s2; t = a3; -t = function (x) { return 1; }; -t = function (x) { return ''; }; +t = function (x) { + return 1; +}; +t = function (x) { + return ''; +}; a = s2; a = a3; -a = function (x) { return 1; }; -a = function (x) { return ''; }; +a = function (x) { + return 1; +}; +a = function (x) { + return ''; +}; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.js b/tests/baselines/reference/assignmentCompatWithCallSignatures2.js index 6bfc1b6c0d6..288a2bdf435 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.js @@ -62,26 +62,70 @@ t = s; t = a2; a = s; a = a2; -t = { f: function () { return 1; } }; -t = { f: function (x) { return 1; } }; -t = { f: function f() { return 1; } }; -t = { f: function (x) { return ''; } }; -a = { f: function () { return 1; } }; -a = { f: function (x) { return 1; } }; -a = { f: function (x) { return ''; } }; +t = { + f: function () { + return 1; + } +}; +t = { + f: function (x) { + return 1; + } +}; +t = { + f: function f() { + return 1; + } +}; +t = { + f: function (x) { + return ''; + } +}; +a = { + f: function () { + return 1; + } +}; +a = { + f: function (x) { + return 1; + } +}; +a = { + f: function (x) { + return ''; + } +}; // errors -t = function () { return 1; }; -t = function (x) { return ''; }; -a = function () { return 1; }; -a = function (x) { return ''; }; +t = function () { + return 1; +}; +t = function (x) { + return ''; +}; +a = function () { + return 1; +}; +a = function (x) { + return ''; +}; var s2; var a3; // these are errors t = s2; t = a3; -t = function (x) { return 1; }; -t = function (x) { return ''; }; +t = function (x) { + return 1; +}; +t = function (x) { + return ''; +}; a = s2; a = a3; -a = function (x) { return 1; }; -a = function (x) { return ''; }; +a = function (x) { + return 1; +}; +a = function (x) { + return ''; +}; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js index e12a741cd0f..3aa9d5a9a9e 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.js @@ -73,9 +73,15 @@ var a5: (x?: number, y?: number) => number; // call signatures in derived types must have the same or fewer optional parameters as the base type var b; var a; -a = function () { return 1; }; // ok, same number of required params -a = function (x) { return 1; }; // ok, same number of required params -a = function (x) { return 1; }; // error, too many required params +a = function () { + return 1; +}; // ok, same number of required params +a = function (x) { + return 1; +}; // ok, same number of required params +a = function (x) { + return 1; +}; // error, too many required params a = b.a; // ok a = b.a2; // ok a = b.a3; // error @@ -83,9 +89,15 @@ a = b.a4; // error a = b.a5; // ok a = b.a6; // error var a2; -a2 = function () { return 1; }; // ok, same number of required params -a2 = function (x) { return 1; }; // ok, same number of required params -a2 = function (x) { return 1; }; // ok, same number of params +a2 = function () { + return 1; +}; // ok, same number of required params +a2 = function (x) { + return 1; +}; // ok, same number of required params +a2 = function (x) { + return 1; +}; // ok, same number of params a2 = b.a; // ok a2 = b.a2; // ok a2 = b.a3; // ok, same number of params @@ -93,10 +105,18 @@ a2 = b.a4; // ok, excess params are optional in b.a3 a2 = b.a5; // ok a2 = b.a6; // error var a3; -a3 = function () { return 1; }; // ok, fewer required params -a3 = function (x) { return 1; }; // ok, fewer required params -a3 = function (x) { return 1; }; // ok, same number of required params -a3 = function (x, y) { return 1; }; // error, too many required params +a3 = function () { + return 1; +}; // ok, fewer required params +a3 = function (x) { + return 1; +}; // ok, fewer required params +a3 = function (x) { + return 1; +}; // ok, same number of required params +a3 = function (x, y) { + return 1; +}; // error, too many required params a3 = b.a; // ok a3 = b.a2; // ok a3 = b.a3; // ok @@ -104,10 +124,18 @@ a3 = b.a4; // ok a3 = b.a5; // ok a3 = b.a6; // error var a4; -a4 = function () { return 1; }; // ok, fewer required params -a4 = function (x, y) { return 1; }; // ok, fewer required params -a4 = function (x) { return 1; }; // ok, same number of required params -a4 = function (x, y) { return 1; }; // ok, same number of params +a4 = function () { + return 1; +}; // ok, fewer required params +a4 = function (x, y) { + return 1; +}; // ok, fewer required params +a4 = function (x) { + return 1; +}; // ok, same number of required params +a4 = function (x, y) { + return 1; +}; // ok, same number of params a4 = b.a; // ok a4 = b.a2; // ok a4 = b.a3; // ok @@ -115,10 +143,18 @@ a4 = b.a4; // ok a4 = b.a5; // ok a4 = b.a6; // ok, same number of params var a5; -a5 = function () { return 1; }; // ok, fewer required params -a5 = function (x, y) { return 1; }; // ok, fewer required params -a5 = function (x) { return 1; }; // ok, fewer params in lambda -a5 = function (x, y) { return 1; }; // ok, same number of params +a5 = function () { + return 1; +}; // ok, fewer required params +a5 = function (x, y) { + return 1; +}; // ok, fewer required params +a5 = function (x) { + return 1; +}; // ok, fewer params in lambda +a5 = function (x, y) { + return 1; +}; // ok, same number of params a5 = b.a; // ok a5 = b.a2; // ok a5 = b.a3; // ok, fewer params in b.a3 diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js index f4cf5cc79e2..054e865eb45 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js @@ -48,7 +48,9 @@ var a4: (x?: number, y?: string, ...z: number[]) => number; //// [assignmentCompatWithCallSignaturesWithRestParameters.js] // call signatures in derived types must have the same or fewer optional parameters as the target for assignment var a; // ok, same number of required params -a = function () { return 1; }; // ok, same number of required params +a = function () { + return 1; +}; // ok, same number of required params a = function () { var args = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -63,12 +65,22 @@ a = function () { } return 1; }; // error, type mismatch -a = function (x) { return 1; }; // ok, same number of required params -a = function (x, y, z) { return 1; }; // ok, same number of required params -a = function (x) { return 1; }; // ok, rest param corresponds to infinite number of params -a = function (x) { return 1; }; // error, incompatible type +a = function (x) { + return 1; +}; // ok, same number of required params +a = function (x, y, z) { + return 1; +}; // ok, same number of required params +a = function (x) { + return 1; +}; // ok, rest param corresponds to infinite number of params +a = function (x) { + return 1; +}; // error, incompatible type var a2; -a2 = function () { return 1; }; // ok, fewer required params +a2 = function () { + return 1; +}; // ok, fewer required params a2 = function () { var args = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -76,8 +88,12 @@ a2 = function () { } return 1; }; // ok, fewer required params -a2 = function (x) { return 1; }; // ok, fewer required params -a2 = function (x) { return 1; }; // ok, same number of required params +a2 = function (x) { + return 1; +}; // ok, fewer required params +a2 = function (x) { + return 1; +}; // ok, same number of required params a2 = function (x) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { @@ -92,14 +108,28 @@ a2 = function (x) { } return 1; }; // should be type mismatch error -a2 = function (x, y) { return 1; }; // ok, rest param corresponds to infinite number of params -a2 = function (x, y) { return 1; }; // ok, same number of required params +a2 = function (x, y) { + return 1; +}; // ok, rest param corresponds to infinite number of params +a2 = function (x, y) { + return 1; +}; // ok, same number of required params var a3; -a3 = function () { return 1; }; // ok, fewer required params -a3 = function (x) { return 1; }; // ok, fewer required params -a3 = function (x) { return 1; }; // ok, same number of required params -a3 = function (x, y) { return 1; }; // ok, all present params match -a3 = function (x, y, z) { return 1; }; // error +a3 = function () { + return 1; +}; // ok, fewer required params +a3 = function (x) { + return 1; +}; // ok, fewer required params +a3 = function (x) { + return 1; +}; // ok, same number of required params +a3 = function (x, y) { + return 1; +}; // ok, all present params match +a3 = function (x, y, z) { + return 1; +}; // error a3 = function (x) { var z = []; for (var _i = 1; _i < arguments.length; _i++) { @@ -107,13 +137,25 @@ a3 = function (x) { } return 1; }; // error -a3 = function (x, y, z) { return 1; }; // error +a3 = function (x, y, z) { + return 1; +}; // error var a4; -a4 = function () { return 1; }; // ok, fewer required params -a4 = function (x, y) { return 1; }; // error, type mismatch -a4 = function (x) { return 1; }; // ok, all present params match -a4 = function (x, y) { return 1; }; // error, second param has type mismatch -a4 = function (x, y) { return 1; }; // ok, same number of required params with matching types +a4 = function () { + return 1; +}; // ok, fewer required params +a4 = function (x, y) { + return 1; +}; // error, type mismatch +a4 = function (x) { + return 1; +}; // ok, all present params match +a4 = function (x, y) { + return 1; +}; // error, second param has type mismatch +a4 = function (x, y) { + return 1; +}; // ok, same number of required params with matching types a4 = function (x) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures.js index c00aa121712..3b38bce1590 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.js @@ -53,9 +53,17 @@ var a3; // these are errors t = s2; t = a3; -t = function (x) { return 1; }; -t = function (x) { return ''; }; +t = function (x) { + return 1; +}; +t = function (x) { + return ''; +}; a = s2; a = a3; -a = function (x) { return 1; }; -a = function (x) { return ''; }; +a = function (x) { + return 1; +}; +a = function (x) { + return ''; +}; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js index d00762aa1c5..ac3accc6b5b 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.js @@ -55,18 +55,34 @@ t = a2; a = s; a = a2; // errors -t = function () { return 1; }; -t = function (x) { return ''; }; -a = function () { return 1; }; -a = function (x) { return ''; }; +t = function () { + return 1; +}; +t = function (x) { + return ''; +}; +a = function () { + return 1; +}; +a = function (x) { + return ''; +}; var s2; var a3; // these are errors t = s2; t = a3; -t = function (x) { return 1; }; -t = function (x) { return ''; }; +t = function (x) { + return 1; +}; +t = function (x) { + return ''; +}; a = s2; a = a3; -a = function (x) { return 1; }; -a = function (x) { return ''; }; +a = function (x) { + return 1; +}; +a = function (x) { + return ''; +}; diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js index f5a3499c8cc..1a5efce1ac8 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js @@ -138,24 +138,60 @@ var ClassTypeParam; function Base() { var _this = this; this.init = function () { - _this.a = function () { return null; }; // ok, same T of required params - _this.a = function (x) { return null; }; // ok, same T of required params - _this.a = function (x) { return null; }; // error, too many required params - _this.a2 = function () { return null; }; // ok, same T of required params - _this.a2 = function (x) { return null; }; // ok, same T of required params - _this.a2 = function (x) { return null; }; // ok, same number of params - _this.a3 = function () { return null; }; // ok, fewer required params - _this.a3 = function (x) { return null; }; // ok, fewer required params - _this.a3 = function (x) { return null; }; // ok, same T of required params - _this.a3 = function (x, y) { return null; }; // error, too many required params - _this.a4 = function () { return null; }; // ok, fewer required params - _this.a4 = function (x, y) { return null; }; // ok, fewer required params - _this.a4 = function (x) { return null; }; // ok, same T of required params - _this.a4 = function (x, y) { return null; }; // ok, same number of params - _this.a5 = function () { return null; }; // ok, fewer required params - _this.a5 = function (x, y) { return null; }; // ok, fewer required params - _this.a5 = function (x) { return null; }; // ok, all present params match - _this.a5 = function (x, y) { return null; }; // ok, same number of params + _this.a = function () { + return null; + }; // ok, same T of required params + _this.a = function (x) { + return null; + }; // ok, same T of required params + _this.a = function (x) { + return null; + }; // error, too many required params + _this.a2 = function () { + return null; + }; // ok, same T of required params + _this.a2 = function (x) { + return null; + }; // ok, same T of required params + _this.a2 = function (x) { + return null; + }; // ok, same number of params + _this.a3 = function () { + return null; + }; // ok, fewer required params + _this.a3 = function (x) { + return null; + }; // ok, fewer required params + _this.a3 = function (x) { + return null; + }; // ok, same T of required params + _this.a3 = function (x, y) { + return null; + }; // error, too many required params + _this.a4 = function () { + return null; + }; // ok, fewer required params + _this.a4 = function (x, y) { + return null; + }; // ok, fewer required params + _this.a4 = function (x) { + return null; + }; // ok, same T of required params + _this.a4 = function (x, y) { + return null; + }; // ok, same number of params + _this.a5 = function () { + return null; + }; // ok, fewer required params + _this.a5 = function (x, y) { + return null; + }; // ok, fewer required params + _this.a5 = function (x) { + return null; + }; // ok, all present params match + _this.a5 = function (x, y) { + return null; + }; // ok, same number of params }; } return Base; @@ -210,24 +246,60 @@ var GenericSignaturesValid; function Base2() { var _this = this; this.init = function () { - _this.a = function () { return null; }; // ok, same T of required params - _this.a = function (x) { return null; }; // ok, same T of required params - _this.a = function (x) { return null; }; // error, too many required params - _this.a2 = function () { return null; }; // ok, same T of required params - _this.a2 = function (x) { return null; }; // ok, same T of required params - _this.a2 = function (x) { return null; }; // ok, same number of params - _this.a3 = function () { return null; }; // ok, fewer required params - _this.a3 = function (x) { return null; }; // ok, fewer required params - _this.a3 = function (x) { return null; }; // ok, same T of required params - _this.a3 = function (x, y) { return null; }; // error, too many required params - _this.a4 = function () { return null; }; // ok, fewer required params - _this.a4 = function (x, y) { return null; }; // ok, fewer required params - _this.a4 = function (x) { return null; }; // ok, same T of required params - _this.a4 = function (x, y) { return null; }; // ok, same number of params - _this.a5 = function () { return null; }; // ok, fewer required params - _this.a5 = function (x, y) { return null; }; // ok, fewer required params - _this.a5 = function (x) { return null; }; // ok, all present params match - _this.a5 = function (x, y) { return null; }; // ok, same number of params + _this.a = function () { + return null; + }; // ok, same T of required params + _this.a = function (x) { + return null; + }; // ok, same T of required params + _this.a = function (x) { + return null; + }; // error, too many required params + _this.a2 = function () { + return null; + }; // ok, same T of required params + _this.a2 = function (x) { + return null; + }; // ok, same T of required params + _this.a2 = function (x) { + return null; + }; // ok, same number of params + _this.a3 = function () { + return null; + }; // ok, fewer required params + _this.a3 = function (x) { + return null; + }; // ok, fewer required params + _this.a3 = function (x) { + return null; + }; // ok, same T of required params + _this.a3 = function (x, y) { + return null; + }; // error, too many required params + _this.a4 = function () { + return null; + }; // ok, fewer required params + _this.a4 = function (x, y) { + return null; + }; // ok, fewer required params + _this.a4 = function (x) { + return null; + }; // ok, same T of required params + _this.a4 = function (x, y) { + return null; + }; // ok, same number of params + _this.a5 = function () { + return null; + }; // ok, fewer required params + _this.a5 = function (x, y) { + return null; + }; // ok, fewer required params + _this.a5 = function (x) { + return null; + }; // ok, all present params match + _this.a5 = function (x, y) { + return null; + }; // ok, same number of params }; } return Base2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js index 3bd457f19d3..d3dfe7f93fc 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js @@ -106,8 +106,12 @@ var SimpleTypes; var t2; var a; var b; - var a2 = { foo: '' }; - var b2 = { foo: '' }; + var a2 = { + foo: '' + }; + var b2 = { + foo: '' + }; s = t; t = s; s = s2; @@ -146,8 +150,12 @@ var ObjectTypes; var t2; var a; var b; - var a2 = { foo: a2 }; - var b2 = { foo: b2 }; + var a2 = { + foo: a2 + }; + var b2 = { + foo: b2 + }; s = t; t = s; s = s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js index ea565e9545c..5eb2a07ac11 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js @@ -61,8 +61,12 @@ var s2; var t2; var a; var b; -var a2 = { foo: '' }; -var b2 = { foo: '' }; +var a2 = { + foo: '' +}; +var b2 = { + foo: '' +}; s = t; t = s; s = s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js index 091a1e53d15..f65b06931c0 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js @@ -61,8 +61,12 @@ var s2; var t2; var a; var b; -var a2 = { foo: '' }; -var b2 = { foo: '' }; +var a2 = { + foo: '' +}; +var b2 = { + foo: '' +}; s = t; t = s; s = s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js index 0d535cbb20d..f9933a3e04f 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js @@ -136,8 +136,12 @@ var OnlyDerived; var t2; var a; var b; - var a2 = { foo: new Derived() }; - var b2 = { foo: new Derived2() }; + var a2 = { + foo: new Derived() + }; + var b2 = { + foo: new Derived2() + }; s = t; // error t = s; // error s = s2; // ok @@ -195,8 +199,12 @@ var WithBase; var t2; var a; var b; - var a2 = { foo: new Base() }; - var b2 = { foo: new Derived2() }; + var a2 = { + foo: new Base() + }; + var b2 = { + foo: new Derived2() + }; s = t; // ok t = s; // error s = s2; // ok diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js index 2a1a08a97ed..dc2e1244ef5 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js @@ -61,8 +61,12 @@ var s2; var t2; var a; var b; -var a2 = { 1.0: '' }; -var b2 = { 1: '' }; +var a2 = { + 1.0: '' +}; +var b2 = { + 1: '' +}; s = t; t = s; s = s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js index 5525b623ecc..ca3ada064f8 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js @@ -119,7 +119,9 @@ var TargetHasOptional; (function (TargetHasOptional) { var c; var a; - var b = { opt: new Base() }; + var b = { + opt: new Base() + }; var d; var e; var f; @@ -142,7 +144,9 @@ var SourceHasOptional; (function (SourceHasOptional) { var c; var a; - var b = { opt: new Base() }; + var b = { + opt: new Base() + }; var d; var e; var f; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js index 8859a4c9ab0..cf65e181cb9 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js @@ -121,7 +121,9 @@ var TargetHasOptional; (function (TargetHasOptional) { var c; var a; - var b = { opt: new Base() }; + var b = { + opt: new Base() + }; var d; var e; var f; @@ -144,7 +146,9 @@ var SourceHasOptional; (function (SourceHasOptional) { var c; var a; - var b = { opt: new Base() }; + var b = { + opt: new Base() + }; var d; var e; var f; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js index a042897ba57..06f398401ca 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js @@ -106,8 +106,12 @@ var JustStrings; var t2; var a; var b; - var a2 = { '1.0': '' }; - var b2 = { '1': '' }; + var a2 = { + '1.0': '' + }; + var b2 = { + '1': '' + }; s = t; t = s; s = s2; // ok @@ -146,8 +150,12 @@ var NumbersAndStrings; var t2; var a; var b; - var a2 = { '1.0': '' }; - var b2 = { 1.: '' }; + var a2 = { + '1.0': '' + }; + var b2 = { + 1.: '' + }; s = t; // ok t = s; // ok s = s2; // ok diff --git a/tests/baselines/reference/assignmentCompatWithOverloads.js b/tests/baselines/reference/assignmentCompatWithOverloads.js index ca3dc0e2294..472ebec2967 100644 --- a/tests/baselines/reference/assignmentCompatWithOverloads.js +++ b/tests/baselines/reference/assignmentCompatWithOverloads.js @@ -31,10 +31,18 @@ var d: new(x: number) => void; d = C; // Error //// [assignmentCompatWithOverloads.js] -function f1(x) { return null; } -function f2(x) { return null; } -function f3(x) { return null; } -function f4(x) { return undefined; } +function f1(x) { + return null; +} +function f2(x) { + return null; +} +function f3(x) { + return null; +} +function f4(x) { + return undefined; +} var g; g = f1; // OK g = f2; // Error diff --git a/tests/baselines/reference/assignmentCompatability1.js b/tests/baselines/reference/assignmentCompatability1.js index f629d5eba27..61ac5d22058 100644 --- a/tests/baselines/reference/assignmentCompatability1.js +++ b/tests/baselines/reference/assignmentCompatability1.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability10.js b/tests/baselines/reference/assignmentCompatability10.js index bbcc8e879e3..a494e30f6cf 100644 --- a/tests/baselines/reference/assignmentCompatability10.js +++ b/tests/baselines/reference/assignmentCompatability10.js @@ -13,7 +13,9 @@ __test2__.__val__x4 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability11.js b/tests/baselines/reference/assignmentCompatability11.js index 992e38f7726..929a8f1bca3 100644 --- a/tests/baselines/reference/assignmentCompatability11.js +++ b/tests/baselines/reference/assignmentCompatability11.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: 1 }; + __test2__.obj = { + two: 1 + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability12.js b/tests/baselines/reference/assignmentCompatability12.js index 3c802aab6e3..f0ccb00833d 100644 --- a/tests/baselines/reference/assignmentCompatability12.js +++ b/tests/baselines/reference/assignmentCompatability12.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: "1" }; + __test2__.obj = { + one: "1" + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability13.js b/tests/baselines/reference/assignmentCompatability13.js index ef4f24f7100..084ef7ebeb1 100644 --- a/tests/baselines/reference/assignmentCompatability13.js +++ b/tests/baselines/reference/assignmentCompatability13.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: "1" }; + __test2__.obj = { + two: "1" + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability14.js b/tests/baselines/reference/assignmentCompatability14.js index bd4445cb515..4bfe397bc60 100644 --- a/tests/baselines/reference/assignmentCompatability14.js +++ b/tests/baselines/reference/assignmentCompatability14.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: true }; + __test2__.obj = { + one: true + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability15.js b/tests/baselines/reference/assignmentCompatability15.js index 37f1be4bc99..0fffe4bd539 100644 --- a/tests/baselines/reference/assignmentCompatability15.js +++ b/tests/baselines/reference/assignmentCompatability15.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: true }; + __test2__.obj = { + two: true + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability16.js b/tests/baselines/reference/assignmentCompatability16.js index 43c832016b0..6b20f1be30b 100644 --- a/tests/baselines/reference/assignmentCompatability16.js +++ b/tests/baselines/reference/assignmentCompatability16.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: [1] }; + __test2__.obj = { + one: [ + 1 + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability17.js b/tests/baselines/reference/assignmentCompatability17.js index 09ce24b8f5d..b44ce12bb12 100644 --- a/tests/baselines/reference/assignmentCompatability17.js +++ b/tests/baselines/reference/assignmentCompatability17.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: [1] }; + __test2__.obj = { + two: [ + 1 + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability18.js b/tests/baselines/reference/assignmentCompatability18.js index ad93e96303f..1120d349d0b 100644 --- a/tests/baselines/reference/assignmentCompatability18.js +++ b/tests/baselines/reference/assignmentCompatability18.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: [1] }; + __test2__.obj = { + one: [ + 1 + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability19.js b/tests/baselines/reference/assignmentCompatability19.js index f330f94e81c..6bc4c762ee6 100644 --- a/tests/baselines/reference/assignmentCompatability19.js +++ b/tests/baselines/reference/assignmentCompatability19.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: [1] }; + __test2__.obj = { + two: [ + 1 + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability2.js b/tests/baselines/reference/assignmentCompatability2.js index 207942875bf..b280ce83c2c 100644 --- a/tests/baselines/reference/assignmentCompatability2.js +++ b/tests/baselines/reference/assignmentCompatability2.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability20.js b/tests/baselines/reference/assignmentCompatability20.js index 321ec78ee17..aed14360279 100644 --- a/tests/baselines/reference/assignmentCompatability20.js +++ b/tests/baselines/reference/assignmentCompatability20.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: ["1"] }; + __test2__.obj = { + one: [ + "1" + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability21.js b/tests/baselines/reference/assignmentCompatability21.js index 215ab5dc397..6ede7ac66eb 100644 --- a/tests/baselines/reference/assignmentCompatability21.js +++ b/tests/baselines/reference/assignmentCompatability21.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: ["1"] }; + __test2__.obj = { + two: [ + "1" + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability22.js b/tests/baselines/reference/assignmentCompatability22.js index 04cc2a2d0ab..41d60442790 100644 --- a/tests/baselines/reference/assignmentCompatability22.js +++ b/tests/baselines/reference/assignmentCompatability22.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: [true] }; + __test2__.obj = { + one: [ + true + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability23.js b/tests/baselines/reference/assignmentCompatability23.js index 1d032364360..4604fd2ba41 100644 --- a/tests/baselines/reference/assignmentCompatability23.js +++ b/tests/baselines/reference/assignmentCompatability23.js @@ -13,13 +13,19 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { two: [true] }; + __test2__.obj = { + two: [ + true + ] + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability24.js b/tests/baselines/reference/assignmentCompatability24.js index e6961264de8..5fa5e612d05 100644 --- a/tests/baselines/reference/assignmentCompatability24.js +++ b/tests/baselines/reference/assignmentCompatability24.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = function f(a) { return a; }; + __test2__.obj = function f(a) { + return a; + }; ; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability25.js b/tests/baselines/reference/assignmentCompatability25.js index 4f365e9049c..7bc941c3450 100644 --- a/tests/baselines/reference/assignmentCompatability25.js +++ b/tests/baselines/reference/assignmentCompatability25.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability26.js b/tests/baselines/reference/assignmentCompatability26.js index e2ae6b766df..b01d3e19a0e 100644 --- a/tests/baselines/reference/assignmentCompatability26.js +++ b/tests/baselines/reference/assignmentCompatability26.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability27.js b/tests/baselines/reference/assignmentCompatability27.js index be5b06dab7c..5460ed7f6c5 100644 --- a/tests/baselines/reference/assignmentCompatability27.js +++ b/tests/baselines/reference/assignmentCompatability27.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability28.js b/tests/baselines/reference/assignmentCompatability28.js index eef6f0a5ef0..6358375ed3a 100644 --- a/tests/baselines/reference/assignmentCompatability28.js +++ b/tests/baselines/reference/assignmentCompatability28.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability29.js b/tests/baselines/reference/assignmentCompatability29.js index c3410a943ca..251a580015d 100644 --- a/tests/baselines/reference/assignmentCompatability29.js +++ b/tests/baselines/reference/assignmentCompatability29.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability3.js b/tests/baselines/reference/assignmentCompatability3.js index 7120e6ce3e2..e32ae5da7ba 100644 --- a/tests/baselines/reference/assignmentCompatability3.js +++ b/tests/baselines/reference/assignmentCompatability3.js @@ -13,13 +13,17 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { - __test2__.obj = { one: 1 }; + __test2__.obj = { + one: 1 + }; __test2__.__val__obj = __test2__.obj; })(__test2__ || (__test2__ = {})); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability30.js b/tests/baselines/reference/assignmentCompatability30.js index 261c86ad584..3d519971fa8 100644 --- a/tests/baselines/reference/assignmentCompatability30.js +++ b/tests/baselines/reference/assignmentCompatability30.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability31.js b/tests/baselines/reference/assignmentCompatability31.js index 152b588b72c..ad0954e2dc8 100644 --- a/tests/baselines/reference/assignmentCompatability31.js +++ b/tests/baselines/reference/assignmentCompatability31.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability32.js b/tests/baselines/reference/assignmentCompatability32.js index b9ddacff90c..e321f02c649 100644 --- a/tests/baselines/reference/assignmentCompatability32.js +++ b/tests/baselines/reference/assignmentCompatability32.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js index 80dfcfc4f7a..44d42b4bd49 100644 --- a/tests/baselines/reference/assignmentCompatability33.js +++ b/tests/baselines/reference/assignmentCompatability33.js @@ -13,7 +13,9 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js index ab324a10396..67167192653 100644 --- a/tests/baselines/reference/assignmentCompatability34.js +++ b/tests/baselines/reference/assignmentCompatability34.js @@ -13,7 +13,9 @@ __test2__.__val__obj = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability35.js b/tests/baselines/reference/assignmentCompatability35.js index 1b79a83146b..f01c63390ed 100644 --- a/tests/baselines/reference/assignmentCompatability35.js +++ b/tests/baselines/reference/assignmentCompatability35.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability36.js b/tests/baselines/reference/assignmentCompatability36.js index 62332f741d4..7c939ceb282 100644 --- a/tests/baselines/reference/assignmentCompatability36.js +++ b/tests/baselines/reference/assignmentCompatability36.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js index 8625cae42e5..5741b181151 100644 --- a/tests/baselines/reference/assignmentCompatability37.js +++ b/tests/baselines/reference/assignmentCompatability37.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js index 22096b68f25..81a7692f62f 100644 --- a/tests/baselines/reference/assignmentCompatability38.js +++ b/tests/baselines/reference/assignmentCompatability38.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability39.js b/tests/baselines/reference/assignmentCompatability39.js index 70e8a692290..fe2f499270a 100644 --- a/tests/baselines/reference/assignmentCompatability39.js +++ b/tests/baselines/reference/assignmentCompatability39.js @@ -13,7 +13,9 @@ __test2__.__val__x2 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability4.js b/tests/baselines/reference/assignmentCompatability4.js index 2f7d33b8d55..853164790ce 100644 --- a/tests/baselines/reference/assignmentCompatability4.js +++ b/tests/baselines/reference/assignmentCompatability4.js @@ -13,7 +13,9 @@ __test2__.__val__aa = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability40.js b/tests/baselines/reference/assignmentCompatability40.js index 801ddfe7596..26923029392 100644 --- a/tests/baselines/reference/assignmentCompatability40.js +++ b/tests/baselines/reference/assignmentCompatability40.js @@ -13,7 +13,9 @@ __test2__.__val__x5 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability41.js b/tests/baselines/reference/assignmentCompatability41.js index 2ebd35a6caa..101eee5ae3c 100644 --- a/tests/baselines/reference/assignmentCompatability41.js +++ b/tests/baselines/reference/assignmentCompatability41.js @@ -13,7 +13,9 @@ __test2__.__val__x6 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability42.js b/tests/baselines/reference/assignmentCompatability42.js index 39dab170d35..d819f748af4 100644 --- a/tests/baselines/reference/assignmentCompatability42.js +++ b/tests/baselines/reference/assignmentCompatability42.js @@ -13,7 +13,9 @@ __test2__.__val__x7 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability43.js b/tests/baselines/reference/assignmentCompatability43.js index 0ff9bdb4819..5c13de6fa53 100644 --- a/tests/baselines/reference/assignmentCompatability43.js +++ b/tests/baselines/reference/assignmentCompatability43.js @@ -13,14 +13,19 @@ __test2__.__val__obj2 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { ; - var obj2 = { one: 1, two: "a" }; + var obj2 = { + one: 1, + two: "a" + }; ; __test2__.__val__obj2 = obj2; })(__test2__ || (__test2__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability5.js b/tests/baselines/reference/assignmentCompatability5.js index ef38b738ad3..b94a00de732 100644 --- a/tests/baselines/reference/assignmentCompatability5.js +++ b/tests/baselines/reference/assignmentCompatability5.js @@ -13,14 +13,18 @@ __test2__.__val__obj1 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { ; - var obj1 = { one: 1 }; + var obj1 = { + one: 1 + }; ; __test2__.__val__obj1 = obj1; })(__test2__ || (__test2__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability6.js b/tests/baselines/reference/assignmentCompatability6.js index 7b1e2bb65d6..cd87bd10641 100644 --- a/tests/baselines/reference/assignmentCompatability6.js +++ b/tests/baselines/reference/assignmentCompatability6.js @@ -13,7 +13,9 @@ __test2__.__val__obj3 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability7.js b/tests/baselines/reference/assignmentCompatability7.js index c6bf8e53bc1..a668bc34906 100644 --- a/tests/baselines/reference/assignmentCompatability7.js +++ b/tests/baselines/reference/assignmentCompatability7.js @@ -13,14 +13,18 @@ __test2__.__val__obj4 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); var __test2__; (function (__test2__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test2__.__val__obj4 = obj4; })(__test2__ || (__test2__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability8.js b/tests/baselines/reference/assignmentCompatability8.js index 65e4240aac5..e022ddf7bdd 100644 --- a/tests/baselines/reference/assignmentCompatability8.js +++ b/tests/baselines/reference/assignmentCompatability8.js @@ -13,7 +13,9 @@ __test2__.__val__x1 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability9.js b/tests/baselines/reference/assignmentCompatability9.js index 98932380b3e..cbc34de158b 100644 --- a/tests/baselines/reference/assignmentCompatability9.js +++ b/tests/baselines/reference/assignmentCompatability9.js @@ -13,7 +13,9 @@ __test2__.__val__x3 = __test1__.__val__obj4 var __test1__; (function (__test1__) { ; - var obj4 = { one: 1 }; + var obj4 = { + one: 1 + }; ; __test1__.__val__obj4 = obj4; })(__test1__ || (__test1__ = {})); diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.js b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.js index 760631ffbb5..7346f601dac 100644 --- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.js +++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.js @@ -35,18 +35,25 @@ fn(a => { }); var x; // Should fail x = ''; -x = ['']; +x = [ + '' +]; x = 4; x = {}; // Should work -function f() { } +function f() { +} ; x = f; -function fn(c) { } +function fn(c) { +} // Should Fail fn(''); -fn(['']); +fn([ + '' +]); fn(4); fn({}); // Should work -fn(function (a) { }); +fn(function (a) { +}); diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.js b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.js index 2e61521eefb..4e5ed88699c 100644 --- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.js +++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.js @@ -35,18 +35,25 @@ fn(a => { }); var x; // Should fail x = ''; -x = ['']; +x = [ + '' +]; x = 4; x = {}; // Should work -function f() { } +function f() { +} ; x = f; -function fn(c) { } +function fn(c) { +} // Should Fail fn(''); -fn(['']); +fn([ + '' +]); fn(4); fn({}); // Should work -fn(function (a) { }); +fn(function (a) { +}); diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js index 4b17f855171..e6975e70146 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.js +++ b/tests/baselines/reference/assignmentLHSIsValue.js @@ -84,11 +84,17 @@ var C = (function () { function C() { this = value; } - C.prototype.foo = function () { this = value; }; - C.sfoo = function () { this = value; }; + C.prototype.foo = function () { + this = value; + }; + C.sfoo = function () { + this = value; + }; return C; })(); -function foo() { this = value; } +function foo() { + this = value; +} this = value; // identifiers: module, class, enum, function var M; @@ -123,14 +129,20 @@ var Derived = (function (_super) { _super.call(this); _super.prototype. = value; } - Derived.prototype.foo = function () { _super.prototype. = value; }; - Derived.sfoo = function () { _super. = value; }; + Derived.prototype.foo = function () { + _super.prototype. = value; + }; + Derived.sfoo = function () { + _super. = value; + }; return Derived; })(C); // function expression -function bar() { } +function bar() { +} value; -(function () { }); +(function () { +}); value; // function calls foo() = value; @@ -147,5 +159,6 @@ foo() = value; (/d+/) = value; ({}) = value; ([]) = value; -(function baz() { }) = value; +(function baz() { +}) = value; (foo()) = value; diff --git a/tests/baselines/reference/assignmentStricterConstraints.js b/tests/baselines/reference/assignmentStricterConstraints.js index a7f554ade7d..f8f4ce6d1b6 100644 --- a/tests/baselines/reference/assignmentStricterConstraints.js +++ b/tests/baselines/reference/assignmentStricterConstraints.js @@ -13,6 +13,7 @@ g(1, "") var f = function (x, y) { x = y; }; -var g = function (x, y) { }; +var g = function (x, y) { +}; g = f; g(1, ""); diff --git a/tests/baselines/reference/assignmentToFunction.js b/tests/baselines/reference/assignmentToFunction.js index 7462fdfcf3f..275107e05b0 100644 --- a/tests/baselines/reference/assignmentToFunction.js +++ b/tests/baselines/reference/assignmentToFunction.js @@ -11,8 +11,11 @@ module foo { } //// [assignmentToFunction.js] -function fn() { } -fn = function () { return 3; }; +function fn() { +} +fn = function () { + return 3; +}; var foo; (function (foo) { function xyz() { diff --git a/tests/baselines/reference/assignmentToObject.js b/tests/baselines/reference/assignmentToObject.js index d8134080c6a..666350b50ee 100644 --- a/tests/baselines/reference/assignmentToObject.js +++ b/tests/baselines/reference/assignmentToObject.js @@ -5,6 +5,8 @@ var c: Object = a; // should be error //// [assignmentToObject.js] -var a = { toString: 5 }; +var a = { + toString: 5 +}; var b = a; // ok var c = a; // should be error diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.js b/tests/baselines/reference/assignmentToObjectAndFunction.js index a3c4785b18b..bd09a7a8e16 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.js +++ b/tests/baselines/reference/assignmentToObjectAndFunction.js @@ -30,27 +30,33 @@ module bad { var badFundule: Function = bad; // error //// [assignmentToObjectAndFunction.js] -var errObj = { toString: 0 }; // Error, incompatible toString +var errObj = { + toString: 0 +}; // Error, incompatible toString var goodObj = { toString: function (x) { return ""; } }; // Ok, because toString is a subtype of Object's toString var errFun = {}; // Error for no call signature -function foo() { } +function foo() { +} var foo; (function (foo) { foo.boom = 0; })(foo || (foo = {})); var goodFundule = foo; // ok -function bar() { } +function bar() { +} var bar; (function (bar) { - function apply(thisArg, argArray) { } + function apply(thisArg, argArray) { + } bar.apply = apply; })(bar || (bar = {})); var goodFundule2 = bar; // ok -function bad() { } +function bad() { +} var bad; (function (bad) { bad.apply = 0; diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js index 9526cb08bef..584934ea774 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js @@ -87,25 +87,48 @@ M.y = 3; // OK M.y = ''; // Error (M).y = ''; // Error (M.y) = ''; // Error -M = { y: 3 }; // Error -(M) = { y: 3 }; // Error +M = { + y: 3 +}; // Error +(M) = { + y: 3 +}; // Error var M2; (function (M2) { var M3; (function (M3) { M3.x; })(M3 = M2.M3 || (M2.M3 = {})); - M3 = { x: 3 }; // Error + M3 = { + x: 3 + }; // Error })(M2 || (M2 = {})); -M2.M3 = { x: 3 }; // OK -(M2).M3 = { x: 3 }; // OK -(M2.M3) = { x: 3 }; // OK -M2.M3 = { x: '' }; // Error -(M2).M3 = { x: '' }; // Error -(M2.M3) = { x: '' }; // Error -function fn() { } -fn = function () { return 3; }; // Bug 823548: Should be error (fn is not a reference) -(fn) = function () { return 3; }; // Should be error +M2.M3 = { + x: 3 +}; // OK +(M2).M3 = { + x: 3 +}; // OK +(M2.M3) = { + x: 3 +}; // OK +M2.M3 = { + x: '' +}; // Error +(M2).M3 = { + x: '' +}; // Error +(M2.M3) = { + x: '' +}; // Error +function fn() { +} +fn = function () { + return 3; +}; // Bug 823548: Should be error (fn is not a reference) +(fn) = function () { + return 3; +}; // Should be error function fn2(x, y) { x = 3; (x) = 3; // OK diff --git a/tests/baselines/reference/assignmentToReferenceTypes.js b/tests/baselines/reference/assignmentToReferenceTypes.js index 1aec3c2051d..214e10b9c6c 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.js +++ b/tests/baselines/reference/assignmentToReferenceTypes.js @@ -36,7 +36,8 @@ var E; (function (E) { })(E || (E = {})); E = null; -function f() { } +function f() { +} f = null; var x = 1; x = null; diff --git a/tests/baselines/reference/assignments.js b/tests/baselines/reference/assignments.js index 363d2f2a017..f9bb008ccac 100644 --- a/tests/baselines/reference/assignments.js +++ b/tests/baselines/reference/assignments.js @@ -53,7 +53,8 @@ var E; })(E || (E = {})); E = null; // Error 0 /* A */ = null; // OK per spec, Error per implementation (509581) -function fn() { } +function fn() { +} fn = null; // Should be error var v; v = null; // OK diff --git a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js index 32fed237a2e..88996de1553 100644 --- a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js +++ b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js @@ -23,6 +23,7 @@ var v2: { //// [augmentedTypeAssignmentCompatIndexSignature.js] var o = {}; -var f = function () { }; +var f = function () { +}; var v1 = o; // Should be allowed var v2 = f; // Should be allowed diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js index 8d2c94899dc..a1b6bf6805c 100644 --- a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js +++ b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js @@ -15,4 +15,5 @@ var b = (() => { })[0]; // Should be Bar //// [augmentedTypeBracketAccessIndexSignature.js] var a = {}[0]; // Should be Foo -var b = (function () { })[0]; // Should be Bar +var b = (function () { +})[0]; // Should be Bar diff --git a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js index 6ec653c69b5..5bc184df667 100644 --- a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js +++ b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js @@ -15,7 +15,8 @@ var r4 = f['data']; // Should be number //// [augmentedTypeBracketNamedPropertyAccess.js] var o = {}; -var f = function () { }; +var f = function () { +}; var r1 = o['data']; // Should be number var r2 = o['functionData']; // Should be any (no property found) var r3 = f['functionData']; // Should be string diff --git a/tests/baselines/reference/augmentedTypesClass.js b/tests/baselines/reference/augmentedTypesClass.js index 30b75483d80..5d0d8ab75d6 100644 --- a/tests/baselines/reference/augmentedTypesClass.js +++ b/tests/baselines/reference/augmentedTypesClass.js @@ -12,7 +12,8 @@ enum c4 { One } // error var c1 = (function () { function c1() { } - c1.prototype.foo = function () { }; + c1.prototype.foo = function () { + }; return c1; })(); var c1 = 1; // error @@ -20,7 +21,8 @@ var c1 = 1; // error var c4 = (function () { function c4() { } - c4.prototype.foo = function () { }; + c4.prototype.foo = function () { + }; return c4; })(); var c4; diff --git a/tests/baselines/reference/augmentedTypesClass2a.js b/tests/baselines/reference/augmentedTypesClass2a.js index b2c6fa1e373..fe31f0964c2 100644 --- a/tests/baselines/reference/augmentedTypesClass2a.js +++ b/tests/baselines/reference/augmentedTypesClass2a.js @@ -9,8 +9,11 @@ var c2 = () => { } var c2 = (function () { function c2() { } - c2.prototype.foo = function () { }; + c2.prototype.foo = function () { + }; return c2; })(); // error -function c2() { } // error -var c2 = function () { }; +function c2() { +} // error +var c2 = function () { +}; diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js index 11d3f0a0d9f..b42d9dda356 100644 --- a/tests/baselines/reference/augmentedTypesClass3.js +++ b/tests/baselines/reference/augmentedTypesClass3.js @@ -18,13 +18,15 @@ class c5c { public foo() { } } var c5 = (function () { function c5() { } - c5.prototype.foo = function () { }; + c5.prototype.foo = function () { + }; return c5; })(); var c5a = (function () { function c5a() { } - c5a.prototype.foo = function () { }; + c5a.prototype.foo = function () { + }; return c5a; })(); var c5a; @@ -34,7 +36,8 @@ var c5a; var c5b = (function () { function c5b() { } - c5b.prototype.foo = function () { }; + c5b.prototype.foo = function () { + }; return c5b; })(); var c5b; @@ -45,7 +48,8 @@ var c5b; var c5c = (function () { function c5c() { } - c5c.prototype.foo = 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..71fc61d6659 100644 --- a/tests/baselines/reference/augmentedTypesClass4.js +++ b/tests/baselines/reference/augmentedTypesClass4.js @@ -9,12 +9,14 @@ class c3 { public bar() { } } // error var c3 = (function () { function c3() { } - c3.prototype.foo = function () { }; + c3.prototype.foo = function () { + }; return c3; })(); // error var c3 = (function () { function c3() { } - c3.prototype.bar = function () { }; + c3.prototype.bar = function () { + }; return c3; })(); // error diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js index cb1ec3e844f..484b0addd58 100644 --- a/tests/baselines/reference/augmentedTypesEnum.js +++ b/tests/baselines/reference/augmentedTypesEnum.js @@ -47,12 +47,14 @@ var e2; (function (e2) { e2[e2["One"] = 0] = "One"; })(e2 || (e2 = {})); // error -function e2() { } // error +function e2() { +} // error var e3; (function (e3) { e3[e3["One"] = 0] = "One"; })(e3 || (e3 = {})); // error -var e3 = function () { }; // error +var e3 = function () { +}; // error // enum then class var e4; (function (e4) { @@ -61,7 +63,8 @@ var e4; var e4 = (function () { function e4() { } - e4.prototype.foo = function () { }; + e4.prototype.foo = function () { + }; return e4; })(); // error // enum then enum diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 104559396cc..69cc810668c 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -9,7 +9,8 @@ define(["require", "exports"], function (require, exports) { var c5 = (function () { function c5() { } - c5.prototype.foo = function () { }; + c5.prototype.foo = function () { + }; return c5; })(); }); diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js index 1cd1423b7c4..34567c77e8c 100644 --- a/tests/baselines/reference/augmentedTypesFunction.js +++ b/tests/baselines/reference/augmentedTypesFunction.js @@ -40,46 +40,59 @@ module y5c { export interface I { foo(): void } } // should be an error //// [augmentedTypesFunction.js] // function then var -function y1() { } // error +function y1() { +} // error var y1 = 1; // error // function then function -function y2() { } // error -function y2() { } // error -function y2a() { } // error -var y2a = function () { }; // error +function y2() { +} // error +function y2() { +} // error +function y2a() { +} // error +var y2a = function () { +}; // error // function then class -function y3() { } // error +function y3() { +} // error var y3 = (function () { function y3() { } return y3; })(); // error -function y3a() { } // error +function y3a() { +} // error var y3a = (function () { function y3a() { } - y3a.prototype.foo = function () { }; + y3a.prototype.foo = function () { + }; return y3a; })(); // error // function then enum -function y4() { } // error +function y4() { +} // error var y4; (function (y4) { y4[y4["One"] = 0] = "One"; })(y4 || (y4 = {})); // error // function then internal module -function y5() { } -function y5a() { } +function y5() { +} +function y5a() { +} var y5a; (function (y5a) { var y = 2; })(y5a || (y5a = {})); // should be an error -function y5b() { } +function y5b() { +} var y5b; (function (y5b) { y5b.y = 3; })(y5b || (y5b = {})); // should be an error -function y5c() { } +function y5c() { +} // function then import, messes with other errors //function y6() { } //import y6 = require(''); diff --git a/tests/baselines/reference/augmentedTypesModules.js b/tests/baselines/reference/augmentedTypesModules.js index 558ea6609f5..3b7544996a1 100644 --- a/tests/baselines/reference/augmentedTypesModules.js +++ b/tests/baselines/reference/augmentedTypesModules.js @@ -115,43 +115,51 @@ var m1d; var I = (function () { function I() { } - I.prototype.foo = function () { }; + I.prototype.foo = function () { + }; return I; })(); m1d.I = I; })(m1d || (m1d = {})); var m1d = 1; // error -function m2() { } +function m2() { +} ; // ok since the module is not instantiated var m2a; (function (m2a) { var y = 2; })(m2a || (m2a = {})); -function m2a() { } +function m2a() { +} ; // error since the module is instantiated var m2b; (function (m2b) { m2b.y = 2; })(m2b || (m2b = {})); -function m2b() { } +function m2b() { +} ; // error since the module is instantiated // should be errors to have function first -function m2c() { } +function m2c() { +} ; var m2c; (function (m2c) { m2c.y = 2; })(m2c || (m2c = {})); -function m2f() { } +function m2f() { +} ; -function m2g() { } +function m2g() { +} ; var m2g; (function (m2g) { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); m2g.C = C; @@ -168,13 +176,15 @@ var m3a; var m3a = (function () { function m3a() { } - m3a.prototype.foo = function () { }; + m3a.prototype.foo = function () { + }; return m3a; })(); // error, class isn't ambient or declared before the module var m3b = (function () { function m3b() { } - m3b.prototype.foo = function () { }; + m3b.prototype.foo = function () { + }; return m3b; })(); var m3b; @@ -184,7 +194,8 @@ var m3b; var m3c = (function () { function m3c() { } - m3c.prototype.foo = function () { }; + m3c.prototype.foo = function () { + }; return m3c; })(); var m3c; @@ -204,7 +215,8 @@ var m3g; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); m3g.C = C; @@ -237,7 +249,8 @@ var m4d; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); })(m4d || (m4d = {})); diff --git a/tests/baselines/reference/augmentedTypesModules2.js b/tests/baselines/reference/augmentedTypesModules2.js index 5cc805a848f..70fd31f03e0 100644 --- a/tests/baselines/reference/augmentedTypesModules2.js +++ b/tests/baselines/reference/augmentedTypesModules2.js @@ -29,21 +29,25 @@ module m2g { export class C { foo() { } } } //// [augmentedTypesModules2.js] -function m2() { } +function m2() { +} ; // ok since the module is not instantiated var m2a; (function (m2a) { var y = 2; })(m2a || (m2a = {})); -function m2a() { } +function m2a() { +} ; // error since the module is instantiated var m2b; (function (m2b) { m2b.y = 2; })(m2b || (m2b = {})); -function m2b() { } +function m2b() { +} ; // error since the module is instantiated -function m2c() { } +function m2c() { +} ; var m2c; (function (m2c) { @@ -53,18 +57,22 @@ var m2cc; (function (m2cc) { m2cc.y = 2; })(m2cc || (m2cc = {})); -function m2cc() { } +function m2cc() { +} ; // error to have module first -function m2f() { } +function m2f() { +} ; -function m2g() { } +function m2g() { +} ; var m2g; (function (m2g) { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); m2g.C = C; diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js index fb1c7ef6e70..7f5c390ea3a 100644 --- a/tests/baselines/reference/augmentedTypesModules3.js +++ b/tests/baselines/reference/augmentedTypesModules3.js @@ -19,6 +19,7 @@ var m3a; var m3a = (function () { function m3a() { } - m3a.prototype.foo = function () { }; + m3a.prototype.foo = function () { + }; return m3a; })(); // 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..2d250ab2822 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.js +++ b/tests/baselines/reference/augmentedTypesModules3b.js @@ -22,7 +22,8 @@ module m3g { export class C { foo() { } } } var m3b = (function () { function m3b() { } - m3b.prototype.foo = function () { }; + m3b.prototype.foo = function () { + }; return m3b; })(); var m3b; @@ -32,7 +33,8 @@ var m3b; var m3c = (function () { function m3c() { } - m3c.prototype.foo = function () { }; + m3c.prototype.foo = function () { + }; return m3c; })(); var m3c; @@ -52,7 +54,8 @@ var m3g; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); m3g.C = C; diff --git a/tests/baselines/reference/augmentedTypesModules4.js b/tests/baselines/reference/augmentedTypesModules4.js index 82f08851efd..f8407e2e36f 100644 --- a/tests/baselines/reference/augmentedTypesModules4.js +++ b/tests/baselines/reference/augmentedTypesModules4.js @@ -51,7 +51,8 @@ var m4d; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); })(m4d || (m4d = {})); diff --git a/tests/baselines/reference/augmentedTypesVar.js b/tests/baselines/reference/augmentedTypesVar.js index b4e412acc05..f4404cecb3d 100644 --- a/tests/baselines/reference/augmentedTypesVar.js +++ b/tests/baselines/reference/augmentedTypesVar.js @@ -42,9 +42,11 @@ var x1 = 1; var x1 = 2; // var then function var x2 = 1; // error -function x2() { } // error +function x2() { +} // error var x3 = 1; -var x3 = function () { }; // error +var x3 = function () { +}; // error // var then class var x4 = 1; // error var x4 = (function () { @@ -56,7 +58,8 @@ var x4a = 1; // error var x4a = (function () { function x4a() { } - x4a.prototype.foo = function () { }; + x4a.prototype.foo = function () { + }; return x4a; })(); // error // var then enum diff --git a/tests/baselines/reference/autoLift2.js b/tests/baselines/reference/autoLift2.js index cf840277d70..45790dc2f6e 100644 --- a/tests/baselines/reference/autoLift2.js +++ b/tests/baselines/reference/autoLift2.js @@ -43,8 +43,18 @@ var A = (function () { var _this = this; this.foo = "foo"; this.bar = "bar"; - [1, 2].forEach(function (p) { return _this.foo; }); - [1, 2].forEach(function (p) { return _this.bar; }); + [ + 1, + 2 + ].forEach(function (p) { + return _this.foo; + }); + [ + 1, + 2 + ].forEach(function (p) { + return _this.bar; + }); }; return A; })(); diff --git a/tests/baselines/reference/autolift3.js b/tests/baselines/reference/autolift3.js index e04501daf46..cc3bcaaae97 100644 --- a/tests/baselines/reference/autolift3.js +++ b/tests/baselines/reference/autolift3.js @@ -33,7 +33,8 @@ b.foo(); //// [autolift3.js] var B = (function () { function B() { - function foo() { } + function foo() { + } foo(); var a = 0; var inner = (function () { diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js index 49bc535dbfe..69fe778c047 100644 --- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js @@ -63,9 +63,15 @@ var r = true ? 1 : 2; var r3 = true ? 1 : {}; var r4 = true ? a : b; // typeof a var r5 = true ? b : a; // typeof b -var r6 = true ? function (x) { } : function (x) { }; // returns number => void -var r7 = true ? function (x) { } : function (x) { }; -var r8 = true ? function (x) { } : function (x) { }; // returns Object => void +var r6 = true ? function (x) { +} : function (x) { +}; // returns number => void +var r7 = true ? function (x) { +} : function (x) { +}; +var r8 = true ? function (x) { +} : function (x) { +}; // returns Object => void var r10 = true ? derived : derived2; // no error since we use the contextual type in BCT var r11 = true ? base : derived2; function foo5(t, u) { diff --git a/tests/baselines/reference/bestCommonTypeOfTuple.js b/tests/baselines/reference/bestCommonTypeOfTuple.js index f78f8990db0..704cae200a4 100644 --- a/tests/baselines/reference/bestCommonTypeOfTuple.js +++ b/tests/baselines/reference/bestCommonTypeOfTuple.js @@ -26,9 +26,15 @@ var e3 = t3[2]; // any var e4 = t4[3]; // number //// [bestCommonTypeOfTuple.js] -function f1(x) { return "foo"; } -function f2(x) { return 10; } -function f3(x) { return true; } +function f1(x) { + return "foo"; +} +function f2(x) { + return 10; +} +function f3(x) { + return true; +} var E1; (function (E1) { E1[E1["one"] = 0] = "one"; @@ -42,10 +48,23 @@ var t2; var t3; var t4; // no error -t1 = [f1, f2]; -t2 = [0 /* one */, 0 /* two */]; -t3 = [5, undefined]; -t4 = [0 /* one */, 0 /* two */, 20]; +t1 = [ + f1, + f2 +]; +t2 = [ + 0 /* one */, + 0 /* two */ +]; +t3 = [ + 5, + undefined +]; +t4 = [ + 0 /* one */, + 0 /* two */, + 20 +]; var e1 = t1[2]; // {} var e2 = t2[2]; // {} var e3 = t3[2]; // any diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.js b/tests/baselines/reference/bestCommonTypeReturnStatement.js index f4ab98ed1c6..232ffc07c54 100644 --- a/tests/baselines/reference/bestCommonTypeReturnStatement.js +++ b/tests/baselines/reference/bestCommonTypeReturnStatement.js @@ -18,5 +18,9 @@ function f() { return b(); return d(); } -function b() { return null; } -function d() { return null; } +function b() { + return null; +} +function d() { + return null; +} diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js index c45ae88458f..afe18e3f282 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js @@ -25,7 +25,11 @@ var e; // All of these should pass. Neither type is a supertype of the other, but the RHS should // always use Ellement in these examples (not Contextual). Because Ellement is assignable // to Contextual, no errors. -var arr = [e]; // Ellement[] -var obj = { s: e }; // { s: Ellement; [s: string]: Ellement } +var arr = [ + e +]; // Ellement[] +var obj = { + s: e +}; // { s: Ellement; [s: string]: Ellement } var conditional = null ? e : e; // Ellement var contextualOr = e || e; // Ellement diff --git a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.js b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.js index 25622c3d4f3..6a8741097aa 100644 --- a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.js +++ b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.js @@ -20,9 +20,33 @@ var x; var y; var z; // All these arrays should be X[] -var b1 = [x, y, z]; -var b2 = [x, z, y]; -var b3 = [y, x, z]; -var b4 = [y, z, x]; -var b5 = [z, x, y]; -var b6 = [z, y, x]; +var b1 = [ + x, + y, + z +]; +var b2 = [ + x, + z, + y +]; +var b3 = [ + y, + x, + z +]; +var b4 = [ + y, + z, + x +]; +var b5 = [ + z, + x, + y +]; +var b6 = [ + z, + y, + x +]; diff --git a/tests/baselines/reference/bitwiseNotOperatorInvalidOperations.js b/tests/baselines/reference/bitwiseNotOperatorInvalidOperations.js index 1b64091c048..b730569bd6a 100644 --- a/tests/baselines/reference/bitwiseNotOperatorInvalidOperations.js +++ b/tests/baselines/reference/bitwiseNotOperatorInvalidOperations.js @@ -18,7 +18,11 @@ var q; var a = q; ~; //expect error // multiple operands after ~ -var mul = ~[1, 2, "abc"]; +var mul = ~[ + 1, + 2, + "abc" +]; ""; //expect error // miss an operand var b = ~; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js index 3ee3f28ad9e..a73d851668e 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js @@ -66,9 +66,16 @@ var ResultIsNumber20 = ~~~(ANY + ANY1); // ~ operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js index fb573a7523f..1b2c93307d8 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js @@ -41,11 +41,15 @@ var ResultIsNumber8 = ~~BOOLEAN; //// [bitwiseNotOperatorWithBooleanType.js] // ~ operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -57,7 +61,10 @@ var objA = new A(); var ResultIsNumber1 = ~BOOLEAN; // boolean type literal var ResultIsNumber2 = ~true; -var ResultIsNumber3 = ~{ x: true, y: false }; +var ResultIsNumber3 = ~{ + x: true, + y: false +}; // boolean type expressions var ResultIsNumber4 = ~objA.a; var ResultIsNumber5 = ~M.n; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js index ac439f02903..ac274bf8c18 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js @@ -47,12 +47,19 @@ var ResultIsNumber13 = ~~~(NUMBER + NUMBER); //// [bitwiseNotOperatorWithNumberType.js] // ~ operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -65,8 +72,16 @@ var ResultIsNumber1 = ~NUMBER; var ResultIsNumber2 = ~NUMBER1; // number type literal var ResultIsNumber3 = ~1; -var ResultIsNumber4 = ~{ x: 1, y: 2 }; -var ResultIsNumber5 = ~{ x: 1, y: function (n) { return n; } }; +var ResultIsNumber4 = ~{ + x: 1, + y: 2 +}; +var ResultIsNumber5 = ~{ + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsNumber6 = ~objA.a; var ResultIsNumber7 = ~M.n; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js index a553712e16b..f13cf39bd6f 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js @@ -46,12 +46,19 @@ var ResultIsNumber14 = ~~~(STRING + STRING); //// [bitwiseNotOperatorWithStringType.js] // ~ operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -64,8 +71,16 @@ var ResultIsNumber1 = ~STRING; var ResultIsNumber2 = ~STRING1; // string type literal var ResultIsNumber3 = ~""; -var ResultIsNumber4 = ~{ x: "", y: "" }; -var ResultIsNumber5 = ~{ x: "", y: function (s) { return s; } }; +var ResultIsNumber4 = ~{ + x: "", + y: "" +}; +var ResultIsNumber5 = ~{ + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsNumber6 = ~objA.a; var ResultIsNumber7 = ~M.n; diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js index f1028956e16..59bfabd21d6 100644 --- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js +++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js @@ -47,10 +47,14 @@ var r7b = i2.f(1, ''); //// [callGenericFunctionWithIncorrectNumberOfTypeArguments.js] // type parameter lists must exactly match type argument lists // all of these invocations are errors -function f(x, y) { return null; } +function f(x, y) { + return null; +} var r1 = f(1, ''); var r1b = f(1, ''); -var f2 = function (x, y) { return null; }; +var f2 = function (x, y) { + return null; +}; var r2 = f2(1, ''); var r2b = f2(1, ''); var f3; diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js index 26b9d33a55d..04edc93f5d9 100644 --- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js +++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js @@ -38,9 +38,13 @@ var r7 = i2.f(1); //// [callGenericFunctionWithZeroTypeArguments.js] // valid invocations of generic functions with no explicit type arguments provided -function f(x) { return null; } +function f(x) { + return null; +} var r = f(1); -var f2 = function (x) { return null; }; +var f2 = function (x) { + return null; +}; var r2 = f2(1); var f3; var r3 = f3(1); diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js index 7b0355533e3..306b4c70362 100644 --- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js +++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js @@ -46,9 +46,13 @@ var r8 = a2(); //// [callNonGenericFunctionWithTypeArguments.js] // it is always illegal to provide type arguments to a non-generic function // all invocations here are illegal -function f(x) { return null; } +function f(x) { + return null; +} var r = f(1); -var f2 = function (x) { return null; }; +var f2 = function (x) { + return null; +}; var r2 = f2(1); var f3; var r3 = f3(1); diff --git a/tests/baselines/reference/callOverloads1.js b/tests/baselines/reference/callOverloads1.js index b1148c12420..86cb951f853 100644 --- a/tests/baselines/reference/callOverloads1.js +++ b/tests/baselines/reference/callOverloads1.js @@ -22,10 +22,13 @@ var Foo = (function () { function Foo(x) { // WScript.Echo("Constructor function has executed"); } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(); -function F1(a) { return a; } +function F1(a) { + return a; +} var f1 = new Foo("hey"); f1.bar1(); Foo(); diff --git a/tests/baselines/reference/callOverloads2.js b/tests/baselines/reference/callOverloads2.js index b336911eeb0..e3cbceb177a 100644 --- a/tests/baselines/reference/callOverloads2.js +++ b/tests/baselines/reference/callOverloads2.js @@ -30,11 +30,16 @@ var Foo = (function () { function Foo(x) { // WScript.Echo("Constructor function has executed"); } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(); -function F1(s) { return s; } // error -function F1(a) { return a; } // error +function F1(s) { + return s; +} // error +function F1(a) { + return a; +} // error var f1 = new Foo("hey"); f1.bar1(); Foo(); diff --git a/tests/baselines/reference/callOverloads3.js b/tests/baselines/reference/callOverloads3.js index 3b615438ccd..85c16fe85a6 100644 --- a/tests/baselines/reference/callOverloads3.js +++ b/tests/baselines/reference/callOverloads3.js @@ -23,7 +23,8 @@ var Foo = (function () { function Foo(x) { // WScript.Echo("Constructor function has executed"); } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(); //class Foo(s: String); diff --git a/tests/baselines/reference/callOverloads4.js b/tests/baselines/reference/callOverloads4.js index 529b63ad3b8..6aab555b721 100644 --- a/tests/baselines/reference/callOverloads4.js +++ b/tests/baselines/reference/callOverloads4.js @@ -23,7 +23,8 @@ var Foo = (function () { function Foo(x) { // WScript.Echo("Constructor function has executed"); } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(); var f1 = new Foo("hey"); diff --git a/tests/baselines/reference/callOverloads5.js b/tests/baselines/reference/callOverloads5.js index dc508b3b8ed..2220568e4c2 100644 --- a/tests/baselines/reference/callOverloads5.js +++ b/tests/baselines/reference/callOverloads5.js @@ -24,7 +24,8 @@ var Foo = (function () { function Foo(x) { // WScript.Echo("Constructor function has executed"); } - Foo.prototype.bar1 = function (a) { }; + Foo.prototype.bar1 = function (a) { + }; return Foo; })(); //class Foo(s: String); diff --git a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.js b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.js index 24c71c98505..6daa62f83a8 100644 --- a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.js +++ b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.js @@ -21,7 +21,8 @@ var r5 = a.f(); //// [callSignatureWithoutAnnotationsOrBody.js] // Call signatures without a return type annotation and function body return 'any' -function foo(x) { } +function foo(x) { +} var r = foo(1); // void since there's a body var i; var r2 = i(); diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js index 0e78aac2b1b..f37d4c06861 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js @@ -165,7 +165,9 @@ function foo7(x) { var r7 = foo7(1); // object types function foo8(x) { - return { x: x }; + return { + x: x + }; } var r8 = foo8(1); function foo9(x) { @@ -202,7 +204,9 @@ function foo12() { return i2; } var r12 = foo12(); -function m1() { return 1; } +function m1() { + return 1; +} var m1; (function (m1) { m1.y = 2; diff --git a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js index 5584dd7b216..22b312e2570 100644 --- a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js +++ b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js @@ -40,27 +40,43 @@ var b = { //// [callSignaturesWithAccessibilityModifiersOnParameters.js] // Call signature parameters do not allow accessibility modifiers -function foo(x, y) { } -var f = function foo(x, y) { }; -var f2 = function (x, y) { }; -var f3 = function (x, y) { }; -var f4 = function (x, y) { }; -function foo2(x, y) { } -var f5 = function foo(x, y) { }; -var f6 = function (x, y) { }; -var f7 = function (x, y) { }; -var f8 = function (x, y) { }; +function foo(x, y) { +} +var f = function foo(x, y) { +}; +var f2 = function (x, y) { +}; +var f3 = function (x, y) { +}; +var f4 = function (x, y) { +}; +function foo2(x, y) { +} +var f5 = function foo(x, y) { +}; +var f6 = function (x, y) { +}; +var f7 = function (x, y) { +}; +var f8 = function (x, y) { +}; var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; - C.prototype.foo2 = function (x, y) { }; - C.prototype.foo3 = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; + C.prototype.foo2 = function (x, y) { + }; + C.prototype.foo3 = function (x, y) { + }; return C; })(); var a; var b = { - foo: function (x, y) { }, - a: function foo(x, y) { }, - b: function (x, y) { } + foo: function (x, y) { + }, + a: function foo(x, y) { + }, + b: function (x, y) { + } }; diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js index 6ed7f6f7fe5..49e20266dad 100644 --- a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js +++ b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js @@ -40,27 +40,43 @@ var b = { //// [callSignaturesWithDuplicateParameters.js] // Duplicate parameter names are always an error -function foo(x, x) { } -var f = function foo(x, x) { }; -var f2 = function (x, x) { }; -var f3 = function (x, x) { }; -var f4 = function (x, x) { }; -function foo2(x, x) { } -var f5 = function foo(x, x) { }; -var f6 = function (x, x) { }; -var f7 = function (x, x) { }; -var f8 = function (x, y) { }; +function foo(x, x) { +} +var f = function foo(x, x) { +}; +var f2 = function (x, x) { +}; +var f3 = function (x, x) { +}; +var f4 = function (x, x) { +}; +function foo2(x, x) { +} +var f5 = function foo(x, x) { +}; +var f6 = function (x, x) { +}; +var f7 = function (x, x) { +}; +var f8 = function (x, y) { +}; var C = (function () { function C() { } - C.prototype.foo = function (x, x) { }; - C.prototype.foo2 = function (x, x) { }; - C.prototype.foo3 = function (x, x) { }; + C.prototype.foo = function (x, x) { + }; + C.prototype.foo2 = function (x, x) { + }; + C.prototype.foo3 = function (x, x) { + }; return C; })(); var a; var b = { - foo: function (x, x) { }, - a: function foo(x, x) { }, - b: function (x, x) { } + foo: function (x, x) { + }, + a: function foo(x, x) { + }, + b: function (x, x) { + } }; diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.js b/tests/baselines/reference/callSignaturesWithOptionalParameters.js index 2f4876fb2de..fa2126fb6c5 100644 --- a/tests/baselines/reference/callSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.js @@ -57,9 +57,12 @@ b.b(1); //// [callSignaturesWithOptionalParameters.js] // Optional parameters should be valid in all the below casts -function foo(x) { } -var f = function foo(x) { }; -var f2 = function (x, y) { }; +function foo(x) { +} +var f = function foo(x) { +}; +var f2 = function (x, y) { +}; foo(1); foo(); f(1); @@ -69,7 +72,8 @@ f2(1, 2); var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var c; @@ -86,9 +90,12 @@ a(1); a.foo(); a.foo(1); var b = { - foo: function (x) { }, - a: function foo(x, y) { }, - b: function (x) { } + foo: function (x) { + }, + a: function foo(x, y) { + }, + b: function (x) { + } }; b.foo(); b.foo(1); diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js index a3fb2fe7a85..95ecb3a0e9c 100644 --- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js +++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js @@ -61,17 +61,21 @@ a.foo(1, 2, 3); //// [callSignaturesWithOptionalParameters2.js] // Optional parameters should be valid in all the below casts -function foo(x) { } +function foo(x) { +} foo(1); foo(); -function foo2(x, y) { } +function foo2(x, y) { +} foo2(1); foo2(1, 2); var C = (function () { function C() { } - C.prototype.foo = function (x) { }; - C.prototype.foo2 = function (x, y) { }; + C.prototype.foo = function (x) { + }; + C.prototype.foo2 = function (x, y) { + }; return C; })(); var c; diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js index d676c0f2a33..4cb52f41d3c 100644 --- a/tests/baselines/reference/callWithSpread.js +++ b/tests/baselines/reference/callWithSpread.js @@ -82,7 +82,11 @@ obj.foo.apply(obj, [1, 2].concat(a, ["abc"])); xa[1].foo(1, 2, "abc"); (_a = xa[1]).foo.apply(_a, [1, 2].concat(a)); (_b = xa[1]).foo.apply(_b, [1, 2].concat(a, ["abc"])); -(_c = xa[1]).foo.apply(_c, [1, 2, "abc"]); +(_c = xa[1]).foo.apply(_c, [ + 1, + 2, + "abc" +]); var C = (function () { function C(x, y) { var z = []; diff --git a/tests/baselines/reference/callWithSpreadES6.js b/tests/baselines/reference/callWithSpreadES6.js index bdb5aab33ec..0becb4c6e3e 100644 --- a/tests/baselines/reference/callWithSpreadES6.js +++ b/tests/baselines/reference/callWithSpreadES6.js @@ -79,7 +79,11 @@ obj.foo(1, 2, ...a, "abc"); xa[1].foo(1, 2, "abc"); xa[1].foo(1, 2, ...a); xa[1].foo(1, 2, ...a, "abc"); -xa[1].foo(...[1, 2, "abc"]); +xa[1].foo(...[ + 1, + 2, + "abc" +]); var C = (function () { function C(x, y, ...z) { this.foo(x, y); diff --git a/tests/baselines/reference/callWithWrongNumberOfTypeArguments.js b/tests/baselines/reference/callWithWrongNumberOfTypeArguments.js index 74ea401ae3b..f7bc46a7724 100644 --- a/tests/baselines/reference/callWithWrongNumberOfTypeArguments.js +++ b/tests/baselines/reference/callWithWrongNumberOfTypeArguments.js @@ -6,7 +6,8 @@ f(); f(); //// [callWithWrongNumberOfTypeArguments.js] -function f() { } +function f() { +} f(); f(); f(); diff --git a/tests/baselines/reference/callbacksDontShareTypes.js b/tests/baselines/reference/callbacksDontShareTypes.js index e6483638058..649ed1cb6ca 100644 --- a/tests/baselines/reference/callbacksDontShareTypes.js +++ b/tests/baselines/reference/callbacksDontShareTypes.js @@ -21,8 +21,14 @@ var r5b = _.map(c2, rf1); //// [callbacksDontShareTypes.js] var _; var c2; -var rf1 = function (x) { return x.toFixed(); }; -var r1a = _.map(c2, function (x) { return x.toFixed(); }); +var rf1 = function (x) { + return x.toFixed(); +}; +var r1a = _.map(c2, function (x) { + return x.toFixed(); +}); var r1b = _.map(c2, rf1); // this line should not cause the following 2 to have errors -var r5a = _.map(c2, function (x) { return x.toFixed(); }); +var r5a = _.map(c2, function (x) { + return x.toFixed(); +}); var r5b = _.map(c2, rf1); diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js index 7200fabd8c4..cbb41afea3b 100644 --- a/tests/baselines/reference/captureThisInSuperCall.js +++ b/tests/baselines/reference/captureThisInSuperCall.js @@ -24,8 +24,13 @@ var B = (function (_super) { __extends(B, _super); function B() { var _this = this; - _super.call(this, { test: function () { return _this.someMethod(); } }); + _super.call(this, { + test: function () { + return _this.someMethod(); + } + }); } - B.prototype.someMethod = function () { }; + B.prototype.someMethod = function () { + }; return B; })(A); diff --git a/tests/baselines/reference/castExpressionParentheses.js b/tests/baselines/reference/castExpressionParentheses.js index ec18d6e373e..c217b5e7b2f 100644 --- a/tests/baselines/reference/castExpressionParentheses.js +++ b/tests/baselines/reference/castExpressionParentheses.js @@ -42,8 +42,13 @@ new (A()); //// [castExpressionParentheses.js] // parentheses should be omitted // literals -{ a: 0 }; -[1, 3,]; +{ + a: 0 +}; +[ + 1, + 3, +]; "string"; 23.0; /regexp/g; @@ -63,8 +68,10 @@ a().x; (typeof A).x; (-A).x; new (A()); -(function () { })(); -(function foo() { })(); +(function () { +})(); +(function foo() { +})(); (-A).x; // nested cast, should keep one pair of parenthese (-A).x; diff --git a/tests/baselines/reference/castTest.js b/tests/baselines/reference/castTest.js index ef9ef084d98..5afa67026b9 100644 --- a/tests/baselines/reference/castTest.js +++ b/tests/baselines/reference/castTest.js @@ -47,5 +47,7 @@ var p_cast = ({ add: function (dx, dy) { return new Point(this.x + dx, this.y + dy); }, - mult: function (p) { return p; } + mult: function (p) { + return p; + } }); diff --git a/tests/baselines/reference/castingTuple.js b/tests/baselines/reference/castingTuple.js index fffadcbc070..bea141968a6 100644 --- a/tests/baselines/reference/castingTuple.js +++ b/tests/baselines/reference/castingTuple.js @@ -82,20 +82,39 @@ var E2; E2[E2["one"] = 0] = "one"; })(E2 || (E2 = {})); // no error -var numStrTuple = [5, "foo"]; +var numStrTuple = [ + 5, + "foo" +]; var emptyObjTuple = numStrTuple; var numStrBoolTuple = numStrTuple; -var classCDTuple = [new C(), new D()]; +var classCDTuple = [ + new C(), + new D() +]; var interfaceIITuple = classCDTuple; var classCDATuple = classCDTuple; var eleFromCDA1 = classCDATuple[2]; // A var eleFromCDA2 = classCDATuple[5]; // C | D | A -var t10 = [0 /* one */, 0 /* one */]; +var t10 = [ + 0 /* one */, + 0 /* one */ +]; var t11 = t10; var array1 = emptyObjTuple; -var unionTuple = [new C(), "foo"]; -var unionTuple2 = [new C(), "foo", new D()]; -var unionTuple3 = [10, "foo"]; +var unionTuple = [ + new C(), + "foo" +]; +var unionTuple2 = [ + new C(), + "foo", + new D() +]; +var unionTuple3 = [ + 10, + "foo" +]; var unionTuple4 = unionTuple3; // error var t3 = numStrTuple; diff --git a/tests/baselines/reference/catch.js b/tests/baselines/reference/catch.js index d3babf1f31d..c6b13cf4d68 100644 --- a/tests/baselines/reference/catch.js +++ b/tests/baselines/reference/catch.js @@ -7,8 +7,12 @@ function f() { //// [catch.js] function f() { - try { } - catch (e) { } - try { } - catch (e) { } + try { + } + catch (e) { + } + try { + } + catch (e) { + } } diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js index 70456b9e9d1..3795994c64c 100644 --- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js +++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js @@ -55,4 +55,12 @@ var C = (function (_super) { return C; })(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; }); +(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..dbf55d4ec30 100644 --- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js +++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js @@ -50,12 +50,30 @@ var Chain = (function () { var t; var s; // Ok to go down the chain, but error to climb up the chain - (new Chain(t)).then(function (tt) { return s; }).then(function (ss) { return t; }); + (new Chain(t)).then(function (tt) { + return s; + }).then(function (ss) { + return t; + }); // But error to try to climb up the chain - (new Chain(s)).then(function (ss) { return t; }); + (new Chain(s)).then(function (ss) { + return t; + }); // Staying at T or S should be fine - (new Chain(t)).then(function (tt) { return t; }).then(function (tt) { return t; }).then(function (tt) { return t; }); - (new Chain(s)).then(function (ss) { return s; }).then(function (ss) { return s; }).then(function (ss) { return s; }); + (new Chain(t)).then(function (tt) { + return t; + }).then(function (tt) { + return t; + }).then(function (tt) { + return t; + }); + (new Chain(s)).then(function (ss) { + return s; + }).then(function (ss) { + return s; + }).then(function (ss) { + return s; + }); return null; }; return Chain; @@ -70,11 +88,31 @@ var Chain2 = (function () { var s; // Ok to go down the chain, check the constraint at the end. // Should get an error that we are assigning a string to a number - (new Chain2(i)).then(function (ii) { return t; }).then(function (tt) { return s; }).value.x = ""; + (new Chain2(i)).then(function (ii) { + return t; + }).then(function (tt) { + return s; + }).value.x = ""; // Staying at T or S should keep the constraint. // Get an error when we assign a string to a number in both cases - (new Chain2(i)).then(function (ii) { return t; }).then(function (tt) { return t; }).then(function (tt) { return t; }).then(function (tt) { return t; }).value.x = ""; - (new Chain2(i)).then(function (ii) { return s; }).then(function (ss) { return s; }).then(function (ss) { return s; }).then(function (ss) { return s; }).value.x = ""; + (new Chain2(i)).then(function (ii) { + return t; + }).then(function (tt) { + return t; + }).then(function (tt) { + return t; + }).then(function (tt) { + return t; + }).value.x = ""; + (new Chain2(i)).then(function (ii) { + return s; + }).then(function (ss) { + return s; + }).then(function (ss) { + return s; + }).then(function (ss) { + return s; + }).value.x = ""; return null; }; return Chain2; diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index 077a92d7450..f2b3c6c6cff 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -14,7 +14,8 @@ y.m.foo(); //// [chainedImportAlias_file0.js] var m; (function (m) { - function foo() { } + function foo() { + } m.foo = foo; })(m = exports.m || (exports.m = {})); //// [chainedImportAlias_file1.js] diff --git a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.js b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.js index 1884967aa9e..e10a41d9fbf 100644 --- a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.js +++ b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.js @@ -13,5 +13,9 @@ var s3 = s2.each(x => { x.key /* Type is K, should be number */ }); //// [chainedSpecializationToObjectTypeLiteral.js] var s; -var s2 = s.groupBy(function (s) { return s.length; }); -var s3 = s2.each(function (x) { x.key; /* Type is K, should be number */ }); +var s2 = s.groupBy(function (s) { + return s.length; +}); +var s3 = s2.each(function (x) { + x.key; /* Type is K, should be number */ +}); diff --git a/tests/baselines/reference/classBodyWithStatements.js b/tests/baselines/reference/classBodyWithStatements.js index 2324fe0d791..bae4860f722 100644 --- a/tests/baselines/reference/classBodyWithStatements.js +++ b/tests/baselines/reference/classBodyWithStatements.js @@ -25,7 +25,8 @@ var C2 = (function () { } return C2; })(); -function foo() { } +function foo() { +} var x = 1; var y = 2; var C3 = (function () { diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js index 6bcf0f46f74..9d902abbf52 100644 --- a/tests/baselines/reference/classExpression.js +++ b/tests/baselines/reference/classExpression.js @@ -20,7 +20,9 @@ var C = (function () { return C; })(); var y = { - foo: , class: C2 }, _a = void 0; + foo: , + class: C2 +}, _a = void 0; var M; (function (M) { var z = ; diff --git a/tests/baselines/reference/classExtendingClass.js b/tests/baselines/reference/classExtendingClass.js index 130bf5818ee..6c7d9fe679b 100644 --- a/tests/baselines/reference/classExtendingClass.js +++ b/tests/baselines/reference/classExtendingClass.js @@ -41,8 +41,10 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.thing = function () { }; - C.other = function () { }; + C.prototype.thing = function () { + }; + C.other = function () { + }; return C; })(); var D = (function (_super) { @@ -60,8 +62,10 @@ var r4 = D.other(); var C2 = (function () { function C2() { } - C2.prototype.thing = function (x) { }; - C2.other = function (x) { }; + C2.prototype.thing = function (x) { + }; + C2.other = function (x) { + }; return C2; })(); var D2 = (function (_super) { diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js index 81301818918..b69bc3403f4 100644 --- a/tests/baselines/reference/classExtendingPrimitive.js +++ b/tests/baselines/reference/classExtendingPrimitive.js @@ -69,7 +69,8 @@ var C5a = (function () { return C5a; })(); null; -{ } +{ +} var C6 = (function (_super) { __extends(C6, _super); function C6() { diff --git a/tests/baselines/reference/classExtendingPrimitive2.js b/tests/baselines/reference/classExtendingPrimitive2.js index 06b481dbbf4..9a507934455 100644 --- a/tests/baselines/reference/classExtendingPrimitive2.js +++ b/tests/baselines/reference/classExtendingPrimitive2.js @@ -18,4 +18,5 @@ var C5a = (function () { return C5a; })(); null; -{ } +{ +} diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js index 2ae7ea71cea..2adb974bb28 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.js +++ b/tests/baselines/reference/classExtendsEveryObjectType.js @@ -35,7 +35,8 @@ var C2 = (function () { } return C2; })(); -{ } // error +{ +} // error var x; var C3 = (function (_super) { __extends(C3, _super); @@ -55,7 +56,8 @@ var C4 = (function (_super) { } return C4; })(M); // error -function foo() { } +function foo() { +} var C5 = (function (_super) { __extends(C5, _super); function C5() { @@ -69,4 +71,5 @@ var C6 = (function () { return C6; })(); []; -{ } // error +{ +} // error diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.js b/tests/baselines/reference/classExtendsEveryObjectType2.js index 7be13137766..f2bcb02fee4 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType2.js +++ b/tests/baselines/reference/classExtendsEveryObjectType2.js @@ -9,11 +9,13 @@ var C2 = (function () { } return C2; })(); -{ } // error +{ +} // error var C6 = (function () { function C6() { } return C6; })(); []; -{ } // error +{ +} // error diff --git a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js index 907b6bd6fd2..ed6e3138b07 100644 --- a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js +++ b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js @@ -19,14 +19,20 @@ var C = (function () { function C() { this.x = 1; } - C.prototype.foo = function (x) { return x; }; + C.prototype.foo = function (x) { + return x; + }; return C; })(); var D2 = (function () { function D2() { this.x = 3; } - D2.prototype.foo = function (x) { return x; }; - D2.prototype.other = function (x) { return x; }; + D2.prototype.foo = function (x) { + return x; + }; + D2.prototype.other = function (x) { + return x; + }; return D2; })(); diff --git a/tests/baselines/reference/classExtendsValidConstructorFunction.js b/tests/baselines/reference/classExtendsValidConstructorFunction.js index c2f0f17e534..a0876e8f709 100644 --- a/tests/baselines/reference/classExtendsValidConstructorFunction.js +++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js @@ -12,7 +12,8 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -function foo() { } +function foo() { +} var x = new foo(); // can be used as a constructor function var C = (function (_super) { __extends(C, _super); diff --git a/tests/baselines/reference/classImplementsClass2.js b/tests/baselines/reference/classImplementsClass2.js index bc4f6b6748c..98554944bc9 100644 --- a/tests/baselines/reference/classImplementsClass2.js +++ b/tests/baselines/reference/classImplementsClass2.js @@ -23,7 +23,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C = (function () { diff --git a/tests/baselines/reference/classImplementsClass3.js b/tests/baselines/reference/classImplementsClass3.js index 450263d00c9..9dbfc4388e9 100644 --- a/tests/baselines/reference/classImplementsClass3.js +++ b/tests/baselines/reference/classImplementsClass3.js @@ -24,7 +24,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C = (function () { diff --git a/tests/baselines/reference/classImplementsClass4.js b/tests/baselines/reference/classImplementsClass4.js index ac5c899bbbf..0e08e508fb5 100644 --- a/tests/baselines/reference/classImplementsClass4.js +++ b/tests/baselines/reference/classImplementsClass4.js @@ -27,7 +27,9 @@ var A = (function () { function A() { this.x = 1; } - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C = (function () { diff --git a/tests/baselines/reference/classImplementsClass5.js b/tests/baselines/reference/classImplementsClass5.js index a0971904cc3..46e826683e7 100644 --- a/tests/baselines/reference/classImplementsClass5.js +++ b/tests/baselines/reference/classImplementsClass5.js @@ -28,7 +28,9 @@ var A = (function () { function A() { this.x = 1; } - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C = (function () { diff --git a/tests/baselines/reference/classImplementsClass6.js b/tests/baselines/reference/classImplementsClass6.js index 931218e2bea..386cd6685ae 100644 --- a/tests/baselines/reference/classImplementsClass6.js +++ b/tests/baselines/reference/classImplementsClass6.js @@ -34,7 +34,9 @@ var A = (function () { A.bar = function () { return ""; }; - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C = (function () { diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js index a2af2083a2a..c76a026b58a 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.js +++ b/tests/baselines/reference/classImplementsImportedInterface.js @@ -18,7 +18,8 @@ var M2; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/classMethodWithKeywordName1.js b/tests/baselines/reference/classMethodWithKeywordName1.js index ba5bb72632a..9b6b7595f04 100644 --- a/tests/baselines/reference/classMethodWithKeywordName1.js +++ b/tests/baselines/reference/classMethodWithKeywordName1.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.try = function () { }; + C.try = function () { + }; return C; })(); diff --git a/tests/baselines/reference/classOrder2.js b/tests/baselines/reference/classOrder2.js index 4bc1c3f790c..179be456028 100644 --- a/tests/baselines/reference/classOrder2.js +++ b/tests/baselines/reference/classOrder2.js @@ -31,13 +31,16 @@ var A = (function (_super) { function A() { _super.apply(this, arguments); } - A.prototype.foo = function () { this.bar(); }; + A.prototype.foo = function () { + this.bar(); + }; return A; })(B); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); var a = new A(); diff --git a/tests/baselines/reference/classOverloadForFunction.js b/tests/baselines/reference/classOverloadForFunction.js index 40f076b0f2c..47c787986da 100644 --- a/tests/baselines/reference/classOverloadForFunction.js +++ b/tests/baselines/reference/classOverloadForFunction.js @@ -10,4 +10,5 @@ var foo = (function () { return foo; })(); ; -function foo() { } +function foo() { +} diff --git a/tests/baselines/reference/classPropertyAsPrivate.js b/tests/baselines/reference/classPropertyAsPrivate.js index 51d08b48ec5..8b59dcde771 100644 --- a/tests/baselines/reference/classPropertyAsPrivate.js +++ b/tests/baselines/reference/classPropertyAsPrivate.js @@ -28,19 +28,27 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "y", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; Object.defineProperty(C, "b", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var c; diff --git a/tests/baselines/reference/classPropertyAsProtected.js b/tests/baselines/reference/classPropertyAsProtected.js index 1cd74089816..ddb193f072a 100644 --- a/tests/baselines/reference/classPropertyAsProtected.js +++ b/tests/baselines/reference/classPropertyAsProtected.js @@ -28,19 +28,27 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "y", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; Object.defineProperty(C, "b", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var c; diff --git a/tests/baselines/reference/classPropertyIsPublicByDefault.js b/tests/baselines/reference/classPropertyIsPublicByDefault.js index a0b61a08922..db1eca56c11 100644 --- a/tests/baselines/reference/classPropertyIsPublicByDefault.js +++ b/tests/baselines/reference/classPropertyIsPublicByDefault.js @@ -27,19 +27,27 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "y", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; Object.defineProperty(C, "b", { - get: function () { return null; }, - set: function (x) { }, + get: function () { + return null; + }, + set: function (x) { + }, enumerable: true, configurable: true }); - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var c; diff --git a/tests/baselines/reference/classSideInheritance1.js b/tests/baselines/reference/classSideInheritance1.js index 74df624a78c..38b84b77bd3 100644 --- a/tests/baselines/reference/classSideInheritance1.js +++ b/tests/baselines/reference/classSideInheritance1.js @@ -28,7 +28,9 @@ var A = (function () { A.bar = function () { return ""; }; - A.prototype.foo = function () { return 1; }; + A.prototype.foo = function () { + return 1; + }; return A; })(); var C2 = (function (_super) { diff --git a/tests/baselines/reference/classWithEmptyBody.js b/tests/baselines/reference/classWithEmptyBody.js index 16c50ccec77..df9bc857106 100644 --- a/tests/baselines/reference/classWithEmptyBody.js +++ b/tests/baselines/reference/classWithEmptyBody.js @@ -29,8 +29,11 @@ var C = (function () { var c; var o = c; c = 1; -c = { foo: '' }; -c = function () { }; +c = { + foo: '' +}; +c = function () { +}; var D = (function () { function D() { return 1; @@ -40,5 +43,8 @@ var D = (function () { var d; var o = d; d = 1; -d = { foo: '' }; -d = function () { }; +d = { + foo: '' +}; +d = function () { +}; diff --git a/tests/baselines/reference/classWithMultipleBaseClasses.js b/tests/baselines/reference/classWithMultipleBaseClasses.js index 0e101d61dc9..c6900f526cb 100644 --- a/tests/baselines/reference/classWithMultipleBaseClasses.js +++ b/tests/baselines/reference/classWithMultipleBaseClasses.js @@ -28,19 +28,23 @@ interface I extends A, B { var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); var D = (function () { function D() { } - D.prototype.baz = function () { }; - D.prototype.bat = function () { }; + D.prototype.baz = function () { + }; + D.prototype.bat = function () { + }; return D; })(); diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js index 1c07449c994..acb802d0f97 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js @@ -30,10 +30,15 @@ i = c; var C = (function () { function C() { } - C.prototype.y = function (a) { return null; }; + C.prototype.y = function (a) { + return null; + }; Object.defineProperty(C.prototype, "z", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js index 78e5cb05861..1048c2e5124 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js @@ -32,10 +32,15 @@ i = c; var C = (function () { function C() { } - C.prototype.y = function (a) { return null; }; + C.prototype.y = function (a) { + return null; + }; Object.defineProperty(C.prototype, "z", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/classWithOptionalParameter.js b/tests/baselines/reference/classWithOptionalParameter.js index 2f11f15febe..082e624916a 100644 --- a/tests/baselines/reference/classWithOptionalParameter.js +++ b/tests/baselines/reference/classWithOptionalParameter.js @@ -16,12 +16,14 @@ class C2 { var C = (function () { function C() { } - C.prototype.f = function () { }; + C.prototype.f = function () { + }; return C; })(); var C2 = (function () { function C2() { } - C2.prototype.f = function (x) { }; + C2.prototype.f = function (x) { + }; return C2; })(); diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js index 4ac6548483e..f8cb9bf4c5b 100644 --- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js +++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js @@ -9,6 +9,7 @@ class C { var C = (function () { function C() { } - C.prototype.bar = function (x) { }; + C.prototype.bar = function (x) { + }; return C; })(); diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js index fd28ae3d9eb..5caba8f3fd5 100644 --- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js +++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js @@ -9,6 +9,7 @@ class C { var C = (function () { function C() { } - C.prototype.bar = function (x) { }; + C.prototype.bar = function (x) { + }; return C; })(); diff --git a/tests/baselines/reference/classWithPrivateProperty.js b/tests/baselines/reference/classWithPrivateProperty.js index 0529fd8d694..47ff7c91421 100644 --- a/tests/baselines/reference/classWithPrivateProperty.js +++ b/tests/baselines/reference/classWithPrivateProperty.js @@ -28,11 +28,19 @@ var C = (function () { function C() { this.a = ''; this.b = ''; - this.d = function () { return ''; }; + this.d = function () { + return ''; + }; } - C.prototype.c = function () { return ''; }; - C.f = function () { return ''; }; - C.g = function () { return ''; }; + C.prototype.c = function () { + return ''; + }; + C.f = function () { + return ''; + }; + C.g = function () { + return ''; + }; return C; })(); var c = new C(); diff --git a/tests/baselines/reference/classWithProtectedProperty.js b/tests/baselines/reference/classWithProtectedProperty.js index 4de87229ad0..c8b15c1396c 100644 --- a/tests/baselines/reference/classWithProtectedProperty.js +++ b/tests/baselines/reference/classWithProtectedProperty.js @@ -39,11 +39,19 @@ var C = (function () { function C() { this.a = ''; this.b = ''; - this.d = function () { return ''; }; + this.d = function () { + return ''; + }; } - C.prototype.c = function () { return ''; }; - C.f = function () { return ''; }; - C.g = function () { return ''; }; + C.prototype.c = function () { + return ''; + }; + C.f = function () { + return ''; + }; + C.g = function () { + return ''; + }; return C; })(); var D = (function (_super) { diff --git a/tests/baselines/reference/classWithPublicProperty.js b/tests/baselines/reference/classWithPublicProperty.js index cc1b0aad64f..88dc9d8de10 100644 --- a/tests/baselines/reference/classWithPublicProperty.js +++ b/tests/baselines/reference/classWithPublicProperty.js @@ -26,11 +26,19 @@ var C = (function () { function C() { this.a = ''; this.b = ''; - this.d = function () { return ''; }; + this.d = function () { + return ''; + }; } - C.prototype.c = function () { return ''; }; - C.f = function () { return ''; }; - C.g = function () { return ''; }; + C.prototype.c = function () { + return ''; + }; + C.f = function () { + return ''; + }; + C.g = function () { + return ''; + }; return C; })(); // all of these are valid diff --git a/tests/baselines/reference/classWithStaticMembers.js b/tests/baselines/reference/classWithStaticMembers.js index 36b8bd0af64..2cded4b1f2e 100644 --- a/tests/baselines/reference/classWithStaticMembers.js +++ b/tests/baselines/reference/classWithStaticMembers.js @@ -31,10 +31,15 @@ var C = (function () { this.a = a; this.b = b; } - C.fn = function () { return this; }; + C.fn = function () { + return this; + }; Object.defineProperty(C, "x", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index e9253b61cac..1f588b785e9 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -103,7 +103,8 @@ var __extends = this.__extends || function (d, b) { var a = (function () { function a(ns) { } - a.prototype.pgF = function () { }; + a.prototype.pgF = function () { + }; Object.defineProperty(a.prototype, "d", { get: function () { return 30; @@ -115,7 +116,10 @@ var a = (function () { }); Object.defineProperty(a, "p2", { get: function () { - return { x: 30, y: 40 }; + return { + x: 30, + y: 40 + }; }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js index c877de38a00..9772af20434 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js @@ -21,8 +21,10 @@ var A; var B = (function () { function B() { } - B.prototype.foo = function () { }; - B.bar = function () { }; + B.prototype.foo = function () { + }; + B.bar = function () { + }; return B; })(); A.B = B; diff --git a/tests/baselines/reference/cloduleTest1.js b/tests/baselines/reference/cloduleTest1.js index 9e7edc77c71..f79f1e5c46f 100644 --- a/tests/baselines/reference/cloduleTest1.js +++ b/tests/baselines/reference/cloduleTest1.js @@ -14,7 +14,8 @@ //// [cloduleTest1.js] var $; (function ($) { - function ajax(options) { } + function ajax(options) { + } $.ajax = ajax; })($ || ($ = {})); var it = $('.foo').addClass('bar'); diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.js b/tests/baselines/reference/cloduleWithDuplicateMember1.js index e3cb8f83fed..ed4d69545fc 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.js @@ -20,7 +20,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "x", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); @@ -31,7 +33,8 @@ var C = (function () { enumerable: true, configurable: true }); - C.foo = function () { }; + C.foo = function () { + }; return C; })(); var C; @@ -40,8 +43,10 @@ var C; })(C || (C = {})); var C; (function (C) { - function foo() { } + function foo() { + } C.foo = foo; - function x() { } + function x() { + } C.x = x; })(C || (C = {})); diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.js b/tests/baselines/reference/cloduleWithDuplicateMember2.js index c16c6c9af8a..461930c02ae 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.js @@ -16,12 +16,14 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "x", { - set: function (y) { }, + set: function (y) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, "y", { - set: function (z) { }, + set: function (z) { + }, enumerable: true, configurable: true }); @@ -33,6 +35,7 @@ var C; })(C || (C = {})); var C; (function (C) { - function x() { } + function x() { + } C.x = x; })(C || (C = {})); diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js index b4b31e59d3e..f249a7d5589 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.js +++ b/tests/baselines/reference/clodulesDerivedClasses.js @@ -38,7 +38,9 @@ var Shape; (function (Shape) { var Utils; (function (Utils) { - function convert() { return null; } + function convert() { + return null; + } Utils.convert = convert; })(Utils = Shape.Utils || (Shape.Utils = {})); })(Shape || (Shape = {})); diff --git a/tests/baselines/reference/collisionSuperAndParameter.js b/tests/baselines/reference/collisionSuperAndParameter.js index be9e0ce3f68..f7198dfbf04 100644 --- a/tests/baselines/reference/collisionSuperAndParameter.js +++ b/tests/baselines/reference/collisionSuperAndParameter.js @@ -75,13 +75,17 @@ var Foo = (function () { Foo.prototype.a = function () { var _this = this; var lamda = function (_super) { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Foo.prototype.b = function (_super) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Object.defineProperty(Foo.prototype, "c", { @@ -104,13 +108,17 @@ var Foo2 = (function (_super) { Foo2.prototype.x = function () { var _this = this; var lamda = function (_super) { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Foo2.prototype.y = function (_super) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Object.defineProperty(Foo2.prototype, "z", { @@ -129,7 +137,9 @@ var Foo4 = (function (_super) { Foo4.prototype.y = function (_super) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; return Foo4; diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js index 1f613798642..b1db7f12ea5 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js @@ -11,5 +11,7 @@ var a; (function (a) { a.b = 10; })(a || (a = {})); -var f = function () { return _this; }; +var f = function () { + return _this; +}; var _this = a; // Error diff --git a/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js index b99311b0c3e..7c617b25756 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js @@ -6,5 +6,7 @@ var a = new _this(); // Error //// [collisionThisExpressionAndAmbientClassInGlobal.js] var _this = this; -var f = function () { return _this; }; +var f = function () { + return _this; +}; var a = new _this(); // Error diff --git a/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.js index c6c54869056..8aec5140caf 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAmbientVarInGlobal.js @@ -5,5 +5,7 @@ _this = 10; // Error //// [collisionThisExpressionAndAmbientVarInGlobal.js] var _this = this; -var f = function () { return _this; }; +var f = function () { + return _this; +}; _this = 10; // Error diff --git a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js index ccaa335d80e..c31d03bed9b 100644 --- a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js @@ -10,4 +10,6 @@ var _this = (function () { } return _this; })(); -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js index 4ab929a3877..3de272e51a7 100644 --- a/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js @@ -12,4 +12,6 @@ var _this; _this[_this["_thisVal1"] = 0] = "_thisVal1"; _this[_this["_thisVal2"] = 1] = "_thisVal2"; })(_this || (_this = {})); -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/collisionThisExpressionAndFunctionInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndFunctionInGlobal.js index 3c6232ba0ba..07e2a1358f6 100644 --- a/tests/baselines/reference/collisionThisExpressionAndFunctionInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndFunctionInGlobal.js @@ -9,4 +9,6 @@ var _this = this; function _this() { return 10; } -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js index 53df2984544..0e3384feb29 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js @@ -51,20 +51,24 @@ var class1 = (function () { get: function () { var _this = this; var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; return 10; }, set: function (val) { var _this = this; var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; }, enumerable: true, @@ -80,9 +84,11 @@ var class2 = (function () { var _this = this; var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; return 10; }, @@ -90,9 +96,11 @@ var class2 = (function () { var _this = this; var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; }, enumerable: true, diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js index d0ed79da530..e4c1c7ac9ba 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js @@ -26,10 +26,12 @@ var class1 = (function () { function class1() { var _this = this; var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; } return class1; @@ -39,9 +41,11 @@ var class2 = (function () { var _this = this; var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; } return class2; diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInFunction.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInFunction.js index 879dd83d778..967d01819ec 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInFunction.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInFunction.js @@ -12,5 +12,7 @@ var console; function x() { var _this = this; var _this = 5; - (function (x) { console.log(_this.x); }); + (function (x) { + console.log(_this.x); + }); } diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInLambda.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInLambda.js index e8b7a0db7f3..a799ec36eae 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInLambda.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInLambda.js @@ -12,9 +12,13 @@ alert(x.doStuff(x => alert(x))); //// [collisionThisExpressionAndLocalVarInLambda.js] var _this = this; var x = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; -alert(x.doStuff(function (x) { return alert(x); })); +alert(x.doStuff(function (x) { + return alert(x); +})); diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js index 63b536bd8b6..398ed393794 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js @@ -25,19 +25,23 @@ var a = (function () { a.prototype.method1 = function () { var _this = this; return { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; }; a.prototype.method2 = function () { var _this = this; var _this = 2; return { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; }; return a; diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js index 65d181921d5..f884c93a62e 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js @@ -24,10 +24,12 @@ var class1 = (function () { function class1() { var _this = this; this.prop1 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; } return class1; @@ -36,9 +38,11 @@ var class2 = (function () { function class2() { var _this = this; this.prop1 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; var _this = 2; } diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js index d502fc5c03a..5ac394520e4 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js @@ -40,7 +40,9 @@ var b = (function (_super) { b.prototype.foo = function () { var _this = this; var _this = 10; - var f = function () { return _super.prototype.foo.call(_this); }; + var f = function () { + return _super.prototype.foo.call(_this); + }; }; return b; })(a); diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js index 777f141451b..2bf6987c86f 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js @@ -15,4 +15,6 @@ var _this; return c; })(); })(_this || (_this = {})); -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js index 8b128d92946..12398920f50 100644 --- a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js +++ b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js @@ -22,7 +22,9 @@ var Foo = (function () { function inner() { var _this = this; console.log(_this); // Error as this doesnt not resolve to user defined _this - return function (x) { return _this; }; // New scope. So should inject new _this capture into function inner + return function (x) { + return _this; + }; // New scope. So should inject new _this capture into function inner } }; return Foo; diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.js b/tests/baselines/reference/collisionThisExpressionAndParameter.js index 3a19cf20d5a..95ade61d202 100644 --- a/tests/baselines/reference/collisionThisExpressionAndParameter.js +++ b/tests/baselines/reference/collisionThisExpressionAndParameter.js @@ -101,19 +101,25 @@ var Foo = (function () { var _this = 10; // Local var. No this capture in x(), so no conflict. function inner(_this) { var _this = this; - return function (x) { return _this; }; // New scope. So should inject new _this capture into function inner + return function (x) { + return _this; + }; // New scope. So should inject new _this capture into function inner } }; Foo.prototype.y = function () { var _this = this; var lamda = function (_this) { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Foo.prototype.z = function (_this) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; Foo.prototype.x1 = function () { @@ -135,35 +141,45 @@ var Foo1 = (function () { function Foo1(_this) { var _this = this; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; } return Foo1; })(); function f1(_this) { var _this = this; - (function (x) { console.log(_this.x); }); + (function (x) { + console.log(_this.x); + }); } var Foo3 = (function () { function Foo3(_this) { var _this = this; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; } Foo3.prototype.z = function (_this) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; }; return Foo3; })(); function f3(_this) { var _this = this; - (function (x) { console.log(_this.x); }); + (function (x) { + console.log(_this.x); + }); } diff --git a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js index a77098739ec..75e4a60bfd3 100644 --- a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js +++ b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js @@ -40,7 +40,9 @@ var Foo2 = (function () { function Foo2(_this) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; } return Foo2; @@ -50,7 +52,9 @@ var Foo3 = (function () { var _this = this; this._this = _this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; } return Foo3; @@ -59,7 +63,9 @@ var Foo4 = (function () { function Foo4(_this) { var _this = this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; } return Foo4; @@ -69,7 +75,9 @@ var Foo5 = (function () { var _this = this; this._this = _this; var lambda = function () { - return function (x) { return _this; }; // New scope. So should inject new _this capture + return function (x) { + return _this; + }; // New scope. So should inject new _this capture }; } return Foo5; diff --git a/tests/baselines/reference/collisionThisExpressionAndVarInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndVarInGlobal.js index 7057ad7ac55..77a6a28e283 100644 --- a/tests/baselines/reference/collisionThisExpressionAndVarInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndVarInGlobal.js @@ -5,4 +5,6 @@ var f = () => this; //// [collisionThisExpressionAndVarInGlobal.js] var _this = this; var _this = 1; -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.js b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.js index 522bbbe4e19..903a77c1ac4 100644 --- a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.js +++ b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.js @@ -59,8 +59,14 @@ var resultIsAny5 = (OBJECT, ANY); var x; 1, ANY; ++NUMBER, ANY; -"string", [null, 1]; -"string".charAt(0), [null, 1]; +"string", [ + null, + 1 +]; +"string".charAt(0), [ + null, + 1 +]; true, x("any"); !BOOLEAN, x.doSomeThing(); var resultIsAny6 = (1, ANY); diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.js b/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.js index dfaba1a93ca..6e3df849004 100644 --- a/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.js +++ b/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.js @@ -58,11 +58,27 @@ null, BOOLEAN; ANY = undefined, BOOLEAN; 1, true; ++NUMBER, true; -[1, 2, 3], !BOOLEAN; -OBJECT = [1, 2, 3], BOOLEAN = false; +[ + 1, + 2, + 3 +], !BOOLEAN; +OBJECT = [ + 1, + 2, + 3 +], BOOLEAN = false; var resultIsBoolean6 = (null, BOOLEAN); var resultIsBoolean7 = (ANY = undefined, BOOLEAN); var resultIsBoolean8 = (1, true); var resultIsBoolean9 = (++NUMBER, true); -var resultIsBoolean10 = ([1, 2, 3], !BOOLEAN); -var resultIsBoolean11 = (OBJECT = [1, 2, 3], BOOLEAN = false); +var resultIsBoolean10 = ([ + 1, + 2, + 3 +], !BOOLEAN); +var resultIsBoolean11 = (OBJECT = [ + 1, + 2, + 3 +], BOOLEAN = false); diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js index 90c16543ff2..452d74d7cf6 100644 --- a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js +++ b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js @@ -72,6 +72,9 @@ STRING.toLowerCase(), new CLASS(); var resultIsObject6 = (null, OBJECT); var resultIsObject7 = (ANY = null, OBJECT); var resultIsObject8 = (true, {}); -var resultIsObject9 = (!BOOLEAN, { a: 1, b: "s" }); +var resultIsObject9 = (!BOOLEAN, { + a: 1, + b: "s" +}); var resultIsObject10 = ("string", new Date()); var resultIsObject11 = (STRING.toLowerCase(), new CLASS()); diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.js b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.js index 412e9e83121..163679b3373 100644 --- a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.js +++ b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.js @@ -61,11 +61,17 @@ null, STRING; ANY = new Date(), STRING; true, ""; BOOLEAN == undefined, ""; -["a", "b"], NUMBER.toString(); +[ + "a", + "b" +], NUMBER.toString(); OBJECT = new Object, STRING + "string"; var resultIsString6 = (null, STRING); var resultIsString7 = (ANY = new Date(), STRING); var resultIsString8 = (true, ""); var resultIsString9 = (BOOLEAN == undefined, ""); -var resultIsString10 = (["a", "b"], NUMBER.toString()); +var resultIsString10 = ([ + "a", + "b" +], NUMBER.toString()); var resultIsString11 = (new Object, STRING + "string"); diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.js b/tests/baselines/reference/commentEmitAtEndOfFile1.js index 1be031fa84a..1a1f7cb8900 100644 --- a/tests/baselines/reference/commentEmitAtEndOfFile1.js +++ b/tests/baselines/reference/commentEmitAtEndOfFile1.js @@ -16,6 +16,7 @@ var f = ''; // test #2 var foo; (function (foo) { - function bar() { } + function bar() { + } })(foo || (foo = {})); // test #4 diff --git a/tests/baselines/reference/commentInMethodCall.js b/tests/baselines/reference/commentInMethodCall.js index 4ad2fc552d7..0f304df0b35 100644 --- a/tests/baselines/reference/commentInMethodCall.js +++ b/tests/baselines/reference/commentInMethodCall.js @@ -8,4 +8,5 @@ s.map(// do something //// [commentInMethodCall.js] //commment here var s; -s.map(function () { }); +s.map(function () { +}); diff --git a/tests/baselines/reference/commentOnBlock1.js b/tests/baselines/reference/commentOnBlock1.js index ed5437c1f66..ff557c1fc9b 100644 --- a/tests/baselines/reference/commentOnBlock1.js +++ b/tests/baselines/reference/commentOnBlock1.js @@ -7,5 +7,6 @@ function f() { //// [commentOnBlock1.js] // asdf function f() { - /*asdf*/ { } + /*asdf*/ { + } } diff --git a/tests/baselines/reference/commentOnClassAccessor1.js b/tests/baselines/reference/commentOnClassAccessor1.js index 428e500da55..cdd14a829fc 100644 --- a/tests/baselines/reference/commentOnClassAccessor1.js +++ b/tests/baselines/reference/commentOnClassAccessor1.js @@ -14,7 +14,9 @@ var C = (function () { /** * @type {number} */ - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/commentOnClassAccessor2.js b/tests/baselines/reference/commentOnClassAccessor2.js index 22a6b69f6c3..c85d17e6e19 100644 --- a/tests/baselines/reference/commentOnClassAccessor2.js +++ b/tests/baselines/reference/commentOnClassAccessor2.js @@ -19,11 +19,14 @@ var C = (function () { /** * Getter. */ - get: function () { return 1; }, + get: function () { + return 1; + }, /** * Setter. */ - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/commentsBeforeFunctionExpression1.js b/tests/baselines/reference/commentsBeforeFunctionExpression1.js index 0e23722faf3..bd7a1896a5d 100644 --- a/tests/baselines/reference/commentsBeforeFunctionExpression1.js +++ b/tests/baselines/reference/commentsBeforeFunctionExpression1.js @@ -6,5 +6,7 @@ var v = { //// [commentsBeforeFunctionExpression1.js] var v = { - f: function (a) { return 0; } + f: function (a) { + return 0; + } }; diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js index 0ffb2714108..f5779be524d 100644 --- a/tests/baselines/reference/commentsFunction.js +++ b/tests/baselines/reference/commentsFunction.js @@ -74,8 +74,12 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b) { return b; }; /// lamdaFoo var comment -var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { return a + b; }; -var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { return a * b; }; +var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { + return a + b; +}; +var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { + return a * b; +}; lambdaFoo(10, 20); lambddaNoVarComment(10, 20); function blah(a /* multiline trailing comment @@ -86,9 +90,15 @@ function blah2(a /* single line multiple trailing comments */ /* second */) { function blah3(a // trailing commen single line ) { } -lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment -/*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration) -/*leading comment*/ (function () { return 0; }); //trailing comment +lambdaFoo = function (a, b) { + return a * b; +}; // This is trailing comment +/*leading comment*/ (function () { + return 0; +}); // Needs to be wrapped in parens to be a valid expression (not declaration) +/*leading comment*/ (function () { + return 0; +}); //trailing comment function blah4(/*1*/ a /*2*/, /*3*/ b /*4*/) { } function foo1() { diff --git a/tests/baselines/reference/commentsInterface.js b/tests/baselines/reference/commentsInterface.js index bff79a02aa5..dfffedaea1b 100644 --- a/tests/baselines/reference/commentsInterface.js +++ b/tests/baselines/reference/commentsInterface.js @@ -89,7 +89,9 @@ var i2_i_nc_fnfoo = i2_i.nc_fnfoo; var i2_i_nc_fnfoo_r = i2_i.nc_fnfoo(10); var i3_i; i3_i = { - f: function (/**i3_i a*/ a) { return "Hello" + a; }, + f: function (/**i3_i a*/ a) { + return "Hello" + a; + }, l: this.f, /** own x*/ x: this.f(10), diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.js b/tests/baselines/reference/commentsOnObjectLiteral3.js index 49f2a6ffbf9..5d57b76991e 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral3.js +++ b/tests/baselines/reference/commentsOnObjectLiteral3.js @@ -27,7 +27,8 @@ var v = { func: function () { }, //PropertyName + CallSignature - func1: function () { }, + func1: function () { + }, //getter get a() { return this.prop; diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js index 5ff2a3c1c6a..d76b43fafb6 100644 --- a/tests/baselines/reference/commentsVarDecl.js +++ b/tests/baselines/reference/commentsVarDecl.js @@ -70,7 +70,9 @@ var yy = /// value comment 20; /** comment2 */ -var z = function (x, y) { return x + y; }; +var z = function (x, y) { + return x + y; +}; var z2; var x2 = z2; var n4; diff --git a/tests/baselines/reference/complexClassRelationships.js b/tests/baselines/reference/complexClassRelationships.js index e8dc954e14c..a1e982e4b4d 100644 --- a/tests/baselines/reference/complexClassRelationships.js +++ b/tests/baselines/reference/complexClassRelationships.js @@ -68,7 +68,11 @@ var Derived = (function (_super) { })(Base); var BaseCollection = (function () { function BaseCollection(f) { - (function (item) { return [item.Components]; }); + (function (item) { + return [ + item.Components + ]; + }); } return BaseCollection; })(); @@ -81,7 +85,9 @@ var Thing = (function () { function Thing() { } Object.defineProperty(Thing.prototype, "Components", { - get: function () { return null; }, + get: function () { + return null; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/compositeGenericFunction.js b/tests/baselines/reference/compositeGenericFunction.js index 106c724ea24..0fe2e7d6f41 100644 --- a/tests/baselines/reference/compositeGenericFunction.js +++ b/tests/baselines/reference/compositeGenericFunction.js @@ -7,8 +7,12 @@ var z: number = h(f); var z: number = h(f); //// [compositeGenericFunction.js] -function f(value) { return value; } +function f(value) { + return value; +} ; -function h(func) { return null; } +function h(func) { + return null; +} var z = h(f); var z = h(f); diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js index d85d053f8eb..40c8a3d7ad1 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js @@ -192,8 +192,14 @@ value; } value; // array literals -['', ''] *= value; -['', ''] += value; +[ + '', + '' +] *= value; +[ + '', + '' +] += value; // super var Derived = (function (_super) { __extends(Derived, _super); @@ -213,13 +219,17 @@ var Derived = (function (_super) { return Derived; })(C); // function expression -function bar1() { } +function bar1() { +} value; -function bar2() { } +function bar2() { +} value; -(function () { }); +(function () { +}); value; -(function () { }); +(function () { +}); value; // function calls foo() *= value; @@ -249,7 +259,9 @@ foo() += value; ({}) += value; ([]) *= value; ([]) += value; -(function baz1() { }) *= value; -(function baz2() { }) += value; +(function baz1() { +}) *= value; +(function baz2() { +}) += value; (foo()) *= value; (foo()) += value; diff --git a/tests/baselines/reference/computedPropertyNames10_ES5.js b/tests/baselines/reference/computedPropertyNames10_ES5.js index 302f9355be8..5d8ff398d6c 100644 --- a/tests/baselines/reference/computedPropertyNames10_ES5.js +++ b/tests/baselines/reference/computedPropertyNames10_ES5.js @@ -21,16 +21,27 @@ var s; var n; var a; var v = (_a = {}, - _a[s] = function () { }, - _a[n] = function () { }, - _a[s + s] = function () { }, - _a[s + n] = function () { }, - _a[+s] = function () { }, - _a[""] = function () { }, - _a[0] = function () { }, - _a[a] = function () { }, - _a[true] = function () { }, - _a["hello bye"] = function () { }, - _a["hello " + a + " bye"] = function () { }, + _a[s] = function () { + }, + _a[n] = function () { + }, + _a[s + s] = function () { + }, + _a[s + n] = function () { + }, + _a[+s] = function () { + }, + _a[""] = function () { + }, + _a[0] = function () { + }, + _a[a] = function () { + }, + _a[true] = function () { + }, + _a["hello bye"] = function () { + }, + _a["hello " + a + " bye"] = function () { + }, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNames10_ES6.js b/tests/baselines/reference/computedPropertyNames10_ES6.js index 0a55fabecd8..72613b5c829 100644 --- a/tests/baselines/reference/computedPropertyNames10_ES6.js +++ b/tests/baselines/reference/computedPropertyNames10_ES6.js @@ -21,15 +21,26 @@ var s; var n; var a; var v = { - [s]() { }, - [n]() { }, - [s + s]() { }, - [s + n]() { }, - [+s]() { }, - [""]() { }, - [0]() { }, - [a]() { }, - [true]() { }, - [`hello bye`]() { }, - [`hello ${a} bye`]() { } + [s]() { + }, + [n]() { + }, + [s + s]() { + }, + [s + n]() { + }, + [+s]() { + }, + [""]() { + }, + [0]() { + }, + [a]() { + }, + [true]() { + }, + [`hello bye`]() { + }, + [`hello ${a} bye`]() { + } }; diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.js b/tests/baselines/reference/computedPropertyNames11_ES5.js index 69902003342..2b56eeb29f2 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.js +++ b/tests/baselines/reference/computedPropertyNames11_ES5.js @@ -21,16 +21,77 @@ var s; var n; var a; var v = (_a = {}, - _a[s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a[n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), - _a[s + s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a[s + n] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), - _a[+s] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a[""] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), - _a[0] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a[a] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), - _a[true] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a["hello bye"] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), - _a["hello " + a + " bye"] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), + _a[s] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a[n] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), + _a[s + s] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a[s + n] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), + _a[+s] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a[""] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), + _a[0] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a[a] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), + _a[true] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a["hello bye"] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), + _a["hello " + a + " bye"] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.js b/tests/baselines/reference/computedPropertyNames11_ES6.js index f1a774b88fe..63f786e4634 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES6.js +++ b/tests/baselines/reference/computedPropertyNames11_ES6.js @@ -21,15 +21,32 @@ var s; var n; var a; var v = { - get [s]() { return 0; }, - set [n](v) { }, - get [s + s]() { return 0; }, - set [s + n](v) { }, - get [+s]() { return 0; }, - set [""](v) { }, - get [0]() { return 0; }, - set [a](v) { }, - get [true]() { return 0; }, - set [`hello bye`](v) { }, - get [`hello ${a} bye`]() { return 0; } + get [s]() { + return 0; + }, + set [n](v) { + }, + get [s + s]() { + return 0; + }, + set [s + n](v) { + }, + get [+s]() { + return 0; + }, + set [""](v) { + }, + get [0]() { + return 0; + }, + set [a](v) { + }, + get [true]() { + return 0; + }, + set [`hello bye`](v) { + }, + get [`hello ${a} bye`]() { + return 0; + } }; diff --git a/tests/baselines/reference/computedPropertyNames13_ES5.js b/tests/baselines/reference/computedPropertyNames13_ES5.js index 89562162911..7933d6f9830 100644 --- a/tests/baselines/reference/computedPropertyNames13_ES5.js +++ b/tests/baselines/reference/computedPropertyNames13_ES5.js @@ -23,16 +23,27 @@ var a; var C = (function () { function C() { } - C.prototype[s] = function () { }; - C.prototype[n] = function () { }; - C[s + s] = function () { }; - C.prototype[s + n] = function () { }; - C.prototype[+s] = function () { }; - C[""] = function () { }; - C.prototype[0] = function () { }; - C.prototype[a] = function () { }; - C[true] = function () { }; - C.prototype["hello bye"] = function () { }; - C["hello " + a + " bye"] = function () { }; + C.prototype[s] = function () { + }; + C.prototype[n] = function () { + }; + C[s + s] = function () { + }; + C.prototype[s + n] = function () { + }; + C.prototype[+s] = function () { + }; + C[""] = function () { + }; + C.prototype[0] = function () { + }; + C.prototype[a] = function () { + }; + C[true] = function () { + }; + C.prototype["hello bye"] = function () { + }; + C["hello " + a + " bye"] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames13_ES6.js b/tests/baselines/reference/computedPropertyNames13_ES6.js index b18ef3fb3e2..07aa1673aba 100644 --- a/tests/baselines/reference/computedPropertyNames13_ES6.js +++ b/tests/baselines/reference/computedPropertyNames13_ES6.js @@ -23,16 +23,27 @@ var a; var C = (function () { function C() { } - C.prototype[s] = function () { }; - C.prototype[n] = function () { }; - C[s + s] = function () { }; - C.prototype[s + n] = function () { }; - C.prototype[+s] = function () { }; - C[""] = function () { }; - C.prototype[0] = function () { }; - C.prototype[a] = function () { }; - C[true] = function () { }; - C.prototype[`hello bye`] = function () { }; - C[`hello ${a} bye`] = function () { }; + C.prototype[s] = function () { + }; + C.prototype[n] = function () { + }; + C[s + s] = function () { + }; + C.prototype[s + n] = function () { + }; + C.prototype[+s] = function () { + }; + C[""] = function () { + }; + C.prototype[0] = function () { + }; + C.prototype[a] = function () { + }; + C[true] = 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..3a53e4106fc 100644 --- a/tests/baselines/reference/computedPropertyNames14_ES5.js +++ b/tests/baselines/reference/computedPropertyNames14_ES5.js @@ -14,11 +14,17 @@ var b; var C = (function () { function C() { } - C.prototype[b] = function () { }; - C[true] = function () { }; - C.prototype[[]] = function () { }; - C[{}] = function () { }; - C.prototype[undefined] = function () { }; - C[null] = function () { }; + C.prototype[b] = function () { + }; + C[true] = function () { + }; + C.prototype[[]] = function () { + }; + C[{}] = function () { + }; + C.prototype[undefined] = function () { + }; + C[null] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames14_ES6.js b/tests/baselines/reference/computedPropertyNames14_ES6.js index 94b4196a606..7a58ad9a80a 100644 --- a/tests/baselines/reference/computedPropertyNames14_ES6.js +++ b/tests/baselines/reference/computedPropertyNames14_ES6.js @@ -14,11 +14,17 @@ var b; var C = (function () { function C() { } - C.prototype[b] = function () { }; - C[true] = function () { }; - C.prototype[[]] = function () { }; - C[{}] = function () { }; - C.prototype[undefined] = function () { }; - C[null] = function () { }; + C.prototype[b] = function () { + }; + C[true] = function () { + }; + C.prototype[[]] = function () { + }; + 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..7e0db9855dd 100644 --- a/tests/baselines/reference/computedPropertyNames15_ES5.js +++ b/tests/baselines/reference/computedPropertyNames15_ES5.js @@ -15,8 +15,11 @@ var p3; var C = (function () { function C() { } - C.prototype[p1] = function () { }; - C.prototype[p2] = function () { }; - C.prototype[p3] = function () { }; + C.prototype[p1] = function () { + }; + C.prototype[p2] = function () { + }; + C.prototype[p3] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames15_ES6.js b/tests/baselines/reference/computedPropertyNames15_ES6.js index ab7bf4552d6..70c2e7b451c 100644 --- a/tests/baselines/reference/computedPropertyNames15_ES6.js +++ b/tests/baselines/reference/computedPropertyNames15_ES6.js @@ -15,8 +15,11 @@ var p3; var C = (function () { function C() { } - C.prototype[p1] = function () { }; - C.prototype[p2] = function () { }; - C.prototype[p3] = function () { }; + C.prototype[p1] = 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 2c7316e1398..b8c4991bee4 100644 --- a/tests/baselines/reference/computedPropertyNames16_ES5.js +++ b/tests/baselines/reference/computedPropertyNames16_ES5.js @@ -24,57 +24,74 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, n, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, s + s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, s + n, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, +s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 0, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, a, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, true, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "hello bye", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "hello " + a + " bye", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames16_ES6.js b/tests/baselines/reference/computedPropertyNames16_ES6.js index 369040e7e22..90f15f6cf2e 100644 --- a/tests/baselines/reference/computedPropertyNames16_ES6.js +++ b/tests/baselines/reference/computedPropertyNames16_ES6.js @@ -24,57 +24,74 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, n, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, s + s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, s + n, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, +s, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 0, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, a, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, true, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, `hello bye`, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, `hello ${a} bye`, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames17_ES5.js b/tests/baselines/reference/computedPropertyNames17_ES5.js index 3b5c100694d..33bc5bfd3c8 100644 --- a/tests/baselines/reference/computedPropertyNames17_ES5.js +++ b/tests/baselines/reference/computedPropertyNames17_ES5.js @@ -15,32 +15,41 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, b, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, true, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, [], { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, {}, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, undefined, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, null, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames17_ES6.js b/tests/baselines/reference/computedPropertyNames17_ES6.js index 38012efbb14..e9b19202e08 100644 --- a/tests/baselines/reference/computedPropertyNames17_ES6.js +++ b/tests/baselines/reference/computedPropertyNames17_ES6.js @@ -15,32 +15,41 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, b, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, true, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, [], { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, {}, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, undefined, { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, null, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames1_ES5.js b/tests/baselines/reference/computedPropertyNames1_ES5.js index 37e06616c2f..9acf507ecbc 100644 --- a/tests/baselines/reference/computedPropertyNames1_ES5.js +++ b/tests/baselines/reference/computedPropertyNames1_ES5.js @@ -6,7 +6,18 @@ var v = { //// [computedPropertyNames1_ES5.js] var v = (_a = {}, - _a[0 + 1] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a[0 + 1] = Object.defineProperty({ set: function (v) { }, enumerable: true, configurable: true }), + _a[0 + 1] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a[0 + 1] = Object.defineProperty({ + set: function (v) { + }, + enumerable: true, + configurable: true + }), _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNames1_ES6.js b/tests/baselines/reference/computedPropertyNames1_ES6.js index 80a7d2ecdd2..86cdd9c4333 100644 --- a/tests/baselines/reference/computedPropertyNames1_ES6.js +++ b/tests/baselines/reference/computedPropertyNames1_ES6.js @@ -6,6 +6,9 @@ var v = { //// [computedPropertyNames1_ES6.js] var v = { - get [0 + 1]() { return 0; }, - set [0 + 1](v) { } //No error + get [0 + 1]() { + return 0; + }, + set [0 + 1](v) { + } //No error }; diff --git a/tests/baselines/reference/computedPropertyNames21_ES5.js b/tests/baselines/reference/computedPropertyNames21_ES5.js index 81f95cd824d..2678cdc2286 100644 --- a/tests/baselines/reference/computedPropertyNames21_ES5.js +++ b/tests/baselines/reference/computedPropertyNames21_ES5.js @@ -13,6 +13,7 @@ var C = (function () { C.prototype.bar = function () { return 0; }; - C.prototype[this.bar()] = function () { }; + C.prototype[this.bar()] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames21_ES6.js b/tests/baselines/reference/computedPropertyNames21_ES6.js index 34a1878f689..f51f6faed24 100644 --- a/tests/baselines/reference/computedPropertyNames21_ES6.js +++ b/tests/baselines/reference/computedPropertyNames21_ES6.js @@ -13,6 +13,7 @@ var C = (function () { C.prototype.bar = function () { return 0; }; - C.prototype[this.bar()] = 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 df12193250b..b28e0ea68e2 100644 --- a/tests/baselines/reference/computedPropertyNames22_ES5.js +++ b/tests/baselines/reference/computedPropertyNames22_ES5.js @@ -14,7 +14,8 @@ var C = (function () { } C.prototype.bar = function () { var obj = (_a = {}, - _a[this.bar()] = function () { }, + _a[this.bar()] = function () { + }, _a); return 0; var _a; diff --git a/tests/baselines/reference/computedPropertyNames22_ES6.js b/tests/baselines/reference/computedPropertyNames22_ES6.js index c5d58939fc8..9872605c20e 100644 --- a/tests/baselines/reference/computedPropertyNames22_ES6.js +++ b/tests/baselines/reference/computedPropertyNames22_ES6.js @@ -14,7 +14,8 @@ var C = (function () { } C.prototype.bar = function () { var obj = { - [this.bar()]() { } + [this.bar()]() { + } }; return 0; }; diff --git a/tests/baselines/reference/computedPropertyNames23_ES5.js b/tests/baselines/reference/computedPropertyNames23_ES5.js index 9e02999738c..c3024a7fbbf 100644 --- a/tests/baselines/reference/computedPropertyNames23_ES5.js +++ b/tests/baselines/reference/computedPropertyNames23_ES5.js @@ -17,7 +17,8 @@ var C = (function () { }; C.prototype[(_a = {}, _a[this.bar()] = 1, - _a)[0]] = function () { }; + _a)[0]] = function () { + }; return C; })(); var _a; diff --git a/tests/baselines/reference/computedPropertyNames23_ES6.js b/tests/baselines/reference/computedPropertyNames23_ES6.js index ad3e35dbb25..f5687952b88 100644 --- a/tests/baselines/reference/computedPropertyNames23_ES6.js +++ b/tests/baselines/reference/computedPropertyNames23_ES6.js @@ -15,6 +15,9 @@ var C = (function () { C.prototype.bar = function () { return 0; }; - C.prototype[{ [this.bar()]: 1 }[0]] = function () { }; + C.prototype[{ + [this.bar()]: 1 + }[0]] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.js b/tests/baselines/reference/computedPropertyNames24_ES5.js index 5b9fcbca992..d24f406c1ad 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES5.js +++ b/tests/baselines/reference/computedPropertyNames24_ES5.js @@ -32,6 +32,7 @@ var C = (function (_super) { } // Gets emitted as super, not _super, which is consistent with // use of super in static properties initializers. - C.prototype[super.bar.call(this)] = function () { }; + C.prototype[super.bar.call(this)] = function () { + }; return C; })(Base); diff --git a/tests/baselines/reference/computedPropertyNames24_ES6.js b/tests/baselines/reference/computedPropertyNames24_ES6.js index 58eb07cfb8d..12aef633963 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES6.js +++ b/tests/baselines/reference/computedPropertyNames24_ES6.js @@ -32,6 +32,7 @@ var C = (function (_super) { } // Gets emitted as super, not _super, which is consistent with // use of super in static properties initializers. - C.prototype[super.bar.call(this)] = function () { }; + C.prototype[super.bar.call(this)] = function () { + }; return C; })(Base); diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.js b/tests/baselines/reference/computedPropertyNames25_ES5.js index f8196dd1307..4bcf877c571 100644 --- a/tests/baselines/reference/computedPropertyNames25_ES5.js +++ b/tests/baselines/reference/computedPropertyNames25_ES5.js @@ -35,7 +35,8 @@ var C = (function (_super) { } C.prototype.foo = function () { var obj = (_a = {}, - _a[_super.prototype.bar.call(this)] = function () { }, + _a[_super.prototype.bar.call(this)] = function () { + }, _a); return 0; var _a; diff --git a/tests/baselines/reference/computedPropertyNames25_ES6.js b/tests/baselines/reference/computedPropertyNames25_ES6.js index 020582c9497..1a600df5040 100644 --- a/tests/baselines/reference/computedPropertyNames25_ES6.js +++ b/tests/baselines/reference/computedPropertyNames25_ES6.js @@ -35,7 +35,8 @@ var C = (function (_super) { } C.prototype.foo = function () { var obj = { - [_super.prototype.bar.call(this)]() { } + [_super.prototype.bar.call(this)]() { + } }; return 0; }; diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.js b/tests/baselines/reference/computedPropertyNames26_ES5.js index 037bd8786e6..217a0dfc74c 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES5.js +++ b/tests/baselines/reference/computedPropertyNames26_ES5.js @@ -36,7 +36,8 @@ var C = (function (_super) { // use of super in static properties initializers. C.prototype[(_a = {}, _a[super.bar.call(this)] = 1, - _a)[0]] = function () { }; + _a)[0]] = function () { + }; return C; })(Base); var _a; diff --git a/tests/baselines/reference/computedPropertyNames26_ES6.js b/tests/baselines/reference/computedPropertyNames26_ES6.js index dadc6a29e80..fc53d91e627 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES6.js +++ b/tests/baselines/reference/computedPropertyNames26_ES6.js @@ -34,6 +34,9 @@ var C = (function (_super) { } // Gets emitted as super, not _super, which is consistent with // use of super in static properties initializers. - C.prototype[{ [super.bar.call(this)]: 1 }[0]] = function () { }; + C.prototype[{ + [super.bar.call(this)]: 1 + }[0]] = function () { + }; return C; })(Base); diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.js b/tests/baselines/reference/computedPropertyNames27_ES5.js index df1fed09724..2f550731dfb 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES5.js +++ b/tests/baselines/reference/computedPropertyNames27_ES5.js @@ -22,6 +22,7 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype[(_super.call(this), "prop")] = function () { }; + C.prototype[(_super.call(this), "prop")] = function () { + }; return C; })(Base); diff --git a/tests/baselines/reference/computedPropertyNames27_ES6.js b/tests/baselines/reference/computedPropertyNames27_ES6.js index a78f13cda20..54a20a52200 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES6.js +++ b/tests/baselines/reference/computedPropertyNames27_ES6.js @@ -22,6 +22,7 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype[(_super.call(this), "prop")] = function () { }; + C.prototype[(_super.call(this), "prop")] = function () { + }; return C; })(Base); diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.js b/tests/baselines/reference/computedPropertyNames28_ES5.js index b88cb0dfaf9..418252784a2 100644 --- a/tests/baselines/reference/computedPropertyNames28_ES5.js +++ b/tests/baselines/reference/computedPropertyNames28_ES5.js @@ -27,7 +27,8 @@ var C = (function (_super) { function C() { _super.call(this); var obj = (_a = {}, - _a[(_super.call(this), "prop")] = function () { }, + _a[(_super.call(this), "prop")] = function () { + }, _a); var _a; } diff --git a/tests/baselines/reference/computedPropertyNames28_ES6.js b/tests/baselines/reference/computedPropertyNames28_ES6.js index 5656d96de87..09e1b33bf98 100644 --- a/tests/baselines/reference/computedPropertyNames28_ES6.js +++ b/tests/baselines/reference/computedPropertyNames28_ES6.js @@ -27,7 +27,8 @@ var C = (function (_super) { function C() { _super.call(this); var obj = { - [(_super.call(this), "prop")]() { } + [(_super.call(this), "prop")]() { + } }; } return C; diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.js b/tests/baselines/reference/computedPropertyNames29_ES5.js index 022c930ab67..93a80128d98 100644 --- a/tests/baselines/reference/computedPropertyNames29_ES5.js +++ b/tests/baselines/reference/computedPropertyNames29_ES5.js @@ -18,7 +18,8 @@ var C = (function () { var _this = this; (function () { var obj = (_a = {}, - _a[_this.bar()] = function () { }, + _a[_this.bar()] = function () { + }, _a); var _a; }); diff --git a/tests/baselines/reference/computedPropertyNames29_ES6.js b/tests/baselines/reference/computedPropertyNames29_ES6.js index d01b6fd3b7f..e1e6be51b21 100644 --- a/tests/baselines/reference/computedPropertyNames29_ES6.js +++ b/tests/baselines/reference/computedPropertyNames29_ES6.js @@ -17,7 +17,8 @@ var C = (function () { C.prototype.bar = function () { (() => { var obj = { - [this.bar()]() { } // needs capture + [this.bar()]() { + } // needs capture }; }); return 0; diff --git a/tests/baselines/reference/computedPropertyNames2_ES5.js b/tests/baselines/reference/computedPropertyNames2_ES5.js index 581b581d87b..97d9a673bbb 100644 --- a/tests/baselines/reference/computedPropertyNames2_ES5.js +++ b/tests/baselines/reference/computedPropertyNames2_ES5.js @@ -16,25 +16,31 @@ var accessorName = "accessor"; var C = (function () { function C() { } - C.prototype[methodName] = function () { }; - C[methodName] = function () { }; + C.prototype[methodName] = function () { + }; + C[methodName] = function () { + }; Object.defineProperty(C.prototype, accessorName, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, accessorName, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, accessorName, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C, accessorName, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames2_ES6.js b/tests/baselines/reference/computedPropertyNames2_ES6.js index b58b1a6f077..e5fcfaac8f9 100644 --- a/tests/baselines/reference/computedPropertyNames2_ES6.js +++ b/tests/baselines/reference/computedPropertyNames2_ES6.js @@ -16,25 +16,31 @@ var accessorName = "accessor"; var C = (function () { function C() { } - C.prototype[methodName] = function () { }; - C[methodName] = function () { }; + C.prototype[methodName] = function () { + }; + C[methodName] = function () { + }; Object.defineProperty(C.prototype, accessorName, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, accessorName, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, accessorName, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C, accessorName, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.js b/tests/baselines/reference/computedPropertyNames30_ES5.js index fd63a192d07..b11b651a0d5 100644 --- a/tests/baselines/reference/computedPropertyNames30_ES5.js +++ b/tests/baselines/reference/computedPropertyNames30_ES5.js @@ -33,7 +33,8 @@ var C = (function (_super) { _super.call(this); (function () { var obj = (_a = {}, - _a[(_super.call(this), "prop")] = function () { }, + _a[(_super.call(this), "prop")] = function () { + }, _a); var _a; }); diff --git a/tests/baselines/reference/computedPropertyNames30_ES6.js b/tests/baselines/reference/computedPropertyNames30_ES6.js index 0c4f259fe48..c88fa98be5e 100644 --- a/tests/baselines/reference/computedPropertyNames30_ES6.js +++ b/tests/baselines/reference/computedPropertyNames30_ES6.js @@ -36,7 +36,8 @@ var C = (function (_super) { // Ideally, we would capture this. But the reference is // illegal, and not capturing this is consistent with //treatment of other similar violations. - [(_super.call(this), "prop")]() { } + [(_super.call(this), "prop")]() { + } }; }); } diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.js b/tests/baselines/reference/computedPropertyNames31_ES5.js index 8a3c1a3f6c5..a079b3fa449 100644 --- a/tests/baselines/reference/computedPropertyNames31_ES5.js +++ b/tests/baselines/reference/computedPropertyNames31_ES5.js @@ -39,7 +39,8 @@ var C = (function (_super) { var _this = this; (function () { var obj = (_a = {}, - _a[_super.prototype.bar.call(_this)] = function () { }, + _a[_super.prototype.bar.call(_this)] = function () { + }, _a); var _a; }); diff --git a/tests/baselines/reference/computedPropertyNames31_ES6.js b/tests/baselines/reference/computedPropertyNames31_ES6.js index 0f7d72818fe..33f5319ded9 100644 --- a/tests/baselines/reference/computedPropertyNames31_ES6.js +++ b/tests/baselines/reference/computedPropertyNames31_ES6.js @@ -39,7 +39,8 @@ var C = (function (_super) { var _this = this; (() => { var obj = { - [_super.prototype.bar.call(_this)]() { } // needs capture + [_super.prototype.bar.call(_this)]() { + } // needs capture }; }); return 0; diff --git a/tests/baselines/reference/computedPropertyNames32_ES5.js b/tests/baselines/reference/computedPropertyNames32_ES5.js index a0d8b066b5c..5a541202582 100644 --- a/tests/baselines/reference/computedPropertyNames32_ES5.js +++ b/tests/baselines/reference/computedPropertyNames32_ES5.js @@ -8,13 +8,16 @@ class C { } //// [computedPropertyNames32_ES5.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.prototype.bar = function () { return 0; }; - C.prototype[foo()] = function () { }; + C.prototype[foo()] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames32_ES6.js b/tests/baselines/reference/computedPropertyNames32_ES6.js index 69d2a40edce..a87f7715d89 100644 --- a/tests/baselines/reference/computedPropertyNames32_ES6.js +++ b/tests/baselines/reference/computedPropertyNames32_ES6.js @@ -8,13 +8,16 @@ class C { } //// [computedPropertyNames32_ES6.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.prototype.bar = function () { return 0; }; - C.prototype[foo()] = function () { }; + C.prototype[foo()] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.js b/tests/baselines/reference/computedPropertyNames33_ES5.js index 3d7c70a9256..24362351196 100644 --- a/tests/baselines/reference/computedPropertyNames33_ES5.js +++ b/tests/baselines/reference/computedPropertyNames33_ES5.js @@ -10,13 +10,16 @@ class C { } //// [computedPropertyNames33_ES5.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.prototype.bar = function () { var obj = (_a = {}, - _a[foo()] = function () { }, + _a[foo()] = function () { + }, _a); return 0; var _a; diff --git a/tests/baselines/reference/computedPropertyNames33_ES6.js b/tests/baselines/reference/computedPropertyNames33_ES6.js index 768af6fd403..03c503caec4 100644 --- a/tests/baselines/reference/computedPropertyNames33_ES6.js +++ b/tests/baselines/reference/computedPropertyNames33_ES6.js @@ -10,13 +10,16 @@ class C { } //// [computedPropertyNames33_ES6.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.prototype.bar = function () { var obj = { - [foo()]() { } + [foo()]() { + } }; return 0; }; diff --git a/tests/baselines/reference/computedPropertyNames34_ES5.js b/tests/baselines/reference/computedPropertyNames34_ES5.js index fd46b144fa5..83e757222b0 100644 --- a/tests/baselines/reference/computedPropertyNames34_ES5.js +++ b/tests/baselines/reference/computedPropertyNames34_ES5.js @@ -10,13 +10,16 @@ class C { } //// [computedPropertyNames34_ES5.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.bar = function () { var obj = (_a = {}, - _a[foo()] = function () { }, + _a[foo()] = function () { + }, _a); return 0; var _a; diff --git a/tests/baselines/reference/computedPropertyNames34_ES6.js b/tests/baselines/reference/computedPropertyNames34_ES6.js index 09cccb0e7f4..62e2e151cd3 100644 --- a/tests/baselines/reference/computedPropertyNames34_ES6.js +++ b/tests/baselines/reference/computedPropertyNames34_ES6.js @@ -10,13 +10,16 @@ class C { } //// [computedPropertyNames34_ES6.js] -function foo() { return ''; } +function foo() { + return ''; +} var C = (function () { function C() { } C.bar = function () { var obj = { - [foo()]() { } + [foo()]() { + } }; return 0; }; diff --git a/tests/baselines/reference/computedPropertyNames35_ES5.js b/tests/baselines/reference/computedPropertyNames35_ES5.js index 0804c946f1f..b55743a2d83 100644 --- a/tests/baselines/reference/computedPropertyNames35_ES5.js +++ b/tests/baselines/reference/computedPropertyNames35_ES5.js @@ -6,4 +6,6 @@ interface I { } //// [computedPropertyNames35_ES5.js] -function foo() { return ''; } +function foo() { + return ''; +} diff --git a/tests/baselines/reference/computedPropertyNames35_ES6.js b/tests/baselines/reference/computedPropertyNames35_ES6.js index 2d3f4088315..b08d7c0f312 100644 --- a/tests/baselines/reference/computedPropertyNames35_ES6.js +++ b/tests/baselines/reference/computedPropertyNames35_ES6.js @@ -6,4 +6,6 @@ interface I { } //// [computedPropertyNames35_ES6.js] -function foo() { return ''; } +function foo() { + return ''; +} diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js index 5519a6d284c..fa92da7b7b6 100644 --- a/tests/baselines/reference/computedPropertyNames36_ES5.js +++ b/tests/baselines/reference/computedPropertyNames36_ES5.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames36_ES6.js b/tests/baselines/reference/computedPropertyNames36_ES6.js index 09bab9a2630..5b71326fbc4 100644 --- a/tests/baselines/reference/computedPropertyNames36_ES6.js +++ b/tests/baselines/reference/computedPropertyNames36_ES6.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js index 54a7243f3fa..f185e93db3c 100644 --- a/tests/baselines/reference/computedPropertyNames37_ES5.js +++ b/tests/baselines/reference/computedPropertyNames37_ES5.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames37_ES6.js b/tests/baselines/reference/computedPropertyNames37_ES6.js index c824f15ef54..992035f6865 100644 --- a/tests/baselines/reference/computedPropertyNames37_ES6.js +++ b/tests/baselines/reference/computedPropertyNames37_ES6.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames38_ES5.js b/tests/baselines/reference/computedPropertyNames38_ES5.js index 49af4d00d51..42115927b30 100644 --- a/tests/baselines/reference/computedPropertyNames38_ES5.js +++ b/tests/baselines/reference/computedPropertyNames38_ES5.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, 1 << 6, { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 1 << 6, { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames38_ES6.js b/tests/baselines/reference/computedPropertyNames38_ES6.js index 9dde7da09de..0fdcdb1d63c 100644 --- a/tests/baselines/reference/computedPropertyNames38_ES6.js +++ b/tests/baselines/reference/computedPropertyNames38_ES6.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, 1 << 6, { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 1 << 6, { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames39_ES5.js b/tests/baselines/reference/computedPropertyNames39_ES5.js index 1b8d3aab2ff..12cc55f1315 100644 --- a/tests/baselines/reference/computedPropertyNames39_ES5.js +++ b/tests/baselines/reference/computedPropertyNames39_ES5.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, 1 << 6, { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 1 << 6, { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames39_ES6.js b/tests/baselines/reference/computedPropertyNames39_ES6.js index d0d21f201bb..8e458ad83d7 100644 --- a/tests/baselines/reference/computedPropertyNames39_ES6.js +++ b/tests/baselines/reference/computedPropertyNames39_ES6.js @@ -26,12 +26,15 @@ var C = (function () { } Object.defineProperty(C.prototype, 1 << 6, { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, 1 << 6, { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames3_ES5.js b/tests/baselines/reference/computedPropertyNames3_ES5.js index f5a063f91e6..09440d5601f 100644 --- a/tests/baselines/reference/computedPropertyNames3_ES5.js +++ b/tests/baselines/reference/computedPropertyNames3_ES5.js @@ -14,25 +14,35 @@ var id; var C = (function () { function C() { } - C.prototype[0 + 1] = function () { }; - C[function () { }] = function () { }; + C.prototype[0 + 1] = function () { + }; + C[function () { + }] = function () { + }; Object.defineProperty(C.prototype, delete id, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); - Object.defineProperty(C.prototype, [0, 1], { - set: function (v) { }, + Object.defineProperty(C.prototype, [ + 0, + 1 + ], { + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, "", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C, id.toString(), { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames3_ES6.js b/tests/baselines/reference/computedPropertyNames3_ES6.js index 672d90d7b45..1a9c9ee465b 100644 --- a/tests/baselines/reference/computedPropertyNames3_ES6.js +++ b/tests/baselines/reference/computedPropertyNames3_ES6.js @@ -14,25 +14,35 @@ var id; var C = (function () { function C() { } - C.prototype[0 + 1] = function () { }; - C[() => { }] = function () { }; + C.prototype[0 + 1] = function () { + }; + C[() => { + }] = function () { + }; Object.defineProperty(C.prototype, delete id, { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); - Object.defineProperty(C.prototype, [0, 1], { - set: function (v) { }, + Object.defineProperty(C.prototype, [ + 0, + 1 + ], { + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, "", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); Object.defineProperty(C, id.toString(), { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.js b/tests/baselines/reference/computedPropertyNames40_ES5.js index e8063762026..887c5c3847e 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES5.js +++ b/tests/baselines/reference/computedPropertyNames40_ES5.js @@ -25,7 +25,11 @@ var C = (function () { function C() { } // Computed properties - C.prototype[""] = function () { return new Foo; }; - C.prototype[""] = function () { return new Foo2; }; + C.prototype[""] = function () { + return new Foo; + }; + C.prototype[""] = function () { + return new Foo2; + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames40_ES6.js b/tests/baselines/reference/computedPropertyNames40_ES6.js index 208be7760a9..99d28688a29 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES6.js +++ b/tests/baselines/reference/computedPropertyNames40_ES6.js @@ -25,7 +25,11 @@ var C = (function () { function C() { } // Computed properties - C.prototype[""] = function () { return new Foo; }; - C.prototype[""] = function () { return new Foo2; }; + 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..b4223ec5217 100644 --- a/tests/baselines/reference/computedPropertyNames41_ES5.js +++ b/tests/baselines/reference/computedPropertyNames41_ES5.js @@ -24,6 +24,8 @@ var C = (function () { function C() { } // Computed properties - C[""] = function () { return new Foo; }; + C[""] = function () { + return new Foo; + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames41_ES6.js b/tests/baselines/reference/computedPropertyNames41_ES6.js index 050079017c0..f0c386706a3 100644 --- a/tests/baselines/reference/computedPropertyNames41_ES6.js +++ b/tests/baselines/reference/computedPropertyNames41_ES6.js @@ -24,6 +24,8 @@ var C = (function () { function C() { } // Computed properties - C[""] = function () { return new Foo; }; + C[""] = function () { + return new Foo; + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js index b689f02ee98..f7faa347986 100644 --- a/tests/baselines/reference/computedPropertyNames43_ES5.js +++ b/tests/baselines/reference/computedPropertyNames43_ES5.js @@ -41,12 +41,15 @@ var D = (function (_super) { } Object.defineProperty(D.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames43_ES6.js b/tests/baselines/reference/computedPropertyNames43_ES6.js index 4b64a4c803b..ba0c228c307 100644 --- a/tests/baselines/reference/computedPropertyNames43_ES6.js +++ b/tests/baselines/reference/computedPropertyNames43_ES6.js @@ -41,12 +41,15 @@ var D = (function (_super) { } Object.defineProperty(D.prototype, "get1", { // Computed properties - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.js b/tests/baselines/reference/computedPropertyNames44_ES5.js index 32d3505e252..072b3e90681 100644 --- a/tests/baselines/reference/computedPropertyNames44_ES5.js +++ b/tests/baselines/reference/computedPropertyNames44_ES5.js @@ -32,7 +32,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "get1", { - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); @@ -44,7 +46,8 @@ var D = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames44_ES6.js b/tests/baselines/reference/computedPropertyNames44_ES6.js index 9cf11f3b337..72729054e07 100644 --- a/tests/baselines/reference/computedPropertyNames44_ES6.js +++ b/tests/baselines/reference/computedPropertyNames44_ES6.js @@ -32,7 +32,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "get1", { - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); @@ -44,7 +46,8 @@ var D = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.js b/tests/baselines/reference/computedPropertyNames45_ES5.js index 3d924b00b73..4389b32a835 100644 --- a/tests/baselines/reference/computedPropertyNames45_ES5.js +++ b/tests/baselines/reference/computedPropertyNames45_ES5.js @@ -33,7 +33,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "get1", { - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); @@ -45,7 +47,8 @@ var D = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames45_ES6.js b/tests/baselines/reference/computedPropertyNames45_ES6.js index 2e7992fe260..23dccc77956 100644 --- a/tests/baselines/reference/computedPropertyNames45_ES6.js +++ b/tests/baselines/reference/computedPropertyNames45_ES6.js @@ -33,7 +33,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "get1", { - get: function () { return new Foo; }, + get: function () { + return new Foo; + }, enumerable: true, configurable: true }); @@ -45,7 +47,8 @@ var D = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(D.prototype, "set1", { - set: function (p) { }, + set: function (p) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNames49_ES5.js b/tests/baselines/reference/computedPropertyNames49_ES5.js index 5f952c6f3f1..27730d56df8 100644 --- a/tests/baselines/reference/computedPropertyNames49_ES5.js +++ b/tests/baselines/reference/computedPropertyNames49_ES5.js @@ -30,21 +30,37 @@ var x = (_a = { p1: 10 }, _a.p1 = 10, - _a[1 + 1] = Object.defineProperty({ get: function () { + _a[1 + 1] = Object.defineProperty({ + get: function () { throw 10; - }, enumerable: true, configurable: true }), - _a[1 + 1] = Object.defineProperty({ get: function () { + }, + enumerable: true, + configurable: true + }), + _a[1 + 1] = Object.defineProperty({ + get: function () { return 10; - }, enumerable: true, configurable: true }), - _a[1 + 1] = Object.defineProperty({ set: function () { + }, + enumerable: true, + configurable: true + }), + _a[1 + 1] = Object.defineProperty({ + set: function () { // just throw throw 10; - }, enumerable: true, configurable: true }), - _a.foo = Object.defineProperty({ get: function () { + }, + enumerable: true, + configurable: true + }), + _a.foo = Object.defineProperty({ + get: function () { if (1 == 1) { return 10; } - }, enumerable: true, configurable: true }), + }, + enumerable: true, + configurable: true + }), _a.p2 = 20, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNames50_ES5.js b/tests/baselines/reference/computedPropertyNames50_ES5.js index 32502d80e0a..4221a21a763 100644 --- a/tests/baselines/reference/computedPropertyNames50_ES5.js +++ b/tests/baselines/reference/computedPropertyNames50_ES5.js @@ -35,21 +35,37 @@ var x = (_a = { } }, _a.p1 = 10, - _a.foo = Object.defineProperty({ get: function () { + _a.foo = Object.defineProperty({ + get: function () { if (1 == 1) { return 10; } - }, enumerable: true, configurable: true }), - _a[1 + 1] = Object.defineProperty({ get: function () { + }, + enumerable: true, + configurable: true + }), + _a[1 + 1] = Object.defineProperty({ + get: function () { throw 10; - }, enumerable: true, configurable: true }), - _a[1 + 1] = Object.defineProperty({ set: function () { + }, + enumerable: true, + configurable: true + }), + _a[1 + 1] = Object.defineProperty({ + set: function () { // just throw throw 10; - }, enumerable: true, configurable: true }), - _a[1 + 1] = Object.defineProperty({ get: function () { + }, + enumerable: true, + configurable: true + }), + _a[1 + 1] = Object.defineProperty({ + get: function () { return 10; - }, enumerable: true, configurable: true }), + }, + enumerable: true, + configurable: true + }), _a.p2 = 20, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNames9_ES5.js b/tests/baselines/reference/computedPropertyNames9_ES5.js index b1ac6c9e3b6..1b4fa16de2d 100644 --- a/tests/baselines/reference/computedPropertyNames9_ES5.js +++ b/tests/baselines/reference/computedPropertyNames9_ES5.js @@ -11,7 +11,8 @@ var v = { } //// [computedPropertyNames9_ES5.js] -function f(x) { } +function f(x) { +} var v = (_a = {}, _a[f("")] = 0, _a[f(0)] = 0, diff --git a/tests/baselines/reference/computedPropertyNames9_ES6.js b/tests/baselines/reference/computedPropertyNames9_ES6.js index b0e66c81cbd..8f111935b06 100644 --- a/tests/baselines/reference/computedPropertyNames9_ES6.js +++ b/tests/baselines/reference/computedPropertyNames9_ES6.js @@ -11,7 +11,8 @@ var v = { } //// [computedPropertyNames9_ES6.js] -function f(x) { } +function f(x) { +} var v = { [f("")]: 0, [f(0)]: 0, diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js index 1ee88351154..a74e04937c0 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js @@ -11,7 +11,11 @@ var o: I = { //// [computedPropertyNamesContextualType1_ES5.js] var o = (_a = {}, - _a["" + 0] = function (y) { return y.length; }, - _a["" + 1] = function (y) { return y.length; }, + _a["" + 0] = function (y) { + return y.length; + }, + _a["" + 1] = function (y) { + return y.length; + }, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.js b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.js index 4c4dfb9f9a6..b202d656b73 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.js @@ -11,6 +11,8 @@ var o: I = { //// [computedPropertyNamesContextualType1_ES6.js] var o = { - ["" + 0](y) { return y.length; }, + ["" + 0](y) { + return y.length; + }, ["" + 1]: y => y.length }; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js index 6be09e4bef3..b33ff276fcd 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js @@ -11,7 +11,11 @@ var o: I = { //// [computedPropertyNamesContextualType2_ES5.js] var o = (_a = {}, - _a[+"foo"] = function (y) { return y.length; }, - _a[+"bar"] = function (y) { return y.length; }, + _a[+"foo"] = function (y) { + return y.length; + }, + _a[+"bar"] = function (y) { + return y.length; + }, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.js b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.js index 1f0704ce8a7..6be2c11cc5e 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.js @@ -11,6 +11,8 @@ var o: I = { //// [computedPropertyNamesContextualType2_ES6.js] var o = { - [+"foo"](y) { return y.length; }, + [+"foo"](y) { + return y.length; + }, [+"bar"]: y => y.length }; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js index b510cda2916..c3f189a5780 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js @@ -10,7 +10,11 @@ var o: I = { //// [computedPropertyNamesContextualType3_ES5.js] var o = (_a = {}, - _a[+"foo"] = function (y) { return y.length; }, - _a[+"bar"] = function (y) { return y.length; }, + _a[+"foo"] = function (y) { + return y.length; + }, + _a[+"bar"] = function (y) { + return y.length; + }, _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.js b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.js index 08d39bbeae3..6124271a576 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.js @@ -10,6 +10,8 @@ var o: I = { //// [computedPropertyNamesContextualType3_ES6.js] var o = { - [+"foo"](y) { return y.length; }, + [+"foo"](y) { + return y.length; + }, [+"bar"]: y => y.length }; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js index f50231e3f0f..d60690a249e 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js @@ -16,12 +16,16 @@ foo({ //// [computedPropertyNamesContextualType6_ES5.js] foo((_a = { p: "", - 0: function () { } + 0: function () { + } }, _a.p = "", - _a[0] = function () { }, + _a[0] = function () { + }, _a["hi" + "bye"] = true, _a[0 + 1] = 0, - _a[+"hi"] = [0], + _a[+"hi"] = [ + 0 + ], _a)); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.js b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.js index 1360cc20028..e7218fff232 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.js @@ -16,8 +16,11 @@ foo({ //// [computedPropertyNamesContextualType6_ES6.js] foo({ p: "", - 0: () => { }, + 0: () => { + }, ["hi" + "bye"]: true, [0 + 1]: 0, - [+"hi"]: [0] + [+"hi"]: [ + 0 + ] }); diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js index e1c567c62d9..02c2ffa734a 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js @@ -16,12 +16,16 @@ foo({ //// [computedPropertyNamesContextualType7_ES5.js] foo((_a = { p: "", - 0: function () { } + 0: function () { + } }, _a.p = "", - _a[0] = function () { }, + _a[0] = function () { + }, _a["hi" + "bye"] = true, _a[0 + 1] = 0, - _a[+"hi"] = [0], + _a[+"hi"] = [ + 0 + ], _a)); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.js b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.js index 185ccd72ead..d6b50e93aeb 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.js @@ -16,8 +16,11 @@ foo({ //// [computedPropertyNamesContextualType7_ES6.js] foo({ p: "", - 0: () => { }, + 0: () => { + }, ["hi" + "bye"]: true, [0 + 1]: 0, - [+"hi"]: [0] + [+"hi"]: [ + 0 + ] }); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js index 84b92f6c92d..c091003735c 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js @@ -9,14 +9,18 @@ class C { var C = (function () { function C() { } - C.prototype["" + ""] = function () { }; + C.prototype["" + ""] = function () { + }; Object.defineProperty(C.prototype, "" + "", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "" + "", { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js index b7505212baf..eb7dab0b660 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES6.js @@ -9,14 +9,18 @@ class C { var C = (function () { function C() { } - C.prototype["" + ""] = function () { }; + C.prototype["" + ""] = function () { + }; Object.defineProperty(C.prototype, "" + "", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "" + "", { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js index 9847ea8b7ef..22a5b0d305d 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js @@ -9,14 +9,18 @@ class C { var C = (function () { function C() { } - C["" + ""] = function () { }; + C["" + ""] = function () { + }; Object.defineProperty(C, "" + "", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "" + "", { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js index 9cd90493ea6..3912113905c 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES6.js @@ -9,14 +9,18 @@ class C { var C = (function () { function C() { } - C["" + ""] = function () { }; + C["" + ""] = function () { + }; Object.defineProperty(C, "" + "", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "" + "", { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js index 58c3133e6ee..047a8cdb333 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js @@ -9,9 +9,21 @@ var v = { //// [computedPropertyNamesDeclarationEmit5_ES5.js] var v = (_a = {}, _a["" + ""] = 0, - _a["" + ""] = function () { }, - _a["" + ""] = Object.defineProperty({ get: function () { return 0; }, enumerable: true, configurable: true }), - _a["" + ""] = Object.defineProperty({ set: function (x) { }, enumerable: true, configurable: true }), + _a["" + ""] = function () { + }, + _a["" + ""] = Object.defineProperty({ + get: function () { + return 0; + }, + enumerable: true, + configurable: true + }), + _a["" + ""] = Object.defineProperty({ + set: function (x) { + }, + enumerable: true, + configurable: true + }), _a); var _a; diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js index e19ac43656e..0ae3eaf62b5 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js @@ -9,9 +9,13 @@ var v = { //// [computedPropertyNamesDeclarationEmit5_ES6.js] var v = { ["" + ""]: 0, - ["" + ""]() { }, - get ["" + ""]() { return 0; }, - set ["" + ""](x) { } + ["" + ""]() { + }, + get ["" + ""]() { + return 0; + }, + set ["" + ""](x) { + } }; diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js index 1470605413a..c922b87f470 100644 --- a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js @@ -13,6 +13,7 @@ var accessorName = "accessor"; var C = (function () { function C() { } - C.prototype[methodName] = function (v) { }; + C.prototype[methodName] = function (v) { + }; return C; })(); diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES6.js b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES6.js index 1cbddb58dc2..264a6a75074 100644 --- a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES6.js @@ -13,6 +13,7 @@ var accessorName = "accessor"; var C = (function () { function C() { } - C.prototype[methodName] = function (v) { }; + C.prototype[methodName] = function (v) { + }; return C; })(); diff --git a/tests/baselines/reference/concatError.js b/tests/baselines/reference/concatError.js index dee3d8a30e3..1b7ff27be68 100644 --- a/tests/baselines/reference/concatError.js +++ b/tests/baselines/reference/concatError.js @@ -41,7 +41,9 @@ interface Array { } */ var fa; -fa = fa.concat([0]); +fa = fa.concat([ + 0 +]); fa = fa.concat(0); /* diff --git a/tests/baselines/reference/conditionalExpressionNewLine10.js b/tests/baselines/reference/conditionalExpressionNewLine10.js index bb2f3bec231..ea1d07e1a8a 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine10.js +++ b/tests/baselines/reference/conditionalExpressionNewLine10.js @@ -8,10 +8,4 @@ var v = a : g; //// [conditionalExpressionNewLine10.js] -var v = a - ? b - ? d - : e - : c - ? f - : g; +var v = a ? b ? d : e : c ? f : g; diff --git a/tests/baselines/reference/conditionalExpressionNewLine2.js b/tests/baselines/reference/conditionalExpressionNewLine2.js index e69f2004ebc..ca997a49a1c 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine2.js +++ b/tests/baselines/reference/conditionalExpressionNewLine2.js @@ -3,5 +3,4 @@ var v = a ? b : c; //// [conditionalExpressionNewLine2.js] -var v = a - ? b : c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine3.js b/tests/baselines/reference/conditionalExpressionNewLine3.js index 4d11f45368f..ba2f565b235 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine3.js +++ b/tests/baselines/reference/conditionalExpressionNewLine3.js @@ -3,5 +3,4 @@ var v = a ? b : c; //// [conditionalExpressionNewLine3.js] -var v = a ? - b : c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine4.js b/tests/baselines/reference/conditionalExpressionNewLine4.js index d6532ecb15b..33e5dc11a0d 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine4.js +++ b/tests/baselines/reference/conditionalExpressionNewLine4.js @@ -3,5 +3,4 @@ var v = a ? b : c; //// [conditionalExpressionNewLine4.js] -var v = a ? b : - c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine5.js b/tests/baselines/reference/conditionalExpressionNewLine5.js index 6fdd0735bcd..7a837a0f05e 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine5.js +++ b/tests/baselines/reference/conditionalExpressionNewLine5.js @@ -3,5 +3,4 @@ var v = a ? b : c; //// [conditionalExpressionNewLine5.js] -var v = a ? b - : c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine6.js b/tests/baselines/reference/conditionalExpressionNewLine6.js index 94539ab891e..cd24a9b880a 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine6.js +++ b/tests/baselines/reference/conditionalExpressionNewLine6.js @@ -4,6 +4,4 @@ var v = a : c; //// [conditionalExpressionNewLine6.js] -var v = a - ? b - : c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine7.js b/tests/baselines/reference/conditionalExpressionNewLine7.js index 5c781f7d85a..fd2176f1b01 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine7.js +++ b/tests/baselines/reference/conditionalExpressionNewLine7.js @@ -4,6 +4,4 @@ var v = a ? c; //// [conditionalExpressionNewLine7.js] -var v = a ? - b : - c; +var v = a ? b : c; diff --git a/tests/baselines/reference/conditionalExpressionNewLine8.js b/tests/baselines/reference/conditionalExpressionNewLine8.js index 61372eeadbc..1319a6df832 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine8.js +++ b/tests/baselines/reference/conditionalExpressionNewLine8.js @@ -4,6 +4,4 @@ var v = a : c ? f : g; //// [conditionalExpressionNewLine8.js] -var v = a - ? b ? d : e - : c ? f : g; +var v = a ? b ? d : e : c ? f : g; diff --git a/tests/baselines/reference/conditionalExpressionNewLine9.js b/tests/baselines/reference/conditionalExpressionNewLine9.js index 79f4606754e..ea43207859c 100644 --- a/tests/baselines/reference/conditionalExpressionNewLine9.js +++ b/tests/baselines/reference/conditionalExpressionNewLine9.js @@ -6,8 +6,4 @@ var v = a ? f : g; //// [conditionalExpressionNewLine9.js] -var v = a - ? b - ? d : e - : c - ? f : g; +var v = a ? b ? d : e : c ? f : g; diff --git a/tests/baselines/reference/conditionalExpressions2.js b/tests/baselines/reference/conditionalExpressions2.js index 6749a2c0ac0..5510a78ad6e 100644 --- a/tests/baselines/reference/conditionalExpressions2.js +++ b/tests/baselines/reference/conditionalExpressions2.js @@ -16,11 +16,22 @@ var c = false ? 1 : 0; var d = false ? false : true; var e = false ? "foo" : "bar"; var f = false ? null : undefined; -var g = true ? { g: 5 } : null; -var h = [{ h: 5 }, null]; -function i() { if (true) { - return { x: 5 }; +var g = true ? { + g: 5 +} : null; +var h = [ + { + h: 5 + }, + null +]; +function i() { + if (true) { + return { + x: 5 + }; + } + else { + return null; + } } -else { - return null; -} } diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js index f8fbe708e1a..1cd71e68873 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js @@ -91,9 +91,15 @@ condNumber ? exprString1 : exprBoolean1; // Union 1000000000000 ? exprIsObject1 : exprIsObject2; 10000 ? exprString1 : exprBoolean1; // Union //Cond is a number type expression -function foo() { return 1; } +function foo() { + return 1; +} ; -var array = [1, 2, 3]; +var array = [ + 1, + 2, + 3 +]; 1 * 0 ? exprAny1 : exprAny2; 1 + 1 ? exprBoolean1 : exprBoolean2; "string".length ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js index b2830e4d1d6..17f64c71421 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js @@ -77,7 +77,8 @@ var exprBoolean2; var exprNumber2; var exprString2; var exprIsObject2; -function foo() { } +function foo() { +} ; var C = (function () { function C() { @@ -93,12 +94,25 @@ condObject ? exprString1 : exprString2; condObject ? exprIsObject1 : exprIsObject2; condObject ? exprString1 : exprBoolean1; // union //Cond is an object type literal -(function (a) { return a.length; }) ? exprAny1 : exprAny2; -(function (a) { return a.length; }) ? exprBoolean1 : exprBoolean2; +(function (a) { + return a.length; +}) ? exprAny1 : exprAny2; +(function (a) { + return a.length; +}) ? exprBoolean1 : exprBoolean2; ({}) ? exprNumber1 : exprNumber2; -({ a: 1, b: "s" }) ? exprString1 : exprString2; -({ a: 1, b: "s" }) ? exprIsObject1 : exprIsObject2; -({ a: 1, b: "s" }) ? exprString1 : exprBoolean1; // union +({ + a: 1, + b: "s" +}) ? exprString1 : exprString2; +({ + a: 1, + b: "s" +}) ? exprIsObject1 : exprIsObject2; +({ + a: 1, + b: "s" +}) ? exprString1 : exprBoolean1; // union //Cond is an object type expression foo() ? exprAny1 : exprAny2; new Date() ? exprBoolean1 : exprBoolean2; @@ -113,12 +127,25 @@ var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2; var resultIsString1 = condObject ? exprString1 : exprString2; var resultIsObject1 = condObject ? exprIsObject1 : exprIsObject2; var resultIsStringOrBoolean1 = condObject ? exprString1 : exprBoolean1; // union -var resultIsAny2 = (function (a) { return a.length; }) ? exprAny1 : exprAny2; -var resultIsBoolean2 = (function (a) { return a.length; }) ? exprBoolean1 : exprBoolean2; +var resultIsAny2 = (function (a) { + return a.length; +}) ? exprAny1 : exprAny2; +var resultIsBoolean2 = (function (a) { + return a.length; +}) ? exprBoolean1 : exprBoolean2; var resultIsNumber2 = ({}) ? exprNumber1 : exprNumber2; -var resultIsString2 = ({ a: 1, b: "s" }) ? exprString1 : exprString2; -var resultIsObject2 = ({ a: 1, b: "s" }) ? exprIsObject1 : exprIsObject2; -var resultIsStringOrBoolean2 = ({ a: 1, b: "s" }) ? exprString1 : exprBoolean1; // union +var resultIsString2 = ({ + a: 1, + b: "s" +}) ? exprString1 : exprString2; +var resultIsObject2 = ({ + a: 1, + b: "s" +}) ? exprIsObject1 : exprIsObject2; +var resultIsStringOrBoolean2 = ({ + a: 1, + b: "s" +}) ? exprString1 : exprBoolean1; // union var resultIsAny3 = foo() ? exprAny1 : exprAny2; var resultIsBoolean3 = new Date() ? exprBoolean1 : exprBoolean2; var resultIsNumber3 = new C() ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js index 80cfaf97f26..30d90a8b27d 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js +++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js @@ -88,8 +88,14 @@ condAny ? exprString1 : exprBoolean1; // union null ? exprAny1 : exprAny2; null ? exprBoolean1 : exprBoolean2; undefined ? exprNumber1 : exprNumber2; -[null, undefined] ? exprString1 : exprString2; -[null, undefined] ? exprIsObject1 : exprIsObject2; +[ + null, + undefined +] ? exprString1 : exprString2; +[ + null, + undefined +] ? exprIsObject1 : exprIsObject2; undefined ? exprString1 : exprBoolean1; // union //Cond is an any type expression x.doSomeThing() ? exprAny1 : exprAny2; @@ -108,11 +114,20 @@ var resultIsStringOrBoolean1 = condAny ? exprString1 : exprBoolean1; // union var resultIsAny2 = null ? exprAny1 : exprAny2; var resultIsBoolean2 = null ? exprBoolean1 : exprBoolean2; var resultIsNumber2 = undefined ? exprNumber1 : exprNumber2; -var resultIsString2 = [null, undefined] ? exprString1 : exprString2; -var resultIsObject2 = [null, undefined] ? exprIsObject1 : exprIsObject2; +var resultIsString2 = [ + null, + undefined +] ? exprString1 : exprString2; +var resultIsObject2 = [ + null, + undefined +] ? exprIsObject1 : exprIsObject2; var resultIsStringOrBoolean2 = null ? exprString1 : exprBoolean1; // union var resultIsStringOrBoolean3 = undefined ? exprString1 : exprBoolean1; // union -var resultIsStringOrBoolean4 = [null, undefined] ? exprString1 : exprBoolean1; // union +var resultIsStringOrBoolean4 = [ + null, + undefined +] ? exprString1 : exprBoolean1; // union var resultIsAny3 = x.doSomeThing() ? exprAny1 : exprAny2; var resultIsBoolean3 = x("x") ? exprBoolean1 : exprBoolean2; var resultIsNumber3 = x(x) ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js index dbd68d9f009..ce4fd985235 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js @@ -92,9 +92,15 @@ condString ? exprString1 : exprBoolean1; // union " " ? exprIsObject1 : exprIsObject2; "hello " ? exprString1 : exprBoolean1; // union //Cond is a string type expression -function foo() { return "string"; } +function foo() { + return "string"; +} ; -var array = ["1", "2", "3"]; +var array = [ + "1", + "2", + "3" +]; typeof condString ? exprAny1 : exprAny2; condString.toUpperCase ? exprBoolean1 : exprBoolean2; condString + "string" ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js index 722310815ae..592c5a6ca10 100644 --- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js +++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js @@ -86,27 +86,59 @@ true ? x : a; var result1 = true ? x : a; //Expr1 and Expr2 are literals true ? {} : 1; -true ? { a: 1 } : { a: 2, b: 'string' }; +true ? { + a: 1 +} : { + a: 2, + b: 'string' +}; var result2 = true ? {} : 1; -var result3 = true ? { a: 1 } : { a: 2, b: 'string' }; +var result3 = true ? { + a: 1 +} : { + a: 2, + b: 'string' +}; //Contextually typed var resultIsX1 = true ? x : a; -var result4 = true ? function (m) { return m.propertyX; } : function (n) { return n.propertyA; }; +var result4 = true ? function (m) { + return m.propertyX; +} : function (n) { + return n.propertyA; +}; //Cond ? Expr1 : Expr2, Expr2 is supertype //Be Not contextually typed true ? a : x; var result5 = true ? a : x; //Expr1 and Expr2 are literals true ? 1 : {}; -true ? { a: 2, b: 'string' } : { a: 1 }; +true ? { + a: 2, + b: 'string' +} : { + a: 1 +}; var result6 = true ? 1 : {}; -var result7 = true ? { a: 2, b: 'string' } : { a: 1 }; +var result7 = true ? { + a: 2, + b: 'string' +} : { + a: 1 +}; //Contextually typed var resultIsX2 = true ? x : a; -var result8 = true ? function (m) { return m.propertyA; } : function (n) { return n.propertyX; }; +var result8 = true ? function (m) { + return m.propertyA; +} : function (n) { + return n.propertyX; +}; //Result = Cond ? Expr1 : Expr2, Result is supertype //Contextually typed var resultIsX3 = true ? a : b; -var result10 = true ? function (m) { return m.propertyX1; } : function (n) { return n.propertyX2; }; +var result10 = true ? function (m) { + return m.propertyX1; +} : function (n) { + return n.propertyX2; +}; //Expr1 and Expr2 are literals var result11 = true ? 1 : 'string'; diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js index 83262ed1301..78c7569c0fa 100644 --- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js +++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js @@ -63,7 +63,23 @@ var result1 = true ? a : b; var result2 = true ? a : b; var result3 = true ? a : b; var result31 = true ? a : b; -var result4 = true ? function (m) { return m.propertyX1; } : function (n) { return n.propertyX2; }; -var result5 = true ? function (m) { return m.propertyX1; } : function (n) { return n.propertyX2; }; -var result6 = true ? function (m) { return m.propertyX1; } : function (n) { return n.propertyX2; }; -var result61 = true ? function (m) { return m.propertyX1; } : function (n) { return n.propertyX2; }; +var result4 = true ? function (m) { + return m.propertyX1; +} : function (n) { + return n.propertyX2; +}; +var result5 = true ? function (m) { + return m.propertyX1; +} : function (n) { + return n.propertyX2; +}; +var result6 = true ? function (m) { + return m.propertyX1; +} : function (n) { + return n.propertyX2; +}; +var result61 = true ? function (m) { + return m.propertyX1; +} : function (n) { + return n.propertyX2; +}; diff --git a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.js b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.js index d8a36f9e09e..e2029d1bf37 100644 --- a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.js +++ b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.js @@ -22,7 +22,8 @@ var out2 = foo2((x, y) => { //// [conditionallyDuplicateOverloadsCausedByOverloadResolution.js] var out = foo(function (x, y) { - function bar() { } + function bar() { + } return bar; }); var out2 = foo2(function (x, y) { diff --git a/tests/baselines/reference/conflictMarkerTrivia2.js b/tests/baselines/reference/conflictMarkerTrivia2.js index bbf6726b994..bbb631de388 100644 --- a/tests/baselines/reference/conflictMarkerTrivia2.js +++ b/tests/baselines/reference/conflictMarkerTrivia2.js @@ -20,6 +20,7 @@ var C = (function () { C.prototype.foo = function () { a(); }; - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); diff --git a/tests/baselines/reference/conflictingTypeAnnotatedVar.js b/tests/baselines/reference/conflictingTypeAnnotatedVar.js index 283912c487b..b44dc6f1e33 100644 --- a/tests/baselines/reference/conflictingTypeAnnotatedVar.js +++ b/tests/baselines/reference/conflictingTypeAnnotatedVar.js @@ -5,5 +5,7 @@ function foo(): number { } //// [conflictingTypeAnnotatedVar.js] var foo; -function foo() { } -function foo() { } +function foo() { +} +function foo() { +} diff --git a/tests/baselines/reference/constDeclarations-access2.js b/tests/baselines/reference/constDeclarations-access2.js index ae8dae70646..fd51c932636 100644 --- a/tests/baselines/reference/constDeclarations-access2.js +++ b/tests/baselines/reference/constDeclarations-access2.js @@ -62,9 +62,11 @@ x--; ++((x)); // OK var a = x + 1; -function f(v) { } +function f(v) { +} f(x); -if (x) { } +if (x) { +} x; (x); -x; diff --git a/tests/baselines/reference/constDeclarations-access3.js b/tests/baselines/reference/constDeclarations-access3.js index 9140da965c3..9ac4880bdd1 100644 --- a/tests/baselines/reference/constDeclarations-access3.js +++ b/tests/baselines/reference/constDeclarations-access3.js @@ -71,9 +71,11 @@ M.x--; M["x"] = 0; // OK var a = M.x + 1; -function f(v) { } +function f(v) { +} f(M.x); -if (M.x) { } +if (M.x) { +} M.x; (M.x); -M.x; diff --git a/tests/baselines/reference/constDeclarations-access4.js b/tests/baselines/reference/constDeclarations-access4.js index 608d950526a..b226e746bba 100644 --- a/tests/baselines/reference/constDeclarations-access4.js +++ b/tests/baselines/reference/constDeclarations-access4.js @@ -67,9 +67,11 @@ M.x--; M["x"] = 0; // OK var a = M.x + 1; -function f(v) { } +function f(v) { +} f(M.x); -if (M.x) { } +if (M.x) { +} M.x; (M.x); -M.x; diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 71b8c99ae58..7acc95ad055 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -76,9 +76,11 @@ define(["require", "exports", 'constDeclarations_access_1'], function (require, m["x"] = 0; // OK var a = m.x + 1; - function f(v) { } + function f(v) { + } f(m.x); - if (m.x) { } + if (m.x) { + } m.x; (m.x); -m.x; diff --git a/tests/baselines/reference/constDeclarations-errors.js b/tests/baselines/reference/constDeclarations-errors.js index e7143f2564a..e1e68032f8d 100644 --- a/tests/baselines/reference/constDeclarations-errors.js +++ b/tests/baselines/reference/constDeclarations-errors.js @@ -21,10 +21,14 @@ for(const c10 = 0, c11; c10 < 1;) { } const c1; const c2; const c3, c4, c5, c6; // error, missing initialicer -for (const c in {}) { } +for (const c in {}) { +} // error, assigning to a const -for (const c8 = 0; c8 < 1; c8++) { } +for (const c8 = 0; c8 < 1; c8++) { +} // error, can not be unintalized -for (const c9; c9 < 1;) { } +for (const c9; c9 < 1;) { +} // error, can not be unintalized -for (const c10 = 0, c11; c10 < 1;) { } +for (const c10 = 0, c11; c10 < 1;) { +} diff --git a/tests/baselines/reference/constEnumErrors.js b/tests/baselines/reference/constEnumErrors.js index 4afd98982f0..ca5e3f87e6e 100644 --- a/tests/baselines/reference/constEnumErrors.js +++ b/tests/baselines/reference/constEnumErrors.js @@ -52,7 +52,9 @@ var y0 = E2[1]; var name = "A"; var y1 = E2[name]; var x = E2; -var y = [E2]; +var y = [ + E2 +]; function foo(t) { } foo(E2); diff --git a/tests/baselines/reference/constEnums.js b/tests/baselines/reference/constEnums.js index 4f85cc59d0e..b7077c74df1 100644 --- a/tests/baselines/reference/constEnums.js +++ b/tests/baselines/reference/constEnums.js @@ -216,8 +216,11 @@ function foo(x) { } function bar(e) { switch (e) { - case 1 /* V1 */: return 1; - case 101 /* V2 */: return 1; - case 64 /* V3 */: return 1; + case 1 /* V1 */: + return 1; + case 101 /* V2 */: + return 1; + case 64 /* V3 */: + return 1; } } diff --git a/tests/baselines/reference/constantOverloadFunction.js b/tests/baselines/reference/constantOverloadFunction.js index 408b56805fb..12e84e2077f 100644 --- a/tests/baselines/reference/constantOverloadFunction.js +++ b/tests/baselines/reference/constantOverloadFunction.js @@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -31,7 +32,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); var Derived2 = (function (_super) { @@ -39,7 +41,8 @@ var Derived2 = (function (_super) { function Derived2() { _super.apply(this, arguments); } - Derived2.prototype.baz = function () { }; + Derived2.prototype.baz = function () { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -47,7 +50,8 @@ var Derived3 = (function (_super) { function Derived3() { _super.apply(this, arguments); } - Derived3.prototype.biz = function () { }; + Derived3.prototype.biz = function () { + }; return Derived3; })(Base); function foo(tagName) { diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js index 591d6171dbe..563b73d7e5b 100644 --- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js +++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js @@ -24,7 +24,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -32,7 +33,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); var Derived2 = (function (_super) { @@ -40,7 +42,8 @@ var Derived2 = (function (_super) { function Derived2() { _super.apply(this, arguments); } - Derived2.prototype.baz = function () { }; + Derived2.prototype.baz = function () { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -48,7 +51,8 @@ var Derived3 = (function (_super) { function Derived3() { _super.apply(this, arguments); } - Derived3.prototype.biz = function () { }; + Derived3.prototype.biz = function () { + }; return Derived3; })(Base); function foo(tagName) { diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js index caeb2d32ee4..3d99e07bb5e 100644 --- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js +++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js @@ -30,7 +30,8 @@ var __extends = this.__extends || function (d, b) { var Constraint = (function () { function Constraint() { } - Constraint.prototype.method = function () { }; + Constraint.prototype.method = function () { + }; return Constraint; })(); var GenericBase = (function () { diff --git a/tests/baselines/reference/constraintErrors1.js b/tests/baselines/reference/constraintErrors1.js index 71723130b55..c8da89d574c 100644 --- a/tests/baselines/reference/constraintErrors1.js +++ b/tests/baselines/reference/constraintErrors1.js @@ -2,4 +2,5 @@ function foo5(test: T) { } //// [constraintErrors1.js] -function foo5(test) { } +function foo5(test) { +} diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.js b/tests/baselines/reference/constraintSatisfactionWithAny.js index 06d8b17690a..924c2ab1700 100644 --- a/tests/baselines/reference/constraintSatisfactionWithAny.js +++ b/tests/baselines/reference/constraintSatisfactionWithAny.js @@ -54,10 +54,16 @@ var c8 = new C4(b); //// [constraintSatisfactionWithAny.js] // any is not a valid type argument unless there is no constraint, or the constraint is any -function foo(x) { return null; } -function foo2(x) { return null; } +function foo(x) { + return null; +} +function foo2(x) { + return null; +} //function foo3(x: T): T { return null; } -function foo4(x) { return null; } +function foo4(x) { + return null; +} var a; foo(a); foo2(a); diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js index 7850b0ebd01..5f9e902141b 100644 --- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js +++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js @@ -40,7 +40,8 @@ var i2: I2<{}>; //// [constraintSatisfactionWithEmptyObject.js] // valid uses of a basic object constraint, no errors expected // Object constraint -function foo(x) { } +function foo(x) { +} var r = foo({}); var a = {}; var r = foo({}); @@ -53,7 +54,8 @@ var C = (function () { var r2 = new C({}); var i; // {} constraint -function foo2(x) { } +function foo2(x) { +} var r = foo2({}); var a = {}; var r = foo2({}); diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.js b/tests/baselines/reference/constructorArgWithGenericCallSignature.js index ca859869850..5fa7c46124b 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.js +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.js @@ -23,7 +23,8 @@ var Test; return MyClass; })(); Test.MyClass = MyClass; - function F(func) { } + function F(func) { + } Test.F = F; })(Test || (Test = {})); var func; diff --git a/tests/baselines/reference/constructorAsType.js b/tests/baselines/reference/constructorAsType.js index 9f8c14ce743..d2029e5899f 100644 --- a/tests/baselines/reference/constructorAsType.js +++ b/tests/baselines/reference/constructorAsType.js @@ -6,6 +6,10 @@ var Person2:{new() : {name:string;};}; Person = Person2; //// [constructorAsType.js] -var Person = function () { return { name: "joe" }; }; +var Person = function () { + return { + name: "joe" + }; +}; var Person2; Person = Person2; diff --git a/tests/baselines/reference/constructorOverloads1.js b/tests/baselines/reference/constructorOverloads1.js index 97f33dca862..6f834d0bf6d 100644 --- a/tests/baselines/reference/constructorOverloads1.js +++ b/tests/baselines/reference/constructorOverloads1.js @@ -25,13 +25,19 @@ f1.bar2(); var Foo = (function () { function Foo(x) { } - Foo.prototype.bar1 = function () { }; - Foo.prototype.bar2 = 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); -var f4 = new Foo([f1, f2, f3]); +var f4 = new Foo([ + f1, + f2, + f3 +]); f1.bar1(); f1.bar2(); diff --git a/tests/baselines/reference/constructorOverloads2.js b/tests/baselines/reference/constructorOverloads2.js index e3eae0ed5a9..753eca4a1fb 100644 --- a/tests/baselines/reference/constructorOverloads2.js +++ b/tests/baselines/reference/constructorOverloads2.js @@ -35,7 +35,8 @@ var __extends = this.__extends || function (d, b) { var FooBase = (function () { function FooBase(x) { } - FooBase.prototype.bar1 = function () { }; + FooBase.prototype.bar1 = function () { + }; return FooBase; })(); var Foo = (function (_super) { @@ -43,11 +44,16 @@ var Foo = (function (_super) { function Foo(x, y) { _super.call(this, x); } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(FooBase); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); -var f4 = new Foo([f1, f2, f3]); +var f4 = new Foo([ + f1, + f2, + f3 +]); f1.bar1(); diff --git a/tests/baselines/reference/constructorOverloads3.js b/tests/baselines/reference/constructorOverloads3.js index c54226745c2..382a7cd8913 100644 --- a/tests/baselines/reference/constructorOverloads3.js +++ b/tests/baselines/reference/constructorOverloads3.js @@ -33,11 +33,16 @@ var Foo = (function (_super) { __extends(Foo, _super); function Foo(x, y) { } - Foo.prototype.bar1 = function () { }; + Foo.prototype.bar1 = function () { + }; return Foo; })(FooBase); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); -var f4 = new Foo([f1, f2, f3]); +var f4 = new Foo([ + f1, + f2, + f3 +]); f1.bar1(); diff --git a/tests/baselines/reference/constructorOverloads6.js b/tests/baselines/reference/constructorOverloads6.js index 1996449165c..aef68fcd863 100644 --- a/tests/baselines/reference/constructorOverloads6.js +++ b/tests/baselines/reference/constructorOverloads6.js @@ -28,5 +28,9 @@ f1.bar1(); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); -var f4 = new Foo([f1, f2, f3]); +var f4 = new Foo([ + f1, + f2, + f3 +]); f1.bar1(); diff --git a/tests/baselines/reference/constructorOverloads7.js b/tests/baselines/reference/constructorOverloads7.js index 5b7e407e806..b7e152c66e1 100644 --- a/tests/baselines/reference/constructorOverloads7.js +++ b/tests/baselines/reference/constructorOverloads7.js @@ -34,4 +34,6 @@ function Point(x, y) { this.y = y; return this; } -function EF1(a, b) { return a + b; } +function EF1(a, b) { + return a + b; +} diff --git a/tests/baselines/reference/constructorParametersInVariableDeclarations.js b/tests/baselines/reference/constructorParametersInVariableDeclarations.js index 984c8c392b1..3528a9574af 100644 --- a/tests/baselines/reference/constructorParametersInVariableDeclarations.js +++ b/tests/baselines/reference/constructorParametersInVariableDeclarations.js @@ -20,16 +20,24 @@ class B { var A = (function () { function A(x) { this.a = x; - this.b = { p: x }; - this.c = function () { return x; }; + this.b = { + p: x + }; + this.c = function () { + return x; + }; } return A; })(); var B = (function () { function B() { this.a = x; - this.b = { p: x }; - this.c = function () { return x; }; + this.b = { + p: x + }; + this.c = function () { + return x; + }; var x = 1; } return B; diff --git a/tests/baselines/reference/constructorReturnsInvalidType.js b/tests/baselines/reference/constructorReturnsInvalidType.js index 7f6119cc8bd..92afb41a3fe 100644 --- a/tests/baselines/reference/constructorReturnsInvalidType.js +++ b/tests/baselines/reference/constructorReturnsInvalidType.js @@ -14,7 +14,8 @@ var X = (function () { function X() { return 1; } - X.prototype.foo = function () { }; + X.prototype.foo = function () { + }; return X; })(); var x = new X(); diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.js b/tests/baselines/reference/constructorWithAssignableReturnExpression.js index 238f2e18aea..b56e63e8e4e 100644 --- a/tests/baselines/reference/constructorWithAssignableReturnExpression.js +++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.js @@ -51,19 +51,25 @@ var D = (function () { })(); var E = (function () { function E() { - return { x: 1 }; + return { + x: 1 + }; } return E; })(); var F = (function () { function F() { - return { x: 1 }; // error + return { + x: 1 + }; // error } return F; })(); var G = (function () { function G() { - return { x: null }; + return { + x: null + }; } return G; })(); diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 16e936620d0..566213887f4 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -314,11 +314,10 @@ var TypeScriptAllInOne; Program.prototype.if = function (retValue) { if (retValue === void 0) { retValue = != 0; } return 1; - ^ retValue; + ^ retValue; bfs.TYPES(); if (retValue != 0) { - return 1 && - ; + return 1 && ; } retValue = bfs.OPERATOR; ' );; @@ -349,8 +348,7 @@ var BasicFeatures = (function () { BasicFeatures.prototype.VARIABLES = function () { var local = Number.MAX_VALUE; var min = Number.MIN_VALUE; - var inf = Number.NEGATIVE_INFINITY - - ; + var inf = Number.NEGATIVE_INFINITY - ; var nan = Number.NaN; var undef = undefined; var _\uD4A5\u7204\uC316, uE59F = local; @@ -359,16 +357,22 @@ var BasicFeatures = (function () { var local6 = local5 instanceof fs.File; var hex = 0xBADC0DE, Hex = 0XDEADBEEF; var float = 6.02e23, float2 = 6.02E-23; - var char = 'c', \u0066 = '\u0066', hexchar = '\x42' != - ; + var char = 'c', \u0066 = '\u0066', hexchar = '\x42' != ; var quoted = '"', quoted2 = "'"; var reg = /\w*/; - var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, instanceof: function () { return 'objLit{42}'; } }; + var objLit = { + "var": number = 42, + equals: function (x) { + return x["var"] === 42; + }, + instanceof: function () { + return 'objLit{42}'; + } + }; var weekday = 0 /* Monday */; var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday; // - var any = 0 ^= - ; + var any = 0 ^= ; var bool = 0; var declare = 0; var constructor = 0; @@ -384,8 +388,7 @@ var BasicFeatures = (function () { var public = 0; var set = 0; var static = 0; - var string = 0 / > - ; + var string = 0 / > ; var yield = 0; var sum3 = any + bool + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield; return 0; @@ -411,18 +414,24 @@ var BasicFeatures = (function () { default: break; } - for (var x in { x: 0, y: 1 }) { + for (var x in { + x: 0, + y: 1 + }) { !; try { throw null; } - catch (Exception) { } + catch (Exception) { + } } try { } finally { - try { } - catch (Exception) { } + try { + } + catch (Exception) { + } } return retVal; }; @@ -435,13 +444,17 @@ var BasicFeatures = (function () { var c = new CLASS(); var xx = c; retVal += ; - try { } - catch () { } + try { + } + catch () { + } Property; retVal += c.Member(); retVal += xx.Foo() ? 0 : 1; //anonymous type - var anony = { a: new CLASS() }; + var anony = { + a: new CLASS() + }; retVal += anony.a.d(); return retVal; }; @@ -450,7 +463,13 @@ var BasicFeatures = (function () { ///// ///// BasicFeatures.prototype.OPERATOR = function () { - var a = [1, 2, 3, 4, 5,]; /*[] bug*/ // YES [] + var a = [ + 1, + 2, + 3, + 4, + 5, + ]; /*[] bug*/ // YES [] var i = a[1]; /*[]*/ i = i + i - i * i / i % i & i | i ^ i; /*+ - * / % & | ^*/ var b = true && false || true ^ false; /*& | ^*/ @@ -486,10 +505,15 @@ var BasicFeatures = (function () { })(); var CLASS = (function () { function CLASS() { - this.d = function () { yield; 0; }; + this.d = function () { + yield; + 0; + }; } Object.defineProperty(CLASS.prototype, "Property", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); @@ -497,10 +521,11 @@ var CLASS = (function () { return 0; }; CLASS.prototype.Foo = function () { - var myEvent = function () { return 1; }; + var myEvent = function () { + return 1; + }; if (myEvent() == 1) - return true ? - : ; + return true ? : ; else return false; }; @@ -542,10 +567,10 @@ while () : string, ; rest: string[]; { - & - public; + & public; DefaultValue(value ? : string = "Hello"); - { } + { + } } var Weekdays; (function (Weekdays) { diff --git a/tests/baselines/reference/contextualSignatureInstantiation1.js b/tests/baselines/reference/contextualSignatureInstantiation1.js index 843ac5140f0..a9abab149bb 100644 --- a/tests/baselines/reference/contextualSignatureInstantiation1.js +++ b/tests/baselines/reference/contextualSignatureInstantiation1.js @@ -8,7 +8,11 @@ var e2 = (x: string, y?: K) => x.length; var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number } //// [contextualSignatureInstantiation1.js] -var e = function (x, y) { return x.length; }; +var e = function (x, y) { + return x.length; +}; var r99 = map(e); // should be {}[] for S since a generic lambda is not inferentially typed -var e2 = function (x, y) { return x.length; }; +var e2 = function (x, y) { + return x.length; +}; var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number } diff --git a/tests/baselines/reference/contextualSignatureInstantiation2.js b/tests/baselines/reference/contextualSignatureInstantiation2.js index 78bc5a88856..8b29b432ce6 100644 --- a/tests/baselines/reference/contextualSignatureInstantiation2.js +++ b/tests/baselines/reference/contextualSignatureInstantiation2.js @@ -8,6 +8,12 @@ var r23 = dot(id)(id); //// [contextualSignatureInstantiation2.js] // dot f g x = f(g(x)) var dot; -dot = function (f) { return function (g) { return function (x) { return f(g(x)); }; }; }; +dot = function (f) { + return function (g) { + return function (x) { + return f(g(x)); + }; + }; +}; var id; var r23 = dot(id)(id); diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.js b/tests/baselines/reference/contextualSignatureInstantiation3.js index 9198a02ccda..ccc5e584368 100644 --- a/tests/baselines/reference/contextualSignatureInstantiation3.js +++ b/tests/baselines/reference/contextualSignatureInstantiation3.js @@ -31,9 +31,15 @@ function identity(x) { return x; } function singleton(x) { - return [x]; + return [ + x + ]; } -var xs = [1, 2, 3]; +var xs = [ + 1, + 2, + 3 +]; // Have compiler check that we get the correct types var v1; var v1 = xs.map(identity); // Error if not number[] diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js index 726d45bffe5..bd76a746ac9 100644 --- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js +++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js @@ -8,7 +8,9 @@ var x = h("", f()); // Call should succeed and x should be string. All t //// [contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js] function f() { - function g(u) { return null; } + function g(u) { + return null; + } return g; } var h; diff --git a/tests/baselines/reference/contextualTypeAny.js b/tests/baselines/reference/contextualTypeAny.js index a88b353a890..1a3918ba0d2 100644 --- a/tests/baselines/reference/contextualTypeAny.js +++ b/tests/baselines/reference/contextualTypeAny.js @@ -7,5 +7,11 @@ var arr: number[] = ["", x]; //// [contextualTypeAny.js] var x; -var obj = { p: "", q: x }; -var arr = ["", x]; +var obj = { + p: "", + q: x +}; +var arr = [ + "", + x +]; diff --git a/tests/baselines/reference/contextualTypeAppliedToVarArgs.js b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js index 77ce90ec737..c4e78318a9c 100644 --- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.js +++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js @@ -18,7 +18,8 @@ class Foo{ //// [contextualTypeAppliedToVarArgs.js] function delegate(instance, method, data) { - return function () { }; + return function () { + }; } var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.js b/tests/baselines/reference/contextualTypeArrayReturnType.js index adc568d5230..d84b93ec953 100644 --- a/tests/baselines/reference/contextualTypeArrayReturnType.js +++ b/tests/baselines/reference/contextualTypeArrayReturnType.js @@ -24,7 +24,9 @@ var style: IBookStyle = { var style = { initialLeftPageTransforms: function (width) { return [ - { 'ry': null } + { + 'ry': null + } ]; } }; diff --git a/tests/baselines/reference/contextualTypeWithTuple.js b/tests/baselines/reference/contextualTypeWithTuple.js index cfcdd13f7d0..d5c8fa83874 100644 --- a/tests/baselines/reference/contextualTypeWithTuple.js +++ b/tests/baselines/reference/contextualTypeWithTuple.js @@ -27,11 +27,36 @@ numStrTuple = unionTuple3; //// [contextualTypeWithTuple.js] // no error -var numStrTuple = [5, "hello"]; -var numStrTuple2 = [5, "foo", true]; -var numStrBoolTuple = [5, "foo", true]; -var objNumTuple = [{ a: "world" }, 5]; -var strTupleTuple = ["bar", [5, { x: 1, y: 1 }]]; +var numStrTuple = [ + 5, + "hello" +]; +var numStrTuple2 = [ + 5, + "foo", + true +]; +var numStrBoolTuple = [ + 5, + "foo", + true +]; +var objNumTuple = [ + { + a: "world" + }, + 5 +]; +var strTupleTuple = [ + "bar", + [ + 5, + { + x: 1, + y: 1 + } + ] +]; var C = (function () { function C() { } @@ -42,16 +67,36 @@ var D = (function () { } return D; })(); -var unionTuple = [new C(), "foo"]; -var unionTuple1 = [new C(), "foo"]; -var unionTuple2 = [new C(), "foo", new D()]; -var unionTuple3 = [10, "foo"]; +var unionTuple = [ + new C(), + "foo" +]; +var unionTuple1 = [ + new C(), + "foo" +]; +var unionTuple2 = [ + new C(), + "foo", + new D() +]; +var unionTuple3 = [ + 10, + "foo" +]; numStrTuple = numStrTuple2; numStrTuple = numStrBoolTuple; // error -objNumTuple = [{}, 5]; +objNumTuple = [ + {}, + 5 +]; numStrBoolTuple = numStrTuple; -var strStrTuple = ["foo", "bar", 5]; +var strStrTuple = [ + "foo", + "bar", + 5 +]; unionTuple = unionTuple1; unionTuple = unionTuple2; unionTuple2 = unionTuple; diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js index e29d4720cbc..9daf108f1cd 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js +++ b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js @@ -40,11 +40,21 @@ var x4: IWithCallSignatures | IWithCallSignatures4 = a => /*here a should be any //When used as a contextual type, a union type U has those members that are present in any of // its constituent types, with types that are unions of the respective members in the constituent types. // With no call signature | callSignatures -var x = function (a) { return a.toString(); }; +var x = function (a) { + return a.toString(); +}; // With call signatures with different return type -var x2 = function (a) { return a.toString(); }; // Like iWithCallSignatures -var x2 = function (a) { return a; }; // Like iWithCallSignatures2 +var x2 = function (a) { + return a.toString(); +}; // Like iWithCallSignatures +var x2 = function (a) { + return a; +}; // Like iWithCallSignatures2 // With call signatures of mismatching parameter type -var x3 = function (a) { return a.toString(); }; +var x3 = function (a) { + return a.toString(); +}; // With call signature count mismatch -var x4 = function (a) { return a.toString(); }; +var x4 = function (a) { + return a.toString(); +}; diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.js b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.js index 2c07f461424..7dfcb683010 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.js +++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.js @@ -65,16 +65,52 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; // Let S be the set of types in U that has a string index signature. // If S is not empty, U has a string index signature of a union type of // the types of the string index signatures from each type in S. -var x = { z: function (a) { return a; } }; // a should be number -var x = { foo: function (a) { return a; } }; // a should be any -var x = { foo: "hello" }; -var x2 = { z: function (a) { return a.toString(); } }; // a should be number -var x2 = { z: function (a) { return a; } }; // a should be number +var x = { + z: function (a) { + return a; + } +}; // a should be number +var x = { + foo: function (a) { + return a; + } +}; // a should be any +var x = { + foo: "hello" +}; +var x2 = { + z: function (a) { + return a.toString(); + } +}; // a should be number +var x2 = { + z: function (a) { + return a; + } +}; // a should be number // Let S be the set of types in U that has a numeric index signature. // If S is not empty, U has a numeric index signature of a union type of // the types of the numeric index signatures from each type in S. -var x3 = { 1: function (a) { return a; } }; // a should be number -var x3 = { 0: function (a) { return a; } }; // a should be any -var x3 = { 0: "hello" }; -var x4 = { 1: function (a) { return a.toString(); } }; // a should be number -var x4 = { 1: function (a) { return a; } }; // a should be number +var x3 = { + 1: function (a) { + return a; + } +}; // a should be number +var x3 = { + 0: function (a) { + return a; + } +}; // a should be any +var x3 = { + 0: "hello" +}; +var x4 = { + 1: function (a) { + return a.toString(); + } +}; // a should be number +var x4 = { + 1: function (a) { + return a; + } +}; // a should be number diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js index 10672d86796..7fd30a635a8 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js +++ b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.js @@ -128,49 +128,94 @@ var i1Ori2 = i1; var i1Ori2 = i2; var i1Ori2 = { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI1: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI1: function (a) { + return a; + }, propertyOnlyInI1: "Hello" }; var i1Ori2 = { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI2: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI2: function (a) { + return a; + }, propertyOnlyInI2: "Hello" }; var i1Ori2 = { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI1: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI1: function (a) { + return a; + }, propertyOnlyInI1: "Hello", - methodOnlyInI2: function (a) { return a; }, + methodOnlyInI2: function (a) { + return a; + }, propertyOnlyInI2: "Hello" }; -var arrayI1OrI2 = [i1, i2, { +var arrayI1OrI2 = [ + i1, + i2, + { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI1: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI1: function (a) { + return a; + }, propertyOnlyInI1: "Hello" }, { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI2: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI2: function (a) { + return a; + }, propertyOnlyInI2: "Hello" - }, { + }, + { commonPropertyType: "hello", - commonMethodType: function (a) { return a; }, - commonMethodWithTypeParameter: function (a) { return a; }, - methodOnlyInI1: function (a) { return a; }, + commonMethodType: function (a) { + return a; + }, + commonMethodWithTypeParameter: function (a) { + return a; + }, + methodOnlyInI1: function (a) { + return a; + }, propertyOnlyInI1: "Hello", - methodOnlyInI2: function (a) { return a; }, + methodOnlyInI2: function (a) { + return a; + }, propertyOnlyInI2: "Hello" - }]; + } +]; var i11; var i21; var i11Ori21 = i11; @@ -191,18 +236,24 @@ var i11Ori21 = { }, commonPropertyDifferentType: 10 }; -var arrayOrI11OrI21 = [i11, i21, i11 || i21, { +var arrayOrI11OrI21 = [ + i11, + i21, + i11 || i21, + { // Like i1 commonMethodDifferentReturnType: function (a, b) { var z = a.charAt(b); return z; }, commonPropertyDifferentType: "hello" - }, { + }, + { // Like i2 commonMethodDifferentReturnType: function (a, b) { var z = a.charCodeAt(b); return z; }, commonPropertyDifferentType: 10 - }]; + } +]; diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js index dc8f07823b6..d58b497a18d 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js +++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.js @@ -79,7 +79,9 @@ var objStrOrNum3 = { var objStrOrNum4 = { prop: strOrNumber }; -var objStrOrNum5 = { prop: strOrNumber }; +var objStrOrNum5 = { + prop: strOrNumber +}; var objStrOrNum6 = { prop: strOrNumber, anotherP: str @@ -111,5 +113,7 @@ var i11Ori21 = { }; var strOrNumber; var i11Ori21 = { - commonMethodDifferentReturnType: function (a, b) { return strOrNumber; } + commonMethodDifferentReturnType: function (a, b) { + return strOrNumber; + } }; diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js index 75b98b16c33..b4c565c5091 100644 --- a/tests/baselines/reference/contextualTyping.js +++ b/tests/baselines/reference/contextualTyping.js @@ -249,24 +249,48 @@ var C2T5; }; })(C2T5 || (C2T5 = {})); // CONTEXT: Variable declaration -var c3t1 = (function (s) { return s; }); +var c3t1 = (function (s) { + return s; +}); var c3t2 = ({ n: 1 }); var c3t3 = []; -var c3t4 = function () { return ({}); }; -var c3t5 = function (n) { return ({}); }; -var c3t6 = function (n, s) { return ({}); }; -var c3t7 = function (n) { return n; }; -var c3t8 = function (n) { return n; }; -var c3t9 = [[], []]; -var c3t10 = [({}), ({})]; -var c3t11 = [function (n, s) { return s; }]; +var c3t4 = function () { + return ({}); +}; +var c3t5 = function (n) { + return ({}); +}; +var c3t6 = function (n, s) { + return ({}); +}; +var c3t7 = function (n) { + return n; +}; +var c3t8 = function (n) { + return n; +}; +var c3t9 = [ + [], + [] +]; +var c3t10 = [ + ({}), + ({}) +]; +var c3t11 = [ + function (n, s) { + return s; + } +]; var c3t12 = { foo: ({}) }; var c3t13 = ({ - f: function (i, s) { return s; } + f: function (i, s) { + return s; + } }); var c3t14 = ({ a: [] @@ -290,41 +314,74 @@ var C5T5; })(C5T5 || (C5T5 = {})); // CONTEXT: Variable assignment var c6t5; -c6t5 = function (n) { return ({}); }; +c6t5 = function (n) { + return ({}); +}; // CONTEXT: Array index assignment var c7t2; -c7t2[0] = ({ n: 1 }); +c7t2[0] = ({ + n: 1 +}); var objc8 = ({}); -objc8.t1 = (function (s) { return s; }); +objc8.t1 = (function (s) { + return s; +}); objc8.t2 = ({ n: 1 }); objc8.t3 = []; -objc8.t4 = function () { return ({}); }; -objc8.t5 = function (n) { return ({}); }; -objc8.t6 = function (n, s) { return ({}); }; -objc8.t7 = function (n) { return n; }; -objc8.t8 = function (n) { return n; }; -objc8.t9 = [[], []]; -objc8.t10 = [({}), ({})]; -objc8.t11 = [function (n, s) { return s; }]; +objc8.t4 = function () { + return ({}); +}; +objc8.t5 = function (n) { + return ({}); +}; +objc8.t6 = function (n, s) { + return ({}); +}; +objc8.t7 = function (n) { + return n; +}; +objc8.t8 = function (n) { + return n; +}; +objc8.t9 = [ + [], + [] +]; +objc8.t10 = [ + ({}), + ({}) +]; +objc8.t11 = [ + function (n, s) { + return s; + } +]; objc8.t12 = { foo: ({}) }; objc8.t13 = ({ - f: function (i, s) { return s; } + f: function (i, s) { + return s; + } }); objc8.t14 = ({ a: [] }); // CONTEXT: Function call -function c9t5(f) { } +function c9t5(f) { +} ; c9t5(function (n) { return ({}); }); // CONTEXT: Return statement -var c10t5 = function () { return function (n) { return ({}); }; }; +var c10t5 = function () { + return function (n) { + return ({}); + }; +}; // CONTEXT: Newing a class var C11t5 = (function () { function C11t5(f) { @@ -332,31 +389,59 @@ var C11t5 = (function () { return C11t5; })(); ; -var i = new C11t5(function (n) { return ({}); }); +var i = new C11t5(function (n) { + return ({}); +}); // CONTEXT: Type annotated expression -var c12t1 = (function (s) { return s; }); +var c12t1 = (function (s) { + return s; +}); var c12t2 = ({ n: 1 }); var c12t3 = []; -var c12t4 = function () { return ({}); }; -var c12t5 = function (n) { return ({}); }; -var c12t6 = function (n, s) { return ({}); }; -var c12t7 = function (n) { return n; }; -var c12t8 = function (n) { return n; }; -var c12t9 = [[], []]; -var c12t10 = [({}), ({})]; -var c12t11 = [function (n, s) { return s; }]; +var c12t4 = function () { + return ({}); +}; +var c12t5 = function (n) { + return ({}); +}; +var c12t6 = function (n, s) { + return ({}); +}; +var c12t7 = function (n) { + return n; +}; +var c12t8 = function (n) { + return n; +}; +var c12t9 = [ + [], + [] +]; +var c12t10 = [ + ({}), + ({}) +]; +var c12t11 = [ + function (n, s) { + return s; + } +]; var c12t12 = { foo: ({}) }; var c12t13 = ({ - f: function (i, s) { return s; } + f: function (i, s) { + return s; + } }); var c12t14 = ({ a: [] }); -function EF1(a, b) { return a + b; } +function EF1(a, b) { + return a + b; +} var efv = EF1(1, 2); function Point(x, y) { this.x = x; diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map index a8835dc965d..0b38517f9cc 100644 --- a/tests/baselines/reference/contextualTyping.js.map +++ b/tests/baselines/reference/contextualTyping.js.map @@ -1,2 +1,2 @@ //// [contextualTyping.js.map] -{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","c9t5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAaA,AADA,sCAAsC;;IACtCA;QACIC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAGD,AADA,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAGD,AADA,gCAAgC;IAC5B,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAGF,AADA,qCAAqC;;IAGjCC;QACIC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAGD,AADA,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAGD,AADA,+BAA+B;IAC3B,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAG9D,AADA,kCAAkC;IAC9B,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;cACX,CAAsB,IAAGC,CAACA;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAGH,AADA,4BAA4B;IACxB,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAG/F,AADA,0BAA0B;;IACZC,eAAYA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAGrD,AADA,qCAAqC;IACjC,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA,CAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file +{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","c9t5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAaA,AADA,sCAAsC;;IACtCA;QACIC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAGD,AADA,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAGD,AADA,gCAAgC;IAC5B,IAAI,GAA0B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe;IAAC,EAAE;IAAC,EAAE;CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW;IAAO,CAAC,EAAE,CAAC;IAAO,CAAC,EAAE,CAAC;CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC;IAAC,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAGF,AADA,qCAAqC;;IAGjCC;QACIC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAGD,AADA,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAGD,AADA,+BAA+B;IAC3B,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAG9D,AADA,kCAAkC;IAC9B,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC;IAAC,CAAC,EAAE,CAAC;CAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG;IAAC,EAAE;IAAC,EAAE;CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG;IAAO,CAAC,EAAE,CAAC;IAAO,CAAC,EAAE,CAAC;CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG;IAAC,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;cACX,CAAsB;AAAGC,CAACA;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAGH,AADA,4BAA4B;IACxB,KAAK,GAA8B;IAAa,MAAM,CAAC,UAAS,CAAC;QAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;IAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAG/F,AADA,0BAA0B;;IACZC,eAAYA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAGrD,AADA,qCAAqC;IACjC,KAAK,GAA2B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB;IAAC,EAAE;IAAC,EAAE;CAAC,CAAC;AACjC,IAAI,MAAM,GAAY;IAAO,CAAC,EAAE,CAAC;IAAO,CAAC,EAAE,CAAC;CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC;IAAC,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC;IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA;AAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index 085f6a439ff..225aa3285ff 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/tests/baselines/reference/contextualTyping.sourcemap.txt @@ -259,7 +259,6 @@ sourceFile:contextualTyping.ts 1-> 2 > 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^-> 1-> > >// CONTEXT: Variable declaration @@ -270,71 +269,76 @@ sourceFile:contextualTyping.ts 2 >Emitted(17, 1) Source(27, 1) + SourceIndex(0) 3 >Emitted(17, 33) Source(27, 33) + SourceIndex(0) --- ->>>var c3t1 = (function (s) { return s; }); -1->^^^^ +>>>var c3t1 = (function (s) { +1 >^^^^ 2 > ^^^^ 3 > ^^^ 4 > ^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -1-> +1 > >var 2 > c3t1 3 > : (s: string) => string = 4 > ( 5 > function( 6 > s -7 > ) { -8 > return -9 > -10> s -11> -12> -13> } -14> ) -15> ; -1->Emitted(18, 5) Source(28, 5) + SourceIndex(0) +1 >Emitted(18, 5) Source(28, 5) + SourceIndex(0) 2 >Emitted(18, 9) Source(28, 9) + SourceIndex(0) 3 >Emitted(18, 12) Source(28, 35) + SourceIndex(0) 4 >Emitted(18, 13) Source(28, 36) + SourceIndex(0) 5 >Emitted(18, 23) Source(28, 45) + SourceIndex(0) 6 >Emitted(18, 24) Source(28, 46) + SourceIndex(0) -7 >Emitted(18, 28) Source(28, 50) + SourceIndex(0) -8 >Emitted(18, 34) Source(28, 56) + SourceIndex(0) -9 >Emitted(18, 35) Source(28, 57) + SourceIndex(0) -10>Emitted(18, 36) Source(28, 58) + SourceIndex(0) -11>Emitted(18, 37) Source(28, 58) + SourceIndex(0) -12>Emitted(18, 38) Source(28, 59) + SourceIndex(0) -13>Emitted(18, 39) Source(28, 60) + SourceIndex(0) -14>Emitted(18, 40) Source(28, 61) + SourceIndex(0) -15>Emitted(18, 41) Source(28, 62) + SourceIndex(0) +--- +>>> return s; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > +1 >Emitted(19, 5) Source(28, 50) + SourceIndex(0) +2 >Emitted(19, 11) Source(28, 56) + SourceIndex(0) +3 >Emitted(19, 12) Source(28, 57) + SourceIndex(0) +4 >Emitted(19, 13) Source(28, 58) + SourceIndex(0) +5 >Emitted(19, 14) Source(28, 58) + SourceIndex(0) +--- +>>>}); +1 > +2 >^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^^-> +1 > +2 >} +3 > ) +4 > ; +1 >Emitted(20, 1) Source(28, 59) + SourceIndex(0) +2 >Emitted(20, 2) Source(28, 60) + SourceIndex(0) +3 >Emitted(20, 3) Source(28, 61) + SourceIndex(0) +4 >Emitted(20, 4) Source(28, 62) + SourceIndex(0) --- >>>var c3t2 = ({ -1 > +1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ 5 > ^ -1 > +1-> > 2 >var 3 > c3t2 4 > = 5 > ( -1 >Emitted(19, 1) Source(29, 1) + SourceIndex(0) -2 >Emitted(19, 5) Source(29, 5) + SourceIndex(0) -3 >Emitted(19, 9) Source(29, 9) + SourceIndex(0) -4 >Emitted(19, 12) Source(29, 18) + SourceIndex(0) -5 >Emitted(19, 13) Source(29, 19) + SourceIndex(0) +1->Emitted(21, 1) Source(29, 1) + SourceIndex(0) +2 >Emitted(21, 5) Source(29, 5) + SourceIndex(0) +3 >Emitted(21, 9) Source(29, 9) + SourceIndex(0) +4 >Emitted(21, 12) Source(29, 18) + SourceIndex(0) +5 >Emitted(21, 13) Source(29, 19) + SourceIndex(0) --- >>> n: 1 1 >^^^^ @@ -346,10 +350,10 @@ sourceFile:contextualTyping.ts 2 > n 3 > : 4 > 1 -1 >Emitted(20, 5) Source(30, 5) + SourceIndex(0) -2 >Emitted(20, 6) Source(30, 6) + SourceIndex(0) -3 >Emitted(20, 8) Source(30, 8) + SourceIndex(0) -4 >Emitted(20, 9) Source(30, 9) + SourceIndex(0) +1 >Emitted(22, 5) Source(30, 5) + SourceIndex(0) +2 >Emitted(22, 6) Source(30, 6) + SourceIndex(0) +3 >Emitted(22, 8) Source(30, 8) + SourceIndex(0) +4 >Emitted(22, 9) Source(30, 9) + SourceIndex(0) --- >>>}); 1 >^ @@ -360,9 +364,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(21, 2) Source(31, 2) + SourceIndex(0) -2 >Emitted(21, 3) Source(31, 3) + SourceIndex(0) -3 >Emitted(21, 4) Source(31, 3) + SourceIndex(0) +1 >Emitted(23, 2) Source(31, 2) + SourceIndex(0) +2 >Emitted(23, 3) Source(31, 3) + SourceIndex(0) +3 >Emitted(23, 4) Source(31, 3) + SourceIndex(0) --- >>>var c3t3 = []; 1-> @@ -371,7 +375,7 @@ sourceFile:contextualTyping.ts 4 > ^^^ 5 > ^^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^-> 1-> > 2 >var @@ -379,77 +383,71 @@ sourceFile:contextualTyping.ts 4 > : number[] = 5 > [] 6 > ; -1->Emitted(22, 1) Source(32, 1) + SourceIndex(0) -2 >Emitted(22, 5) Source(32, 5) + SourceIndex(0) -3 >Emitted(22, 9) Source(32, 9) + SourceIndex(0) -4 >Emitted(22, 12) Source(32, 22) + SourceIndex(0) -5 >Emitted(22, 14) Source(32, 24) + SourceIndex(0) -6 >Emitted(22, 15) Source(32, 25) + SourceIndex(0) +1->Emitted(24, 1) Source(32, 1) + SourceIndex(0) +2 >Emitted(24, 5) Source(32, 5) + SourceIndex(0) +3 >Emitted(24, 9) Source(32, 9) + SourceIndex(0) +4 >Emitted(24, 12) Source(32, 22) + SourceIndex(0) +5 >Emitted(24, 14) Source(32, 24) + SourceIndex(0) +6 >Emitted(24, 15) Source(32, 25) + SourceIndex(0) --- ->>>var c3t4 = function () { return ({}); }; +>>>var c3t4 = function () { 1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^^^^ -7 > ^ -8 > ^ -9 > ^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^^-> +5 > ^^^^^^-> 1-> > 2 >var 3 > c3t4 4 > : () => IFoo = -5 > function() { -6 > return -7 > -8 > ( -9 > {} -10> ) -11> -12> -13> } -14> ; -1->Emitted(23, 1) Source(33, 1) + SourceIndex(0) -2 >Emitted(23, 5) Source(33, 5) + SourceIndex(0) -3 >Emitted(23, 9) Source(33, 9) + SourceIndex(0) -4 >Emitted(23, 12) Source(33, 24) + SourceIndex(0) -5 >Emitted(23, 26) Source(33, 37) + SourceIndex(0) -6 >Emitted(23, 32) Source(33, 43) + SourceIndex(0) -7 >Emitted(23, 33) Source(33, 50) + SourceIndex(0) -8 >Emitted(23, 34) Source(33, 51) + SourceIndex(0) -9 >Emitted(23, 36) Source(33, 53) + SourceIndex(0) -10>Emitted(23, 37) Source(33, 54) + SourceIndex(0) -11>Emitted(23, 38) Source(33, 54) + SourceIndex(0) -12>Emitted(23, 39) Source(33, 55) + SourceIndex(0) -13>Emitted(23, 40) Source(33, 56) + SourceIndex(0) -14>Emitted(23, 41) Source(33, 57) + SourceIndex(0) +1->Emitted(25, 1) Source(33, 1) + SourceIndex(0) +2 >Emitted(25, 5) Source(33, 5) + SourceIndex(0) +3 >Emitted(25, 9) Source(33, 9) + SourceIndex(0) +4 >Emitted(25, 12) Source(33, 24) + SourceIndex(0) --- ->>>var c3t5 = function (n) { return ({}); }; +>>> return ({}); +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1->function() { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1->Emitted(26, 5) Source(33, 37) + SourceIndex(0) +2 >Emitted(26, 11) Source(33, 43) + SourceIndex(0) +3 >Emitted(26, 12) Source(33, 50) + SourceIndex(0) +4 >Emitted(26, 13) Source(33, 51) + SourceIndex(0) +5 >Emitted(26, 15) Source(33, 53) + SourceIndex(0) +6 >Emitted(26, 16) Source(33, 54) + SourceIndex(0) +7 >Emitted(26, 17) Source(33, 54) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(27, 1) Source(33, 55) + SourceIndex(0) +2 >Emitted(27, 2) Source(33, 56) + SourceIndex(0) +3 >Emitted(27, 3) Source(33, 57) + SourceIndex(0) +--- +>>>var c3t5 = function (n) { 1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^^^^-> 1-> > 2 >var @@ -457,34 +455,49 @@ sourceFile:contextualTyping.ts 4 > : (n: number) => IFoo = 5 > function( 6 > n -7 > ) { -8 > return -9 > -10> ( -11> {} -12> ) -13> -14> -15> } -16> ; -1->Emitted(24, 1) Source(34, 1) + SourceIndex(0) -2 >Emitted(24, 5) Source(34, 5) + SourceIndex(0) -3 >Emitted(24, 9) Source(34, 9) + SourceIndex(0) -4 >Emitted(24, 12) Source(34, 33) + SourceIndex(0) -5 >Emitted(24, 22) Source(34, 42) + SourceIndex(0) -6 >Emitted(24, 23) Source(34, 43) + SourceIndex(0) -7 >Emitted(24, 27) Source(34, 47) + SourceIndex(0) -8 >Emitted(24, 33) Source(34, 53) + SourceIndex(0) -9 >Emitted(24, 34) Source(34, 60) + SourceIndex(0) -10>Emitted(24, 35) Source(34, 61) + SourceIndex(0) -11>Emitted(24, 37) Source(34, 63) + SourceIndex(0) -12>Emitted(24, 38) Source(34, 64) + SourceIndex(0) -13>Emitted(24, 39) Source(34, 64) + SourceIndex(0) -14>Emitted(24, 40) Source(34, 65) + SourceIndex(0) -15>Emitted(24, 41) Source(34, 66) + SourceIndex(0) -16>Emitted(24, 42) Source(34, 67) + SourceIndex(0) +1->Emitted(28, 1) Source(34, 1) + SourceIndex(0) +2 >Emitted(28, 5) Source(34, 5) + SourceIndex(0) +3 >Emitted(28, 9) Source(34, 9) + SourceIndex(0) +4 >Emitted(28, 12) Source(34, 33) + SourceIndex(0) +5 >Emitted(28, 22) Source(34, 42) + SourceIndex(0) +6 >Emitted(28, 23) Source(34, 43) + SourceIndex(0) --- ->>>var c3t6 = function (n, s) { return ({}); }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(29, 5) Source(34, 47) + SourceIndex(0) +2 >Emitted(29, 11) Source(34, 53) + SourceIndex(0) +3 >Emitted(29, 12) Source(34, 60) + SourceIndex(0) +4 >Emitted(29, 13) Source(34, 61) + SourceIndex(0) +5 >Emitted(29, 15) Source(34, 63) + SourceIndex(0) +6 >Emitted(29, 16) Source(34, 64) + SourceIndex(0) +7 >Emitted(29, 17) Source(34, 64) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(30, 1) Source(34, 65) + SourceIndex(0) +2 >Emitted(30, 2) Source(34, 66) + SourceIndex(0) +3 >Emitted(30, 3) Source(34, 67) + SourceIndex(0) +--- +>>>var c3t6 = function (n, s) { 1-> 2 >^^^^ 3 > ^^^^ @@ -493,16 +506,6 @@ sourceFile:contextualTyping.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^^ -10> ^^^^^^ -11> ^ -12> ^ -13> ^^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ 1-> > 2 >var @@ -512,52 +515,58 @@ sourceFile:contextualTyping.ts 6 > n 7 > , 8 > s -9 > ) { -10> return -11> -12> ( -13> {} -14> ) -15> -16> -17> } -18> ; -1->Emitted(25, 1) Source(35, 1) + SourceIndex(0) -2 >Emitted(25, 5) Source(35, 5) + SourceIndex(0) -3 >Emitted(25, 9) Source(35, 9) + SourceIndex(0) -4 >Emitted(25, 12) Source(35, 44) + SourceIndex(0) -5 >Emitted(25, 22) Source(35, 53) + SourceIndex(0) -6 >Emitted(25, 23) Source(35, 54) + SourceIndex(0) -7 >Emitted(25, 25) Source(35, 56) + SourceIndex(0) -8 >Emitted(25, 26) Source(35, 57) + SourceIndex(0) -9 >Emitted(25, 30) Source(35, 61) + SourceIndex(0) -10>Emitted(25, 36) Source(35, 67) + SourceIndex(0) -11>Emitted(25, 37) Source(35, 74) + SourceIndex(0) -12>Emitted(25, 38) Source(35, 75) + SourceIndex(0) -13>Emitted(25, 40) Source(35, 77) + SourceIndex(0) -14>Emitted(25, 41) Source(35, 78) + SourceIndex(0) -15>Emitted(25, 42) Source(35, 78) + SourceIndex(0) -16>Emitted(25, 43) Source(35, 79) + SourceIndex(0) -17>Emitted(25, 44) Source(35, 80) + SourceIndex(0) -18>Emitted(25, 45) Source(35, 81) + SourceIndex(0) +1->Emitted(31, 1) Source(35, 1) + SourceIndex(0) +2 >Emitted(31, 5) Source(35, 5) + SourceIndex(0) +3 >Emitted(31, 9) Source(35, 9) + SourceIndex(0) +4 >Emitted(31, 12) Source(35, 44) + SourceIndex(0) +5 >Emitted(31, 22) Source(35, 53) + SourceIndex(0) +6 >Emitted(31, 23) Source(35, 54) + SourceIndex(0) +7 >Emitted(31, 25) Source(35, 56) + SourceIndex(0) +8 >Emitted(31, 26) Source(35, 57) + SourceIndex(0) --- ->>>var c3t7 = function (n) { return n; }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(32, 5) Source(35, 61) + SourceIndex(0) +2 >Emitted(32, 11) Source(35, 67) + SourceIndex(0) +3 >Emitted(32, 12) Source(35, 74) + SourceIndex(0) +4 >Emitted(32, 13) Source(35, 75) + SourceIndex(0) +5 >Emitted(32, 15) Source(35, 77) + SourceIndex(0) +6 >Emitted(32, 16) Source(35, 78) + SourceIndex(0) +7 >Emitted(32, 17) Source(35, 78) + SourceIndex(0) +--- +>>>}; 1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(33, 1) Source(35, 79) + SourceIndex(0) +2 >Emitted(33, 2) Source(35, 80) + SourceIndex(0) +3 >Emitted(33, 3) Source(35, 81) + SourceIndex(0) +--- +>>>var c3t7 = function (n) { +1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^-> -1 > +1-> > 2 >var 3 > c3t7 @@ -567,44 +576,49 @@ sourceFile:contextualTyping.ts > } = 5 > function( 6 > n -7 > ) { -8 > return -9 > -10> n -11> ; -12> -13> } -14> ; -1 >Emitted(26, 1) Source(36, 1) + SourceIndex(0) -2 >Emitted(26, 5) Source(36, 5) + SourceIndex(0) -3 >Emitted(26, 9) Source(36, 9) + SourceIndex(0) -4 >Emitted(26, 12) Source(39, 5) + SourceIndex(0) -5 >Emitted(26, 22) Source(39, 14) + SourceIndex(0) -6 >Emitted(26, 23) Source(39, 15) + SourceIndex(0) -7 >Emitted(26, 27) Source(39, 19) + SourceIndex(0) -8 >Emitted(26, 33) Source(39, 25) + SourceIndex(0) -9 >Emitted(26, 34) Source(39, 26) + SourceIndex(0) -10>Emitted(26, 35) Source(39, 27) + SourceIndex(0) -11>Emitted(26, 36) Source(39, 28) + SourceIndex(0) -12>Emitted(26, 37) Source(39, 29) + SourceIndex(0) -13>Emitted(26, 38) Source(39, 30) + SourceIndex(0) -14>Emitted(26, 39) Source(39, 31) + SourceIndex(0) +1->Emitted(34, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(34, 5) Source(36, 5) + SourceIndex(0) +3 >Emitted(34, 9) Source(36, 9) + SourceIndex(0) +4 >Emitted(34, 12) Source(39, 5) + SourceIndex(0) +5 >Emitted(34, 22) Source(39, 14) + SourceIndex(0) +6 >Emitted(34, 23) Source(39, 15) + SourceIndex(0) --- ->>>var c3t8 = function (n) { return n; }; +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > ; +1 >Emitted(35, 5) Source(39, 19) + SourceIndex(0) +2 >Emitted(35, 11) Source(39, 25) + SourceIndex(0) +3 >Emitted(35, 12) Source(39, 26) + SourceIndex(0) +4 >Emitted(35, 13) Source(39, 27) + SourceIndex(0) +5 >Emitted(35, 14) Source(39, 28) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(36, 1) Source(39, 29) + SourceIndex(0) +2 >Emitted(36, 2) Source(39, 30) + SourceIndex(0) +3 >Emitted(36, 3) Source(39, 31) + SourceIndex(0) +--- +>>>var c3t8 = function (n) { 1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ 1-> > > @@ -613,181 +627,218 @@ sourceFile:contextualTyping.ts 4 > : (n: number, s: string) => number = 5 > function( 6 > n -7 > ) { -8 > return -9 > -10> n -11> ; -12> -13> } -14> ; -1->Emitted(27, 1) Source(41, 1) + SourceIndex(0) -2 >Emitted(27, 5) Source(41, 5) + SourceIndex(0) -3 >Emitted(27, 9) Source(41, 9) + SourceIndex(0) -4 >Emitted(27, 12) Source(41, 46) + SourceIndex(0) -5 >Emitted(27, 22) Source(41, 55) + SourceIndex(0) -6 >Emitted(27, 23) Source(41, 56) + SourceIndex(0) -7 >Emitted(27, 27) Source(41, 60) + SourceIndex(0) -8 >Emitted(27, 33) Source(41, 66) + SourceIndex(0) -9 >Emitted(27, 34) Source(41, 67) + SourceIndex(0) -10>Emitted(27, 35) Source(41, 68) + SourceIndex(0) -11>Emitted(27, 36) Source(41, 69) + SourceIndex(0) -12>Emitted(27, 37) Source(41, 70) + SourceIndex(0) -13>Emitted(27, 38) Source(41, 71) + SourceIndex(0) -14>Emitted(27, 39) Source(41, 72) + SourceIndex(0) +1->Emitted(37, 1) Source(41, 1) + SourceIndex(0) +2 >Emitted(37, 5) Source(41, 5) + SourceIndex(0) +3 >Emitted(37, 9) Source(41, 9) + SourceIndex(0) +4 >Emitted(37, 12) Source(41, 46) + SourceIndex(0) +5 >Emitted(37, 22) Source(41, 55) + SourceIndex(0) +6 >Emitted(37, 23) Source(41, 56) + SourceIndex(0) --- ->>>var c3t9 = [[], []]; +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > ; +1 >Emitted(38, 5) Source(41, 60) + SourceIndex(0) +2 >Emitted(38, 11) Source(41, 66) + SourceIndex(0) +3 >Emitted(38, 12) Source(41, 67) + SourceIndex(0) +4 >Emitted(38, 13) Source(41, 68) + SourceIndex(0) +5 >Emitted(38, 14) Source(41, 69) + SourceIndex(0) +--- +>>>}; 1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(39, 1) Source(41, 70) + SourceIndex(0) +2 >Emitted(39, 2) Source(41, 71) + SourceIndex(0) +3 >Emitted(39, 3) Source(41, 72) + SourceIndex(0) +--- +>>>var c3t9 = [ +1-> 2 >^^^^ 3 > ^^^^ 4 > ^^^ -5 > ^ -6 > ^^ -7 > ^^ -8 > ^^ -9 > ^ -10> ^ -11> ^^^^^^-> -1 > +1-> > 2 >var 3 > c3t9 4 > : number[][] = -5 > [ -6 > [] -7 > , -8 > [] -9 > ] -10> ; -1 >Emitted(28, 1) Source(42, 1) + SourceIndex(0) -2 >Emitted(28, 5) Source(42, 5) + SourceIndex(0) -3 >Emitted(28, 9) Source(42, 9) + SourceIndex(0) -4 >Emitted(28, 12) Source(42, 24) + SourceIndex(0) -5 >Emitted(28, 13) Source(42, 25) + SourceIndex(0) -6 >Emitted(28, 15) Source(42, 27) + SourceIndex(0) -7 >Emitted(28, 17) Source(42, 28) + SourceIndex(0) -8 >Emitted(28, 19) Source(42, 30) + SourceIndex(0) -9 >Emitted(28, 20) Source(42, 31) + SourceIndex(0) -10>Emitted(28, 21) Source(42, 32) + SourceIndex(0) +1->Emitted(40, 1) Source(42, 1) + SourceIndex(0) +2 >Emitted(40, 5) Source(42, 5) + SourceIndex(0) +3 >Emitted(40, 9) Source(42, 9) + SourceIndex(0) +4 >Emitted(40, 12) Source(42, 24) + SourceIndex(0) --- ->>>var c3t10 = [({}), ({})]; +>>> [], +1 >^^^^ +2 > ^^ +3 > ^-> +1 >[ +2 > [] +1 >Emitted(41, 5) Source(42, 25) + SourceIndex(0) +2 >Emitted(41, 7) Source(42, 27) + SourceIndex(0) +--- +>>> [] +1->^^^^ +2 > ^^ +1->, +2 > [] +1->Emitted(42, 5) Source(42, 28) + SourceIndex(0) +2 >Emitted(42, 7) Source(42, 30) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(43, 2) Source(42, 31) + SourceIndex(0) +2 >Emitted(43, 3) Source(42, 32) + SourceIndex(0) +--- +>>>var c3t10 = [ 1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^^ -10> ^ -11> ^^ -12> ^ -13> ^ -14> ^ -15> ^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >var 3 > c3t10 4 > : IFoo[] = -5 > [ -6 > ( -7 > {} -8 > ) -9 > , -10> ( -11> {} -12> ) -13> ] -14> ; -1->Emitted(29, 1) Source(43, 1) + SourceIndex(0) -2 >Emitted(29, 5) Source(43, 5) + SourceIndex(0) -3 >Emitted(29, 10) Source(43, 10) + SourceIndex(0) -4 >Emitted(29, 13) Source(43, 21) + SourceIndex(0) -5 >Emitted(29, 14) Source(43, 28) + SourceIndex(0) -6 >Emitted(29, 15) Source(43, 29) + SourceIndex(0) -7 >Emitted(29, 17) Source(43, 31) + SourceIndex(0) -8 >Emitted(29, 18) Source(43, 32) + SourceIndex(0) -9 >Emitted(29, 20) Source(43, 39) + SourceIndex(0) -10>Emitted(29, 21) Source(43, 40) + SourceIndex(0) -11>Emitted(29, 23) Source(43, 42) + SourceIndex(0) -12>Emitted(29, 24) Source(43, 43) + SourceIndex(0) -13>Emitted(29, 25) Source(43, 44) + SourceIndex(0) -14>Emitted(29, 26) Source(43, 45) + SourceIndex(0) +1->Emitted(44, 1) Source(43, 1) + SourceIndex(0) +2 >Emitted(44, 5) Source(43, 5) + SourceIndex(0) +3 >Emitted(44, 10) Source(43, 10) + SourceIndex(0) +4 >Emitted(44, 13) Source(43, 21) + SourceIndex(0) --- ->>>var c3t11 = [function (n, s) { return s; }]; +>>> ({}), +1 >^^^^ +2 > ^ +3 > ^^ +4 > ^ +5 > ^-> +1 >[ +2 > ( +3 > {} +4 > ) +1 >Emitted(45, 5) Source(43, 28) + SourceIndex(0) +2 >Emitted(45, 6) Source(43, 29) + SourceIndex(0) +3 >Emitted(45, 8) Source(43, 31) + SourceIndex(0) +4 >Emitted(45, 9) Source(43, 32) + SourceIndex(0) +--- +>>> ({}) +1->^^^^ +2 > ^ +3 > ^^ +4 > ^ +1->, +2 > ( +3 > {} +4 > ) +1->Emitted(46, 5) Source(43, 39) + SourceIndex(0) +2 >Emitted(46, 6) Source(43, 40) + SourceIndex(0) +3 >Emitted(46, 8) Source(43, 42) + SourceIndex(0) +4 >Emitted(46, 9) Source(43, 43) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(47, 2) Source(43, 44) + SourceIndex(0) +2 >Emitted(47, 3) Source(43, 45) + SourceIndex(0) +--- +>>>var c3t11 = [ 1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^ -7 > ^ -8 > ^^ -9 > ^ -10> ^^^^ -11> ^^^^^^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ +5 > ^^^^^^^^^^-> 1-> > 2 >var 3 > c3t11 4 > : {(n: number, s: string): string;}[] = -5 > [ -6 > function( -7 > n -8 > , -9 > s -10> ) { -11> return -12> -13> s -14> ; -15> -16> } -17> ] -18> ; -1->Emitted(30, 1) Source(44, 1) + SourceIndex(0) -2 >Emitted(30, 5) Source(44, 5) + SourceIndex(0) -3 >Emitted(30, 10) Source(44, 10) + SourceIndex(0) -4 >Emitted(30, 13) Source(44, 50) + SourceIndex(0) -5 >Emitted(30, 14) Source(44, 51) + SourceIndex(0) -6 >Emitted(30, 24) Source(44, 60) + SourceIndex(0) -7 >Emitted(30, 25) Source(44, 61) + SourceIndex(0) -8 >Emitted(30, 27) Source(44, 63) + SourceIndex(0) -9 >Emitted(30, 28) Source(44, 64) + SourceIndex(0) -10>Emitted(30, 32) Source(44, 68) + SourceIndex(0) -11>Emitted(30, 38) Source(44, 74) + SourceIndex(0) -12>Emitted(30, 39) Source(44, 75) + SourceIndex(0) -13>Emitted(30, 40) Source(44, 76) + SourceIndex(0) -14>Emitted(30, 41) Source(44, 77) + SourceIndex(0) -15>Emitted(30, 42) Source(44, 78) + SourceIndex(0) -16>Emitted(30, 43) Source(44, 79) + SourceIndex(0) -17>Emitted(30, 44) Source(44, 80) + SourceIndex(0) -18>Emitted(30, 45) Source(44, 81) + SourceIndex(0) +1->Emitted(48, 1) Source(44, 1) + SourceIndex(0) +2 >Emitted(48, 5) Source(44, 5) + SourceIndex(0) +3 >Emitted(48, 10) Source(44, 10) + SourceIndex(0) +4 >Emitted(48, 13) Source(44, 50) + SourceIndex(0) +--- +>>> function (n, s) { +1->^^^^ +2 > ^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +1->[ +2 > function( +3 > n +4 > , +5 > s +1->Emitted(49, 5) Source(44, 51) + SourceIndex(0) +2 >Emitted(49, 15) Source(44, 60) + SourceIndex(0) +3 >Emitted(49, 16) Source(44, 61) + SourceIndex(0) +4 >Emitted(49, 18) Source(44, 63) + SourceIndex(0) +5 >Emitted(49, 19) Source(44, 64) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(50, 9) Source(44, 68) + SourceIndex(0) +2 >Emitted(50, 15) Source(44, 74) + SourceIndex(0) +3 >Emitted(50, 16) Source(44, 75) + SourceIndex(0) +4 >Emitted(50, 17) Source(44, 76) + SourceIndex(0) +5 >Emitted(50, 18) Source(44, 77) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(51, 5) Source(44, 78) + SourceIndex(0) +2 >Emitted(51, 6) Source(44, 79) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(52, 2) Source(44, 80) + SourceIndex(0) +2 >Emitted(52, 3) Source(44, 81) + SourceIndex(0) --- >>>var c3t12 = { -1 > +1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ 5 > ^^-> -1 > +1-> > 2 >var 3 > c3t12 4 > : IBar = -1 >Emitted(31, 1) Source(45, 1) + SourceIndex(0) -2 >Emitted(31, 5) Source(45, 5) + SourceIndex(0) -3 >Emitted(31, 10) Source(45, 10) + SourceIndex(0) -4 >Emitted(31, 13) Source(45, 19) + SourceIndex(0) +1->Emitted(53, 1) Source(45, 1) + SourceIndex(0) +2 >Emitted(53, 5) Source(45, 5) + SourceIndex(0) +3 >Emitted(53, 10) Source(45, 10) + SourceIndex(0) +4 >Emitted(53, 13) Source(45, 19) + SourceIndex(0) --- >>> foo: ({}) 1->^^^^ @@ -803,12 +854,12 @@ sourceFile:contextualTyping.ts 4 > ( 5 > {} 6 > ) -1->Emitted(32, 5) Source(46, 5) + SourceIndex(0) -2 >Emitted(32, 8) Source(46, 8) + SourceIndex(0) -3 >Emitted(32, 10) Source(46, 16) + SourceIndex(0) -4 >Emitted(32, 11) Source(46, 17) + SourceIndex(0) -5 >Emitted(32, 13) Source(46, 19) + SourceIndex(0) -6 >Emitted(32, 14) Source(46, 20) + SourceIndex(0) +1->Emitted(54, 5) Source(46, 5) + SourceIndex(0) +2 >Emitted(54, 8) Source(46, 8) + SourceIndex(0) +3 >Emitted(54, 10) Source(46, 16) + SourceIndex(0) +4 >Emitted(54, 11) Source(46, 17) + SourceIndex(0) +5 >Emitted(54, 13) Source(46, 19) + SourceIndex(0) +6 >Emitted(54, 14) Source(46, 20) + SourceIndex(0) --- >>>}; 1 >^ @@ -817,8 +868,8 @@ sourceFile:contextualTyping.ts 1 > >} 2 > -1 >Emitted(33, 2) Source(47, 2) + SourceIndex(0) -2 >Emitted(33, 3) Source(47, 2) + SourceIndex(0) +1 >Emitted(55, 2) Source(47, 2) + SourceIndex(0) +2 >Emitted(55, 3) Source(47, 2) + SourceIndex(0) --- >>>var c3t13 = ({ 1-> @@ -826,20 +877,20 @@ sourceFile:contextualTyping.ts 3 > ^^^^^ 4 > ^^^ 5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +6 > ^^^^^^^^^^^^-> 1-> > 2 >var 3 > c3t13 4 > = 5 > ( -1->Emitted(34, 1) Source(48, 1) + SourceIndex(0) -2 >Emitted(34, 5) Source(48, 5) + SourceIndex(0) -3 >Emitted(34, 10) Source(48, 10) + SourceIndex(0) -4 >Emitted(34, 13) Source(48, 19) + SourceIndex(0) -5 >Emitted(34, 14) Source(48, 20) + SourceIndex(0) +1->Emitted(56, 1) Source(48, 1) + SourceIndex(0) +2 >Emitted(56, 5) Source(48, 5) + SourceIndex(0) +3 >Emitted(56, 10) Source(48, 10) + SourceIndex(0) +4 >Emitted(56, 13) Source(48, 19) + SourceIndex(0) +5 >Emitted(56, 14) Source(48, 20) + SourceIndex(0) --- ->>> f: function (i, s) { return s; } +>>> f: function (i, s) { 1->^^^^ 2 > ^ 3 > ^^ @@ -847,13 +898,6 @@ sourceFile:contextualTyping.ts 5 > ^ 6 > ^^ 7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ 1->{ > 2 > f @@ -862,27 +906,38 @@ sourceFile:contextualTyping.ts 5 > i 6 > , 7 > s -8 > ) { -9 > return -10> -11> s -12> ; -13> -14> } -1->Emitted(35, 5) Source(49, 5) + SourceIndex(0) -2 >Emitted(35, 6) Source(49, 6) + SourceIndex(0) -3 >Emitted(35, 8) Source(49, 8) + SourceIndex(0) -4 >Emitted(35, 18) Source(49, 17) + SourceIndex(0) -5 >Emitted(35, 19) Source(49, 18) + SourceIndex(0) -6 >Emitted(35, 21) Source(49, 20) + SourceIndex(0) -7 >Emitted(35, 22) Source(49, 21) + SourceIndex(0) -8 >Emitted(35, 26) Source(49, 25) + SourceIndex(0) -9 >Emitted(35, 32) Source(49, 31) + SourceIndex(0) -10>Emitted(35, 33) Source(49, 32) + SourceIndex(0) -11>Emitted(35, 34) Source(49, 33) + SourceIndex(0) -12>Emitted(35, 35) Source(49, 34) + SourceIndex(0) -13>Emitted(35, 36) Source(49, 35) + SourceIndex(0) -14>Emitted(35, 37) Source(49, 36) + SourceIndex(0) +1->Emitted(57, 5) Source(49, 5) + SourceIndex(0) +2 >Emitted(57, 6) Source(49, 6) + SourceIndex(0) +3 >Emitted(57, 8) Source(49, 8) + SourceIndex(0) +4 >Emitted(57, 18) Source(49, 17) + SourceIndex(0) +5 >Emitted(57, 19) Source(49, 18) + SourceIndex(0) +6 >Emitted(57, 21) Source(49, 20) + SourceIndex(0) +7 >Emitted(57, 22) Source(49, 21) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(58, 9) Source(49, 25) + SourceIndex(0) +2 >Emitted(58, 15) Source(49, 31) + SourceIndex(0) +3 >Emitted(58, 16) Source(49, 32) + SourceIndex(0) +4 >Emitted(58, 17) Source(49, 33) + SourceIndex(0) +5 >Emitted(58, 18) Source(49, 34) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(59, 5) Source(49, 35) + SourceIndex(0) +2 >Emitted(59, 6) Source(49, 36) + SourceIndex(0) --- >>>}); 1 >^ @@ -893,9 +948,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(36, 2) Source(50, 2) + SourceIndex(0) -2 >Emitted(36, 3) Source(50, 3) + SourceIndex(0) -3 >Emitted(36, 4) Source(50, 3) + SourceIndex(0) +1 >Emitted(60, 2) Source(50, 2) + SourceIndex(0) +2 >Emitted(60, 3) Source(50, 3) + SourceIndex(0) +3 >Emitted(60, 4) Source(50, 3) + SourceIndex(0) --- >>>var c3t14 = ({ 1-> @@ -909,11 +964,11 @@ sourceFile:contextualTyping.ts 3 > c3t14 4 > = 5 > ( -1->Emitted(37, 1) Source(51, 1) + SourceIndex(0) -2 >Emitted(37, 5) Source(51, 5) + SourceIndex(0) -3 >Emitted(37, 10) Source(51, 10) + SourceIndex(0) -4 >Emitted(37, 13) Source(51, 19) + SourceIndex(0) -5 >Emitted(37, 14) Source(51, 20) + SourceIndex(0) +1->Emitted(61, 1) Source(51, 1) + SourceIndex(0) +2 >Emitted(61, 5) Source(51, 5) + SourceIndex(0) +3 >Emitted(61, 10) Source(51, 10) + SourceIndex(0) +4 >Emitted(61, 13) Source(51, 19) + SourceIndex(0) +5 >Emitted(61, 14) Source(51, 20) + SourceIndex(0) --- >>> a: [] 1 >^^^^ @@ -925,10 +980,10 @@ sourceFile:contextualTyping.ts 2 > a 3 > : 4 > [] -1 >Emitted(38, 5) Source(52, 5) + SourceIndex(0) -2 >Emitted(38, 6) Source(52, 6) + SourceIndex(0) -3 >Emitted(38, 8) Source(52, 8) + SourceIndex(0) -4 >Emitted(38, 10) Source(52, 10) + SourceIndex(0) +1 >Emitted(62, 5) Source(52, 5) + SourceIndex(0) +2 >Emitted(62, 6) Source(52, 6) + SourceIndex(0) +3 >Emitted(62, 8) Source(52, 8) + SourceIndex(0) +4 >Emitted(62, 10) Source(52, 10) + SourceIndex(0) --- >>>}); 1 >^ @@ -939,9 +994,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(39, 2) Source(53, 2) + SourceIndex(0) -2 >Emitted(39, 3) Source(53, 3) + SourceIndex(0) -3 >Emitted(39, 4) Source(53, 3) + SourceIndex(0) +1 >Emitted(63, 2) Source(53, 2) + SourceIndex(0) +2 >Emitted(63, 3) Source(53, 3) + SourceIndex(0) +3 >Emitted(63, 4) Source(53, 3) + SourceIndex(0) --- >>>// CONTEXT: Class property assignment 1-> @@ -953,9 +1008,9 @@ sourceFile:contextualTyping.ts > 2 > 3 >// CONTEXT: Class property assignment -1->Emitted(40, 1) Source(56, 1) + SourceIndex(0) -2 >Emitted(40, 1) Source(55, 1) + SourceIndex(0) -3 >Emitted(40, 38) Source(55, 38) + SourceIndex(0) +1->Emitted(64, 1) Source(56, 1) + SourceIndex(0) +2 >Emitted(64, 1) Source(55, 1) + SourceIndex(0) +3 >Emitted(64, 38) Source(55, 38) + SourceIndex(0) --- >>>var C4T5 = (function () { >>> function C4T5() { @@ -965,7 +1020,7 @@ sourceFile:contextualTyping.ts >class C4T5 { > foo: (i: number, s: string) => string; > -1 >Emitted(42, 5) Source(58, 5) + SourceIndex(0) name (C4T5) +1 >Emitted(66, 5) Source(58, 5) + SourceIndex(0) name (C4T5) --- >>> this.foo = function (i, s) { 1->^^^^^^^^ @@ -987,15 +1042,15 @@ sourceFile:contextualTyping.ts 7 > i 8 > , 9 > s -1->Emitted(43, 9) Source(59, 9) + SourceIndex(0) name (C4T5.constructor) -2 >Emitted(43, 13) Source(59, 13) + SourceIndex(0) name (C4T5.constructor) -3 >Emitted(43, 14) Source(59, 14) + SourceIndex(0) name (C4T5.constructor) -4 >Emitted(43, 17) Source(59, 17) + SourceIndex(0) name (C4T5.constructor) -5 >Emitted(43, 20) Source(59, 20) + SourceIndex(0) name (C4T5.constructor) -6 >Emitted(43, 30) Source(59, 29) + SourceIndex(0) name (C4T5.constructor) -7 >Emitted(43, 31) Source(59, 30) + SourceIndex(0) name (C4T5.constructor) -8 >Emitted(43, 33) Source(59, 32) + SourceIndex(0) name (C4T5.constructor) -9 >Emitted(43, 34) Source(59, 33) + SourceIndex(0) name (C4T5.constructor) +1->Emitted(67, 9) Source(59, 9) + SourceIndex(0) name (C4T5.constructor) +2 >Emitted(67, 13) Source(59, 13) + SourceIndex(0) name (C4T5.constructor) +3 >Emitted(67, 14) Source(59, 14) + SourceIndex(0) name (C4T5.constructor) +4 >Emitted(67, 17) Source(59, 17) + SourceIndex(0) name (C4T5.constructor) +5 >Emitted(67, 20) Source(59, 20) + SourceIndex(0) name (C4T5.constructor) +6 >Emitted(67, 30) Source(59, 29) + SourceIndex(0) name (C4T5.constructor) +7 >Emitted(67, 31) Source(59, 30) + SourceIndex(0) name (C4T5.constructor) +8 >Emitted(67, 33) Source(59, 32) + SourceIndex(0) name (C4T5.constructor) +9 >Emitted(67, 34) Source(59, 33) + SourceIndex(0) name (C4T5.constructor) --- >>> return s; 1 >^^^^^^^^^^^^ @@ -1009,11 +1064,11 @@ sourceFile:contextualTyping.ts 3 > 4 > s 5 > ; -1 >Emitted(44, 13) Source(60, 13) + SourceIndex(0) -2 >Emitted(44, 19) Source(60, 19) + SourceIndex(0) -3 >Emitted(44, 20) Source(60, 20) + SourceIndex(0) -4 >Emitted(44, 21) Source(60, 21) + SourceIndex(0) -5 >Emitted(44, 22) Source(60, 22) + SourceIndex(0) +1 >Emitted(68, 13) Source(60, 13) + SourceIndex(0) +2 >Emitted(68, 19) Source(60, 19) + SourceIndex(0) +3 >Emitted(68, 20) Source(60, 20) + SourceIndex(0) +4 >Emitted(68, 21) Source(60, 21) + SourceIndex(0) +5 >Emitted(68, 22) Source(60, 22) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^ @@ -1023,9 +1078,9 @@ sourceFile:contextualTyping.ts > 2 > } 3 > -1 >Emitted(45, 9) Source(61, 9) + SourceIndex(0) -2 >Emitted(45, 10) Source(61, 10) + SourceIndex(0) -3 >Emitted(45, 11) Source(61, 10) + SourceIndex(0) name (C4T5.constructor) +1 >Emitted(69, 9) Source(61, 9) + SourceIndex(0) +2 >Emitted(69, 10) Source(61, 10) + SourceIndex(0) +3 >Emitted(69, 11) Source(61, 10) + SourceIndex(0) name (C4T5.constructor) --- >>> } 1 >^^^^ @@ -1034,8 +1089,8 @@ sourceFile:contextualTyping.ts 1 > > 2 > } -1 >Emitted(46, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor) -2 >Emitted(46, 6) Source(62, 6) + SourceIndex(0) name (C4T5.constructor) +1 >Emitted(70, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor) +2 >Emitted(70, 6) Source(62, 6) + SourceIndex(0) name (C4T5.constructor) --- >>> return C4T5; 1->^^^^ @@ -1043,8 +1098,8 @@ sourceFile:contextualTyping.ts 1-> > 2 > } -1->Emitted(47, 5) Source(63, 1) + SourceIndex(0) name (C4T5) -2 >Emitted(47, 16) Source(63, 2) + SourceIndex(0) name (C4T5) +1->Emitted(71, 5) Source(63, 1) + SourceIndex(0) name (C4T5) +2 >Emitted(71, 16) Source(63, 2) + SourceIndex(0) name (C4T5) --- >>>})(); 1 > @@ -1063,10 +1118,10 @@ sourceFile:contextualTyping.ts > } > } > } -1 >Emitted(48, 1) Source(63, 1) + SourceIndex(0) name (C4T5) -2 >Emitted(48, 2) Source(63, 2) + SourceIndex(0) name (C4T5) -3 >Emitted(48, 2) Source(56, 1) + SourceIndex(0) -4 >Emitted(48, 6) Source(63, 2) + SourceIndex(0) +1 >Emitted(72, 1) Source(63, 1) + SourceIndex(0) name (C4T5) +2 >Emitted(72, 2) Source(63, 2) + SourceIndex(0) name (C4T5) +3 >Emitted(72, 2) Source(56, 1) + SourceIndex(0) +4 >Emitted(72, 6) Source(63, 2) + SourceIndex(0) --- >>>// CONTEXT: Module property assignment 1-> @@ -1078,9 +1133,9 @@ sourceFile:contextualTyping.ts > 2 > 3 >// CONTEXT: Module property assignment -1->Emitted(49, 1) Source(66, 1) + SourceIndex(0) -2 >Emitted(49, 1) Source(65, 1) + SourceIndex(0) -3 >Emitted(49, 39) Source(65, 39) + SourceIndex(0) +1->Emitted(73, 1) Source(66, 1) + SourceIndex(0) +2 >Emitted(73, 1) Source(65, 1) + SourceIndex(0) +3 >Emitted(73, 39) Source(65, 39) + SourceIndex(0) --- >>>var C5T5; 1 > @@ -1098,10 +1153,10 @@ sourceFile:contextualTyping.ts > return s; > } > } -1 >Emitted(50, 1) Source(66, 1) + SourceIndex(0) -2 >Emitted(50, 5) Source(66, 8) + SourceIndex(0) -3 >Emitted(50, 9) Source(66, 12) + SourceIndex(0) -4 >Emitted(50, 10) Source(71, 2) + SourceIndex(0) +1 >Emitted(74, 1) Source(66, 1) + SourceIndex(0) +2 >Emitted(74, 5) Source(66, 8) + SourceIndex(0) +3 >Emitted(74, 9) Source(66, 12) + SourceIndex(0) +4 >Emitted(74, 10) Source(71, 2) + SourceIndex(0) --- >>>(function (C5T5) { 1-> @@ -1114,11 +1169,11 @@ sourceFile:contextualTyping.ts 3 > C5T5 4 > 5 > { -1->Emitted(51, 1) Source(66, 1) + SourceIndex(0) -2 >Emitted(51, 12) Source(66, 8) + SourceIndex(0) -3 >Emitted(51, 16) Source(66, 12) + SourceIndex(0) -4 >Emitted(51, 18) Source(66, 13) + SourceIndex(0) -5 >Emitted(51, 19) Source(66, 14) + SourceIndex(0) +1->Emitted(75, 1) Source(66, 1) + SourceIndex(0) +2 >Emitted(75, 12) Source(66, 8) + SourceIndex(0) +3 >Emitted(75, 16) Source(66, 12) + SourceIndex(0) +4 >Emitted(75, 18) Source(66, 13) + SourceIndex(0) +5 >Emitted(75, 19) Source(66, 14) + SourceIndex(0) --- >>> C5T5.foo; 1 >^^^^ @@ -1129,9 +1184,9 @@ sourceFile:contextualTyping.ts > export var 2 > foo: (i: number, s: string) => string 3 > ; -1 >Emitted(52, 5) Source(67, 16) + SourceIndex(0) name (C5T5) -2 >Emitted(52, 13) Source(67, 53) + SourceIndex(0) name (C5T5) -3 >Emitted(52, 14) Source(67, 54) + SourceIndex(0) name (C5T5) +1 >Emitted(76, 5) Source(67, 16) + SourceIndex(0) name (C5T5) +2 >Emitted(76, 13) Source(67, 53) + SourceIndex(0) name (C5T5) +3 >Emitted(76, 14) Source(67, 54) + SourceIndex(0) name (C5T5) --- >>> C5T5.foo = function (i, s) { 1->^^^^ @@ -1149,13 +1204,13 @@ sourceFile:contextualTyping.ts 5 > i 6 > , 7 > s -1->Emitted(53, 5) Source(68, 5) + SourceIndex(0) name (C5T5) -2 >Emitted(53, 13) Source(68, 8) + SourceIndex(0) name (C5T5) -3 >Emitted(53, 16) Source(68, 11) + SourceIndex(0) name (C5T5) -4 >Emitted(53, 26) Source(68, 20) + SourceIndex(0) name (C5T5) -5 >Emitted(53, 27) Source(68, 21) + SourceIndex(0) name (C5T5) -6 >Emitted(53, 29) Source(68, 23) + SourceIndex(0) name (C5T5) -7 >Emitted(53, 30) Source(68, 24) + SourceIndex(0) name (C5T5) +1->Emitted(77, 5) Source(68, 5) + SourceIndex(0) name (C5T5) +2 >Emitted(77, 13) Source(68, 8) + SourceIndex(0) name (C5T5) +3 >Emitted(77, 16) Source(68, 11) + SourceIndex(0) name (C5T5) +4 >Emitted(77, 26) Source(68, 20) + SourceIndex(0) name (C5T5) +5 >Emitted(77, 27) Source(68, 21) + SourceIndex(0) name (C5T5) +6 >Emitted(77, 29) Source(68, 23) + SourceIndex(0) name (C5T5) +7 >Emitted(77, 30) Source(68, 24) + SourceIndex(0) name (C5T5) --- >>> return s; 1 >^^^^^^^^ @@ -1169,11 +1224,11 @@ sourceFile:contextualTyping.ts 3 > 4 > s 5 > ; -1 >Emitted(54, 9) Source(69, 9) + SourceIndex(0) -2 >Emitted(54, 15) Source(69, 15) + SourceIndex(0) -3 >Emitted(54, 16) Source(69, 16) + SourceIndex(0) -4 >Emitted(54, 17) Source(69, 17) + SourceIndex(0) -5 >Emitted(54, 18) Source(69, 18) + SourceIndex(0) +1 >Emitted(78, 9) Source(69, 9) + SourceIndex(0) +2 >Emitted(78, 15) Source(69, 15) + SourceIndex(0) +3 >Emitted(78, 16) Source(69, 16) + SourceIndex(0) +4 >Emitted(78, 17) Source(69, 17) + SourceIndex(0) +5 >Emitted(78, 18) Source(69, 18) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -1184,9 +1239,9 @@ sourceFile:contextualTyping.ts > 2 > } 3 > -1 >Emitted(55, 5) Source(70, 5) + SourceIndex(0) -2 >Emitted(55, 6) Source(70, 6) + SourceIndex(0) -3 >Emitted(55, 7) Source(70, 6) + SourceIndex(0) name (C5T5) +1 >Emitted(79, 5) Source(70, 5) + SourceIndex(0) +2 >Emitted(79, 6) Source(70, 6) + SourceIndex(0) +3 >Emitted(79, 7) Source(70, 6) + SourceIndex(0) name (C5T5) --- >>>})(C5T5 || (C5T5 = {})); 1-> @@ -1210,13 +1265,13 @@ sourceFile:contextualTyping.ts > return s; > } > } -1->Emitted(56, 1) Source(71, 1) + SourceIndex(0) name (C5T5) -2 >Emitted(56, 2) Source(71, 2) + SourceIndex(0) name (C5T5) -3 >Emitted(56, 4) Source(66, 8) + SourceIndex(0) -4 >Emitted(56, 8) Source(66, 12) + SourceIndex(0) -5 >Emitted(56, 13) Source(66, 8) + SourceIndex(0) -6 >Emitted(56, 17) Source(66, 12) + SourceIndex(0) -7 >Emitted(56, 25) Source(71, 2) + SourceIndex(0) +1->Emitted(80, 1) Source(71, 1) + SourceIndex(0) name (C5T5) +2 >Emitted(80, 2) Source(71, 2) + SourceIndex(0) name (C5T5) +3 >Emitted(80, 4) Source(66, 8) + SourceIndex(0) +4 >Emitted(80, 8) Source(66, 12) + SourceIndex(0) +5 >Emitted(80, 13) Source(66, 8) + SourceIndex(0) +6 >Emitted(80, 17) Source(66, 12) + SourceIndex(0) +7 >Emitted(80, 25) Source(71, 2) + SourceIndex(0) --- >>>// CONTEXT: Variable assignment 1-> @@ -1228,99 +1283,104 @@ sourceFile:contextualTyping.ts > 2 > 3 >// CONTEXT: Variable assignment -1->Emitted(57, 1) Source(74, 1) + SourceIndex(0) -2 >Emitted(57, 1) Source(73, 1) + SourceIndex(0) -3 >Emitted(57, 32) Source(73, 32) + SourceIndex(0) +1->Emitted(81, 1) Source(74, 1) + SourceIndex(0) +2 >Emitted(81, 1) Source(73, 1) + SourceIndex(0) +3 >Emitted(81, 32) Source(73, 32) + SourceIndex(0) --- >>>var c6t5; 1 >^^^^ 2 > ^^^^ 3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >var -2 > c6t5: (n: number) => IFoo -3 > ; -1 >Emitted(58, 5) Source(74, 5) + SourceIndex(0) -2 >Emitted(58, 9) Source(74, 30) + SourceIndex(0) -3 >Emitted(58, 10) Source(74, 31) + SourceIndex(0) ---- ->>>c6t5 = function (n) { return ({}); }; -1-> -2 >^^^^ -3 > ^^^ -4 > ^^^^^^^^^^ -5 > ^ -6 > ^^^^ -7 > ^^^^^^ -8 > ^ -9 > ^ -10> ^^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -1-> - > -2 >c6t5 -3 > = <(n: number) => IFoo> -4 > function( -5 > n -6 > ) { -7 > return -8 > -9 > ( -10> {} -11> ) -12> -13> -14> } -15> ; -1->Emitted(59, 1) Source(75, 1) + SourceIndex(0) -2 >Emitted(59, 5) Source(75, 5) + SourceIndex(0) -3 >Emitted(59, 8) Source(75, 29) + SourceIndex(0) -4 >Emitted(59, 18) Source(75, 38) + SourceIndex(0) -5 >Emitted(59, 19) Source(75, 39) + SourceIndex(0) -6 >Emitted(59, 23) Source(75, 43) + SourceIndex(0) -7 >Emitted(59, 29) Source(75, 49) + SourceIndex(0) -8 >Emitted(59, 30) Source(75, 56) + SourceIndex(0) -9 >Emitted(59, 31) Source(75, 57) + SourceIndex(0) -10>Emitted(59, 33) Source(75, 59) + SourceIndex(0) -11>Emitted(59, 34) Source(75, 60) + SourceIndex(0) -12>Emitted(59, 35) Source(75, 60) + SourceIndex(0) -13>Emitted(59, 36) Source(75, 61) + SourceIndex(0) -14>Emitted(59, 37) Source(75, 62) + SourceIndex(0) -15>Emitted(59, 38) Source(75, 63) + SourceIndex(0) ---- ->>>// CONTEXT: Array index assignment -1 > -2 > -3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -1 > - > - >// CONTEXT: Array index assignment - > -2 > -3 >// CONTEXT: Array index assignment -1 >Emitted(60, 1) Source(78, 1) + SourceIndex(0) -2 >Emitted(60, 1) Source(77, 1) + SourceIndex(0) -3 >Emitted(60, 35) Source(77, 35) + SourceIndex(0) ---- ->>>var c7t2; -1 >^^^^ -2 > ^^^^ -3 > ^ 4 > ^^^^^^^^^^^^^-> +1 > + >var +2 > c6t5: (n: number) => IFoo +3 > ; +1 >Emitted(82, 5) Source(74, 5) + SourceIndex(0) +2 >Emitted(82, 9) Source(74, 30) + SourceIndex(0) +3 >Emitted(82, 10) Source(74, 31) + SourceIndex(0) +--- +>>>c6t5 = function (n) { +1-> +2 >^^^^ +3 > ^^^ +4 > ^^^^^^^^^^ +5 > ^ +1-> + > +2 >c6t5 +3 > = <(n: number) => IFoo> +4 > function( +5 > n +1->Emitted(83, 1) Source(75, 1) + SourceIndex(0) +2 >Emitted(83, 5) Source(75, 5) + SourceIndex(0) +3 >Emitted(83, 8) Source(75, 29) + SourceIndex(0) +4 >Emitted(83, 18) Source(75, 38) + SourceIndex(0) +5 >Emitted(83, 19) Source(75, 39) + SourceIndex(0) +--- +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(84, 5) Source(75, 43) + SourceIndex(0) +2 >Emitted(84, 11) Source(75, 49) + SourceIndex(0) +3 >Emitted(84, 12) Source(75, 56) + SourceIndex(0) +4 >Emitted(84, 13) Source(75, 57) + SourceIndex(0) +5 >Emitted(84, 15) Source(75, 59) + SourceIndex(0) +6 >Emitted(84, 16) Source(75, 60) + SourceIndex(0) +7 >Emitted(84, 17) Source(75, 60) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(85, 1) Source(75, 61) + SourceIndex(0) +2 >Emitted(85, 2) Source(75, 62) + SourceIndex(0) +3 >Emitted(85, 3) Source(75, 63) + SourceIndex(0) +--- +>>>// CONTEXT: Array index assignment +1-> +2 > +3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1-> + > + >// CONTEXT: Array index assignment + > +2 > +3 >// CONTEXT: Array index assignment +1->Emitted(86, 1) Source(78, 1) + SourceIndex(0) +2 >Emitted(86, 1) Source(77, 1) + SourceIndex(0) +3 >Emitted(86, 35) Source(77, 35) + SourceIndex(0) +--- +>>>var c7t2; +1 >^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^-> 1 > >var 2 > c7t2: IFoo[] 3 > ; -1 >Emitted(61, 5) Source(78, 5) + SourceIndex(0) -2 >Emitted(61, 9) Source(78, 17) + SourceIndex(0) -3 >Emitted(61, 10) Source(78, 18) + SourceIndex(0) +1 >Emitted(87, 5) Source(78, 5) + SourceIndex(0) +2 >Emitted(87, 9) Source(78, 17) + SourceIndex(0) +3 >Emitted(87, 10) Source(78, 18) + SourceIndex(0) --- ->>>c7t2[0] = ({ n: 1 }); +>>>c7t2[0] = ({ 1-> 2 >^^^^ 3 > ^ @@ -1328,13 +1388,6 @@ sourceFile:contextualTyping.ts 5 > ^ 6 > ^^^ 7 > ^ -8 > ^^ -9 > ^ -10> ^^ -11> ^ -12> ^^ -13> ^ -14> ^ 1-> > 2 >c7t2 @@ -1343,30 +1396,42 @@ sourceFile:contextualTyping.ts 5 > ] 6 > = 7 > ( -8 > { -9 > n -10> : -11> 1 -12> } -13> ) -14> ; -1->Emitted(62, 1) Source(79, 1) + SourceIndex(0) -2 >Emitted(62, 5) Source(79, 5) + SourceIndex(0) -3 >Emitted(62, 6) Source(79, 6) + SourceIndex(0) -4 >Emitted(62, 7) Source(79, 7) + SourceIndex(0) -5 >Emitted(62, 8) Source(79, 8) + SourceIndex(0) -6 >Emitted(62, 11) Source(79, 17) + SourceIndex(0) -7 >Emitted(62, 12) Source(79, 18) + SourceIndex(0) -8 >Emitted(62, 14) Source(79, 19) + SourceIndex(0) -9 >Emitted(62, 15) Source(79, 20) + SourceIndex(0) -10>Emitted(62, 17) Source(79, 22) + SourceIndex(0) -11>Emitted(62, 18) Source(79, 23) + SourceIndex(0) -12>Emitted(62, 20) Source(79, 24) + SourceIndex(0) -13>Emitted(62, 21) Source(79, 25) + SourceIndex(0) -14>Emitted(62, 22) Source(79, 26) + SourceIndex(0) +1->Emitted(88, 1) Source(79, 1) + SourceIndex(0) +2 >Emitted(88, 5) Source(79, 5) + SourceIndex(0) +3 >Emitted(88, 6) Source(79, 6) + SourceIndex(0) +4 >Emitted(88, 7) Source(79, 7) + SourceIndex(0) +5 >Emitted(88, 8) Source(79, 8) + SourceIndex(0) +6 >Emitted(88, 11) Source(79, 17) + SourceIndex(0) +7 >Emitted(88, 12) Source(79, 18) + SourceIndex(0) +--- +>>> n: 1 +1 >^^^^ +2 > ^ +3 > ^^ +4 > ^ +1 >{ +2 > n +3 > : +4 > 1 +1 >Emitted(89, 5) Source(79, 19) + SourceIndex(0) +2 >Emitted(89, 6) Source(79, 20) + SourceIndex(0) +3 >Emitted(89, 8) Source(79, 22) + SourceIndex(0) +4 >Emitted(89, 9) Source(79, 23) + SourceIndex(0) +--- +>>>}); +1 >^ +2 > ^ +3 > ^ +4 > ^^^^^^^^^^^^^^^-> +1 >} +2 > ) +3 > ; +1 >Emitted(90, 2) Source(79, 24) + SourceIndex(0) +2 >Emitted(90, 3) Source(79, 25) + SourceIndex(0) +3 >Emitted(90, 4) Source(79, 26) + SourceIndex(0) --- >>>var objc8 = ({}); -1 > +1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ @@ -1374,8 +1439,8 @@ sourceFile:contextualTyping.ts 6 > ^^ 7 > ^ 8 > ^ -9 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > +9 > ^^^^^^^^^^-> +1-> > >// CONTEXT: Object property assignment >interface IPlaceHolder { @@ -1424,16 +1489,16 @@ sourceFile:contextualTyping.ts 6 > {} 7 > ) 8 > ; -1 >Emitted(63, 1) Source(102, 1) + SourceIndex(0) -2 >Emitted(63, 5) Source(102, 5) + SourceIndex(0) -3 >Emitted(63, 10) Source(102, 10) + SourceIndex(0) -4 >Emitted(63, 13) Source(120, 19) + SourceIndex(0) -5 >Emitted(63, 14) Source(120, 20) + SourceIndex(0) -6 >Emitted(63, 16) Source(120, 22) + SourceIndex(0) -7 >Emitted(63, 17) Source(120, 23) + SourceIndex(0) -8 >Emitted(63, 18) Source(120, 24) + SourceIndex(0) +1->Emitted(91, 1) Source(102, 1) + SourceIndex(0) +2 >Emitted(91, 5) Source(102, 5) + SourceIndex(0) +3 >Emitted(91, 10) Source(102, 10) + SourceIndex(0) +4 >Emitted(91, 13) Source(120, 19) + SourceIndex(0) +5 >Emitted(91, 14) Source(120, 20) + SourceIndex(0) +6 >Emitted(91, 16) Source(120, 22) + SourceIndex(0) +7 >Emitted(91, 17) Source(120, 23) + SourceIndex(0) +8 >Emitted(91, 18) Source(120, 24) + SourceIndex(0) --- ->>>objc8.t1 = (function (s) { return s; }); +>>>objc8.t1 = (function (s) { 1-> 2 >^^^^^ 3 > ^ @@ -1442,15 +1507,6 @@ sourceFile:contextualTyping.ts 6 > ^ 7 > ^^^^^^^^^^ 8 > ^ -9 > ^^^^ -10> ^^^^^^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^ 1-> > > @@ -1461,53 +1517,67 @@ sourceFile:contextualTyping.ts 6 > ( 7 > function( 8 > s -9 > ) { -10> return -11> -12> s -13> -14> -15> } -16> ) -17> ; -1->Emitted(64, 1) Source(122, 1) + SourceIndex(0) -2 >Emitted(64, 6) Source(122, 6) + SourceIndex(0) -3 >Emitted(64, 7) Source(122, 7) + SourceIndex(0) -4 >Emitted(64, 9) Source(122, 9) + SourceIndex(0) -5 >Emitted(64, 12) Source(122, 12) + SourceIndex(0) -6 >Emitted(64, 13) Source(122, 13) + SourceIndex(0) -7 >Emitted(64, 23) Source(122, 22) + SourceIndex(0) -8 >Emitted(64, 24) Source(122, 23) + SourceIndex(0) -9 >Emitted(64, 28) Source(122, 27) + SourceIndex(0) -10>Emitted(64, 34) Source(122, 33) + SourceIndex(0) -11>Emitted(64, 35) Source(122, 34) + SourceIndex(0) -12>Emitted(64, 36) Source(122, 35) + SourceIndex(0) -13>Emitted(64, 37) Source(122, 35) + SourceIndex(0) -14>Emitted(64, 38) Source(122, 36) + SourceIndex(0) -15>Emitted(64, 39) Source(122, 37) + SourceIndex(0) -16>Emitted(64, 40) Source(122, 38) + SourceIndex(0) -17>Emitted(64, 41) Source(122, 39) + SourceIndex(0) +1->Emitted(92, 1) Source(122, 1) + SourceIndex(0) +2 >Emitted(92, 6) Source(122, 6) + SourceIndex(0) +3 >Emitted(92, 7) Source(122, 7) + SourceIndex(0) +4 >Emitted(92, 9) Source(122, 9) + SourceIndex(0) +5 >Emitted(92, 12) Source(122, 12) + SourceIndex(0) +6 >Emitted(92, 13) Source(122, 13) + SourceIndex(0) +7 >Emitted(92, 23) Source(122, 22) + SourceIndex(0) +8 >Emitted(92, 24) Source(122, 23) + SourceIndex(0) +--- +>>> return s; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > +1 >Emitted(93, 5) Source(122, 27) + SourceIndex(0) +2 >Emitted(93, 11) Source(122, 33) + SourceIndex(0) +3 >Emitted(93, 12) Source(122, 34) + SourceIndex(0) +4 >Emitted(93, 13) Source(122, 35) + SourceIndex(0) +5 >Emitted(93, 14) Source(122, 35) + SourceIndex(0) +--- +>>>}); +1 > +2 >^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^^-> +1 > +2 >} +3 > ) +4 > ; +1 >Emitted(94, 1) Source(122, 36) + SourceIndex(0) +2 >Emitted(94, 2) Source(122, 37) + SourceIndex(0) +3 >Emitted(94, 3) Source(122, 38) + SourceIndex(0) +4 >Emitted(94, 4) Source(122, 39) + SourceIndex(0) --- >>>objc8.t2 = ({ -1 > +1-> 2 >^^^^^ 3 > ^ 4 > ^^ 5 > ^^^ 6 > ^ -1 > +1-> > 2 >objc8 3 > . 4 > t2 5 > = 6 > ( -1 >Emitted(65, 1) Source(123, 1) + SourceIndex(0) -2 >Emitted(65, 6) Source(123, 6) + SourceIndex(0) -3 >Emitted(65, 7) Source(123, 7) + SourceIndex(0) -4 >Emitted(65, 9) Source(123, 9) + SourceIndex(0) -5 >Emitted(65, 12) Source(123, 18) + SourceIndex(0) -6 >Emitted(65, 13) Source(123, 19) + SourceIndex(0) +1->Emitted(95, 1) Source(123, 1) + SourceIndex(0) +2 >Emitted(95, 6) Source(123, 6) + SourceIndex(0) +3 >Emitted(95, 7) Source(123, 7) + SourceIndex(0) +4 >Emitted(95, 9) Source(123, 9) + SourceIndex(0) +5 >Emitted(95, 12) Source(123, 18) + SourceIndex(0) +6 >Emitted(95, 13) Source(123, 19) + SourceIndex(0) --- >>> n: 1 1 >^^^^ @@ -1519,10 +1589,10 @@ sourceFile:contextualTyping.ts 2 > n 3 > : 4 > 1 -1 >Emitted(66, 5) Source(124, 5) + SourceIndex(0) -2 >Emitted(66, 6) Source(124, 6) + SourceIndex(0) -3 >Emitted(66, 8) Source(124, 8) + SourceIndex(0) -4 >Emitted(66, 9) Source(124, 9) + SourceIndex(0) +1 >Emitted(96, 5) Source(124, 5) + SourceIndex(0) +2 >Emitted(96, 6) Source(124, 6) + SourceIndex(0) +3 >Emitted(96, 8) Source(124, 8) + SourceIndex(0) +4 >Emitted(96, 9) Source(124, 9) + SourceIndex(0) --- >>>}); 1 >^ @@ -1533,9 +1603,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > ; -1 >Emitted(67, 2) Source(125, 2) + SourceIndex(0) -2 >Emitted(67, 3) Source(125, 3) + SourceIndex(0) -3 >Emitted(67, 4) Source(125, 4) + SourceIndex(0) +1 >Emitted(97, 2) Source(125, 2) + SourceIndex(0) +2 >Emitted(97, 3) Source(125, 3) + SourceIndex(0) +3 >Emitted(97, 4) Source(125, 4) + SourceIndex(0) --- >>>objc8.t3 = []; 1-> @@ -1545,7 +1615,7 @@ sourceFile:contextualTyping.ts 5 > ^^^ 6 > ^^ 7 > ^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +8 > ^^^^^^^^^^^-> 1-> > 2 >objc8 @@ -1554,64 +1624,69 @@ sourceFile:contextualTyping.ts 5 > = 6 > [] 7 > ; -1->Emitted(68, 1) Source(126, 1) + SourceIndex(0) -2 >Emitted(68, 6) Source(126, 6) + SourceIndex(0) -3 >Emitted(68, 7) Source(126, 7) + SourceIndex(0) -4 >Emitted(68, 9) Source(126, 9) + SourceIndex(0) -5 >Emitted(68, 12) Source(126, 12) + SourceIndex(0) -6 >Emitted(68, 14) Source(126, 14) + SourceIndex(0) -7 >Emitted(68, 15) Source(126, 15) + SourceIndex(0) +1->Emitted(98, 1) Source(126, 1) + SourceIndex(0) +2 >Emitted(98, 6) Source(126, 6) + SourceIndex(0) +3 >Emitted(98, 7) Source(126, 7) + SourceIndex(0) +4 >Emitted(98, 9) Source(126, 9) + SourceIndex(0) +5 >Emitted(98, 12) Source(126, 12) + SourceIndex(0) +6 >Emitted(98, 14) Source(126, 14) + SourceIndex(0) +7 >Emitted(98, 15) Source(126, 15) + SourceIndex(0) --- ->>>objc8.t4 = function () { return ({}); }; +>>>objc8.t4 = function () { 1-> 2 >^^^^^ 3 > ^ 4 > ^^ 5 > ^^^ -6 > ^^^^^^^^^^^^^^ -7 > ^^^^^^ -8 > ^ -9 > ^ -10> ^^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^^-> +6 > ^^^^^^-> 1-> > 2 >objc8 3 > . 4 > t4 5 > = -6 > function() { -7 > return -8 > -9 > ( -10> {} -11> ) -12> -13> -14> } -15> ; -1->Emitted(69, 1) Source(127, 1) + SourceIndex(0) -2 >Emitted(69, 6) Source(127, 6) + SourceIndex(0) -3 >Emitted(69, 7) Source(127, 7) + SourceIndex(0) -4 >Emitted(69, 9) Source(127, 9) + SourceIndex(0) -5 >Emitted(69, 12) Source(127, 12) + SourceIndex(0) -6 >Emitted(69, 26) Source(127, 25) + SourceIndex(0) -7 >Emitted(69, 32) Source(127, 31) + SourceIndex(0) -8 >Emitted(69, 33) Source(127, 38) + SourceIndex(0) -9 >Emitted(69, 34) Source(127, 39) + SourceIndex(0) -10>Emitted(69, 36) Source(127, 41) + SourceIndex(0) -11>Emitted(69, 37) Source(127, 42) + SourceIndex(0) -12>Emitted(69, 38) Source(127, 42) + SourceIndex(0) -13>Emitted(69, 39) Source(127, 43) + SourceIndex(0) -14>Emitted(69, 40) Source(127, 44) + SourceIndex(0) -15>Emitted(69, 41) Source(127, 45) + SourceIndex(0) +1->Emitted(99, 1) Source(127, 1) + SourceIndex(0) +2 >Emitted(99, 6) Source(127, 6) + SourceIndex(0) +3 >Emitted(99, 7) Source(127, 7) + SourceIndex(0) +4 >Emitted(99, 9) Source(127, 9) + SourceIndex(0) +5 >Emitted(99, 12) Source(127, 12) + SourceIndex(0) --- ->>>objc8.t5 = function (n) { return ({}); }; +>>> return ({}); +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1->function() { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1->Emitted(100, 5) Source(127, 25) + SourceIndex(0) +2 >Emitted(100, 11) Source(127, 31) + SourceIndex(0) +3 >Emitted(100, 12) Source(127, 38) + SourceIndex(0) +4 >Emitted(100, 13) Source(127, 39) + SourceIndex(0) +5 >Emitted(100, 15) Source(127, 41) + SourceIndex(0) +6 >Emitted(100, 16) Source(127, 42) + SourceIndex(0) +7 >Emitted(100, 17) Source(127, 42) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(101, 1) Source(127, 43) + SourceIndex(0) +2 >Emitted(101, 2) Source(127, 44) + SourceIndex(0) +3 >Emitted(101, 3) Source(127, 45) + SourceIndex(0) +--- +>>>objc8.t5 = function (n) { 1-> 2 >^^^^^ 3 > ^ @@ -1619,17 +1694,6 @@ sourceFile:contextualTyping.ts 5 > ^^^ 6 > ^^^^^^^^^^ 7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^^^^-> 1-> > 2 >objc8 @@ -1638,35 +1702,50 @@ sourceFile:contextualTyping.ts 5 > = 6 > function( 7 > n -8 > ) { -9 > return -10> -11> ( -12> {} -13> ) -14> -15> -16> } -17> ; -1->Emitted(70, 1) Source(128, 1) + SourceIndex(0) -2 >Emitted(70, 6) Source(128, 6) + SourceIndex(0) -3 >Emitted(70, 7) Source(128, 7) + SourceIndex(0) -4 >Emitted(70, 9) Source(128, 9) + SourceIndex(0) -5 >Emitted(70, 12) Source(128, 12) + SourceIndex(0) -6 >Emitted(70, 22) Source(128, 21) + SourceIndex(0) -7 >Emitted(70, 23) Source(128, 22) + SourceIndex(0) -8 >Emitted(70, 27) Source(128, 26) + SourceIndex(0) -9 >Emitted(70, 33) Source(128, 32) + SourceIndex(0) -10>Emitted(70, 34) Source(128, 39) + SourceIndex(0) -11>Emitted(70, 35) Source(128, 40) + SourceIndex(0) -12>Emitted(70, 37) Source(128, 42) + SourceIndex(0) -13>Emitted(70, 38) Source(128, 43) + SourceIndex(0) -14>Emitted(70, 39) Source(128, 43) + SourceIndex(0) -15>Emitted(70, 40) Source(128, 44) + SourceIndex(0) -16>Emitted(70, 41) Source(128, 45) + SourceIndex(0) -17>Emitted(70, 42) Source(128, 46) + SourceIndex(0) +1->Emitted(102, 1) Source(128, 1) + SourceIndex(0) +2 >Emitted(102, 6) Source(128, 6) + SourceIndex(0) +3 >Emitted(102, 7) Source(128, 7) + SourceIndex(0) +4 >Emitted(102, 9) Source(128, 9) + SourceIndex(0) +5 >Emitted(102, 12) Source(128, 12) + SourceIndex(0) +6 >Emitted(102, 22) Source(128, 21) + SourceIndex(0) +7 >Emitted(102, 23) Source(128, 22) + SourceIndex(0) --- ->>>objc8.t6 = function (n, s) { return ({}); }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(103, 5) Source(128, 26) + SourceIndex(0) +2 >Emitted(103, 11) Source(128, 32) + SourceIndex(0) +3 >Emitted(103, 12) Source(128, 39) + SourceIndex(0) +4 >Emitted(103, 13) Source(128, 40) + SourceIndex(0) +5 >Emitted(103, 15) Source(128, 42) + SourceIndex(0) +6 >Emitted(103, 16) Source(128, 43) + SourceIndex(0) +7 >Emitted(103, 17) Source(128, 43) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(104, 1) Source(128, 44) + SourceIndex(0) +2 >Emitted(104, 2) Source(128, 45) + SourceIndex(0) +3 >Emitted(104, 3) Source(128, 46) + SourceIndex(0) +--- +>>>objc8.t6 = function (n, s) { 1-> 2 >^^^^^ 3 > ^ @@ -1676,16 +1755,6 @@ sourceFile:contextualTyping.ts 7 > ^ 8 > ^^ 9 > ^ -10> ^^^^ -11> ^^^^^^ -12> ^ -13> ^ -14> ^^ -15> ^ -16> ^ -17> ^ -18> ^ -19> ^ 1-> > 2 >objc8 @@ -1696,86 +1765,105 @@ sourceFile:contextualTyping.ts 7 > n 8 > , 9 > s -10> ) { -11> return -12> -13> ( -14> {} -15> ) -16> -17> -18> } -19> ; -1->Emitted(71, 1) Source(129, 1) + SourceIndex(0) -2 >Emitted(71, 6) Source(129, 6) + SourceIndex(0) -3 >Emitted(71, 7) Source(129, 7) + SourceIndex(0) -4 >Emitted(71, 9) Source(129, 9) + SourceIndex(0) -5 >Emitted(71, 12) Source(129, 12) + SourceIndex(0) -6 >Emitted(71, 22) Source(129, 21) + SourceIndex(0) -7 >Emitted(71, 23) Source(129, 22) + SourceIndex(0) -8 >Emitted(71, 25) Source(129, 24) + SourceIndex(0) -9 >Emitted(71, 26) Source(129, 25) + SourceIndex(0) -10>Emitted(71, 30) Source(129, 29) + SourceIndex(0) -11>Emitted(71, 36) Source(129, 35) + SourceIndex(0) -12>Emitted(71, 37) Source(129, 42) + SourceIndex(0) -13>Emitted(71, 38) Source(129, 43) + SourceIndex(0) -14>Emitted(71, 40) Source(129, 45) + SourceIndex(0) -15>Emitted(71, 41) Source(129, 46) + SourceIndex(0) -16>Emitted(71, 42) Source(129, 46) + SourceIndex(0) -17>Emitted(71, 43) Source(129, 47) + SourceIndex(0) -18>Emitted(71, 44) Source(129, 48) + SourceIndex(0) -19>Emitted(71, 45) Source(129, 49) + SourceIndex(0) +1->Emitted(105, 1) Source(129, 1) + SourceIndex(0) +2 >Emitted(105, 6) Source(129, 6) + SourceIndex(0) +3 >Emitted(105, 7) Source(129, 7) + SourceIndex(0) +4 >Emitted(105, 9) Source(129, 9) + SourceIndex(0) +5 >Emitted(105, 12) Source(129, 12) + SourceIndex(0) +6 >Emitted(105, 22) Source(129, 21) + SourceIndex(0) +7 >Emitted(105, 23) Source(129, 22) + SourceIndex(0) +8 >Emitted(105, 25) Source(129, 24) + SourceIndex(0) +9 >Emitted(105, 26) Source(129, 25) + SourceIndex(0) --- ->>>objc8.t7 = function (n) { return n; }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(106, 5) Source(129, 29) + SourceIndex(0) +2 >Emitted(106, 11) Source(129, 35) + SourceIndex(0) +3 >Emitted(106, 12) Source(129, 42) + SourceIndex(0) +4 >Emitted(106, 13) Source(129, 43) + SourceIndex(0) +5 >Emitted(106, 15) Source(129, 45) + SourceIndex(0) +6 >Emitted(106, 16) Source(129, 46) + SourceIndex(0) +7 >Emitted(106, 17) Source(129, 46) + SourceIndex(0) +--- +>>>}; 1 > -2 >^^^^^ -3 > ^ -4 > ^^ -5 > ^^^ -6 > ^^^^^^^^^^ -7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^-> -1 > - > -2 >objc8 -3 > . -4 > t7 -5 > = -6 > function( -7 > n: number -8 > ) { -9 > return -10> -11> n -12> -13> -14> } -15> ; -1 >Emitted(72, 1) Source(130, 1) + SourceIndex(0) -2 >Emitted(72, 6) Source(130, 6) + SourceIndex(0) -3 >Emitted(72, 7) Source(130, 7) + SourceIndex(0) -4 >Emitted(72, 9) Source(130, 9) + SourceIndex(0) -5 >Emitted(72, 12) Source(130, 12) + SourceIndex(0) -6 >Emitted(72, 22) Source(130, 21) + SourceIndex(0) -7 >Emitted(72, 23) Source(130, 30) + SourceIndex(0) -8 >Emitted(72, 27) Source(130, 34) + SourceIndex(0) -9 >Emitted(72, 33) Source(130, 40) + SourceIndex(0) -10>Emitted(72, 34) Source(130, 41) + SourceIndex(0) -11>Emitted(72, 35) Source(130, 42) + SourceIndex(0) -12>Emitted(72, 36) Source(130, 42) + SourceIndex(0) -13>Emitted(72, 37) Source(130, 43) + SourceIndex(0) -14>Emitted(72, 38) Source(130, 44) + SourceIndex(0) -15>Emitted(72, 39) Source(130, 45) + SourceIndex(0) +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(107, 1) Source(129, 47) + SourceIndex(0) +2 >Emitted(107, 2) Source(129, 48) + SourceIndex(0) +3 >Emitted(107, 3) Source(129, 49) + SourceIndex(0) --- ->>>objc8.t8 = function (n) { return n; }; +>>>objc8.t7 = function (n) { +1-> +2 >^^^^^ +3 > ^ +4 > ^^ +5 > ^^^ +6 > ^^^^^^^^^^ +7 > ^ +1-> + > +2 >objc8 +3 > . +4 > t7 +5 > = +6 > function( +7 > n: number +1->Emitted(108, 1) Source(130, 1) + SourceIndex(0) +2 >Emitted(108, 6) Source(130, 6) + SourceIndex(0) +3 >Emitted(108, 7) Source(130, 7) + SourceIndex(0) +4 >Emitted(108, 9) Source(130, 9) + SourceIndex(0) +5 >Emitted(108, 12) Source(130, 12) + SourceIndex(0) +6 >Emitted(108, 22) Source(130, 21) + SourceIndex(0) +7 >Emitted(108, 23) Source(130, 30) + SourceIndex(0) +--- +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > +1 >Emitted(109, 5) Source(130, 34) + SourceIndex(0) +2 >Emitted(109, 11) Source(130, 40) + SourceIndex(0) +3 >Emitted(109, 12) Source(130, 41) + SourceIndex(0) +4 >Emitted(109, 13) Source(130, 42) + SourceIndex(0) +5 >Emitted(109, 14) Source(130, 42) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(110, 1) Source(130, 43) + SourceIndex(0) +2 >Emitted(110, 2) Source(130, 44) + SourceIndex(0) +3 >Emitted(110, 3) Source(130, 45) + SourceIndex(0) +--- +>>>objc8.t8 = function (n) { 1-> 2 >^^^^^ 3 > ^ @@ -1783,14 +1871,6 @@ sourceFile:contextualTyping.ts 5 > ^^^ 6 > ^^^^^^^^^^ 7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ 1-> > > @@ -1800,194 +1880,231 @@ sourceFile:contextualTyping.ts 5 > = 6 > function( 7 > n -8 > ) { -9 > return -10> -11> n -12> ; -13> -14> } -15> ; -1->Emitted(73, 1) Source(132, 1) + SourceIndex(0) -2 >Emitted(73, 6) Source(132, 6) + SourceIndex(0) -3 >Emitted(73, 7) Source(132, 7) + SourceIndex(0) -4 >Emitted(73, 9) Source(132, 9) + SourceIndex(0) -5 >Emitted(73, 12) Source(132, 12) + SourceIndex(0) -6 >Emitted(73, 22) Source(132, 21) + SourceIndex(0) -7 >Emitted(73, 23) Source(132, 22) + SourceIndex(0) -8 >Emitted(73, 27) Source(132, 26) + SourceIndex(0) -9 >Emitted(73, 33) Source(132, 32) + SourceIndex(0) -10>Emitted(73, 34) Source(132, 33) + SourceIndex(0) -11>Emitted(73, 35) Source(132, 34) + SourceIndex(0) -12>Emitted(73, 36) Source(132, 35) + SourceIndex(0) -13>Emitted(73, 37) Source(132, 36) + SourceIndex(0) -14>Emitted(73, 38) Source(132, 37) + SourceIndex(0) -15>Emitted(73, 39) Source(132, 38) + SourceIndex(0) +1->Emitted(111, 1) Source(132, 1) + SourceIndex(0) +2 >Emitted(111, 6) Source(132, 6) + SourceIndex(0) +3 >Emitted(111, 7) Source(132, 7) + SourceIndex(0) +4 >Emitted(111, 9) Source(132, 9) + SourceIndex(0) +5 >Emitted(111, 12) Source(132, 12) + SourceIndex(0) +6 >Emitted(111, 22) Source(132, 21) + SourceIndex(0) +7 >Emitted(111, 23) Source(132, 22) + SourceIndex(0) --- ->>>objc8.t9 = [[], []]; +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > ; +1 >Emitted(112, 5) Source(132, 26) + SourceIndex(0) +2 >Emitted(112, 11) Source(132, 32) + SourceIndex(0) +3 >Emitted(112, 12) Source(132, 33) + SourceIndex(0) +4 >Emitted(112, 13) Source(132, 34) + SourceIndex(0) +5 >Emitted(112, 14) Source(132, 35) + SourceIndex(0) +--- +>>>}; 1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(113, 1) Source(132, 36) + SourceIndex(0) +2 >Emitted(113, 2) Source(132, 37) + SourceIndex(0) +3 >Emitted(113, 3) Source(132, 38) + SourceIndex(0) +--- +>>>objc8.t9 = [ +1-> 2 >^^^^^ 3 > ^ 4 > ^^ 5 > ^^^ -6 > ^ -7 > ^^ -8 > ^^ -9 > ^^ -10> ^ -11> ^ -12> ^^^^^^-> -1 > +1-> > 2 >objc8 3 > . 4 > t9 5 > = -6 > [ -7 > [] -8 > , -9 > [] -10> ] -11> ; -1 >Emitted(74, 1) Source(133, 1) + SourceIndex(0) -2 >Emitted(74, 6) Source(133, 6) + SourceIndex(0) -3 >Emitted(74, 7) Source(133, 7) + SourceIndex(0) -4 >Emitted(74, 9) Source(133, 9) + SourceIndex(0) -5 >Emitted(74, 12) Source(133, 12) + SourceIndex(0) -6 >Emitted(74, 13) Source(133, 13) + SourceIndex(0) -7 >Emitted(74, 15) Source(133, 15) + SourceIndex(0) -8 >Emitted(74, 17) Source(133, 16) + SourceIndex(0) -9 >Emitted(74, 19) Source(133, 18) + SourceIndex(0) -10>Emitted(74, 20) Source(133, 19) + SourceIndex(0) -11>Emitted(74, 21) Source(133, 20) + SourceIndex(0) +1->Emitted(114, 1) Source(133, 1) + SourceIndex(0) +2 >Emitted(114, 6) Source(133, 6) + SourceIndex(0) +3 >Emitted(114, 7) Source(133, 7) + SourceIndex(0) +4 >Emitted(114, 9) Source(133, 9) + SourceIndex(0) +5 >Emitted(114, 12) Source(133, 12) + SourceIndex(0) --- ->>>objc8.t10 = [({}), ({})]; +>>> [], +1 >^^^^ +2 > ^^ +3 > ^-> +1 >[ +2 > [] +1 >Emitted(115, 5) Source(133, 13) + SourceIndex(0) +2 >Emitted(115, 7) Source(133, 15) + SourceIndex(0) +--- +>>> [] +1->^^^^ +2 > ^^ +1->, +2 > [] +1->Emitted(116, 5) Source(133, 16) + SourceIndex(0) +2 >Emitted(116, 7) Source(133, 18) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(117, 2) Source(133, 19) + SourceIndex(0) +2 >Emitted(117, 3) Source(133, 20) + SourceIndex(0) +--- +>>>objc8.t10 = [ 1-> 2 >^^^^^ 3 > ^ 4 > ^^^ 5 > ^^^ -6 > ^ -7 > ^ -8 > ^^ -9 > ^ -10> ^^ -11> ^ -12> ^^ -13> ^ -14> ^ -15> ^ -16> ^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >objc8 3 > . 4 > t10 5 > = -6 > [ -7 > ( -8 > {} -9 > ) -10> , -11> ( -12> {} -13> ) -14> ] -15> ; -1->Emitted(75, 1) Source(134, 1) + SourceIndex(0) -2 >Emitted(75, 6) Source(134, 6) + SourceIndex(0) -3 >Emitted(75, 7) Source(134, 7) + SourceIndex(0) -4 >Emitted(75, 10) Source(134, 10) + SourceIndex(0) -5 >Emitted(75, 13) Source(134, 13) + SourceIndex(0) -6 >Emitted(75, 14) Source(134, 20) + SourceIndex(0) -7 >Emitted(75, 15) Source(134, 21) + SourceIndex(0) -8 >Emitted(75, 17) Source(134, 23) + SourceIndex(0) -9 >Emitted(75, 18) Source(134, 24) + SourceIndex(0) -10>Emitted(75, 20) Source(134, 31) + SourceIndex(0) -11>Emitted(75, 21) Source(134, 32) + SourceIndex(0) -12>Emitted(75, 23) Source(134, 34) + SourceIndex(0) -13>Emitted(75, 24) Source(134, 35) + SourceIndex(0) -14>Emitted(75, 25) Source(134, 36) + SourceIndex(0) -15>Emitted(75, 26) Source(134, 37) + SourceIndex(0) +1->Emitted(118, 1) Source(134, 1) + SourceIndex(0) +2 >Emitted(118, 6) Source(134, 6) + SourceIndex(0) +3 >Emitted(118, 7) Source(134, 7) + SourceIndex(0) +4 >Emitted(118, 10) Source(134, 10) + SourceIndex(0) +5 >Emitted(118, 13) Source(134, 13) + SourceIndex(0) --- ->>>objc8.t11 = [function (n, s) { return s; }]; +>>> ({}), +1 >^^^^ +2 > ^ +3 > ^^ +4 > ^ +5 > ^-> +1 >[ +2 > ( +3 > {} +4 > ) +1 >Emitted(119, 5) Source(134, 20) + SourceIndex(0) +2 >Emitted(119, 6) Source(134, 21) + SourceIndex(0) +3 >Emitted(119, 8) Source(134, 23) + SourceIndex(0) +4 >Emitted(119, 9) Source(134, 24) + SourceIndex(0) +--- +>>> ({}) +1->^^^^ +2 > ^ +3 > ^^ +4 > ^ +1->, +2 > ( +3 > {} +4 > ) +1->Emitted(120, 5) Source(134, 31) + SourceIndex(0) +2 >Emitted(120, 6) Source(134, 32) + SourceIndex(0) +3 >Emitted(120, 8) Source(134, 34) + SourceIndex(0) +4 >Emitted(120, 9) Source(134, 35) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(121, 2) Source(134, 36) + SourceIndex(0) +2 >Emitted(121, 3) Source(134, 37) + SourceIndex(0) +--- +>>>objc8.t11 = [ 1-> 2 >^^^^^ 3 > ^ 4 > ^^^ 5 > ^^^ -6 > ^ -7 > ^^^^^^^^^^ -8 > ^ -9 > ^^ -10> ^ -11> ^^^^ -12> ^^^^^^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ -19> ^ +6 > ^^^^^^^^^^-> 1-> > 2 >objc8 3 > . 4 > t11 5 > = -6 > [ -7 > function( -8 > n -9 > , -10> s -11> ) { -12> return -13> -14> s -15> ; -16> -17> } -18> ] -19> ; -1->Emitted(76, 1) Source(135, 1) + SourceIndex(0) -2 >Emitted(76, 6) Source(135, 6) + SourceIndex(0) -3 >Emitted(76, 7) Source(135, 7) + SourceIndex(0) -4 >Emitted(76, 10) Source(135, 10) + SourceIndex(0) -5 >Emitted(76, 13) Source(135, 13) + SourceIndex(0) -6 >Emitted(76, 14) Source(135, 14) + SourceIndex(0) -7 >Emitted(76, 24) Source(135, 23) + SourceIndex(0) -8 >Emitted(76, 25) Source(135, 24) + SourceIndex(0) -9 >Emitted(76, 27) Source(135, 26) + SourceIndex(0) -10>Emitted(76, 28) Source(135, 27) + SourceIndex(0) -11>Emitted(76, 32) Source(135, 31) + SourceIndex(0) -12>Emitted(76, 38) Source(135, 37) + SourceIndex(0) -13>Emitted(76, 39) Source(135, 38) + SourceIndex(0) -14>Emitted(76, 40) Source(135, 39) + SourceIndex(0) -15>Emitted(76, 41) Source(135, 40) + SourceIndex(0) -16>Emitted(76, 42) Source(135, 41) + SourceIndex(0) -17>Emitted(76, 43) Source(135, 42) + SourceIndex(0) -18>Emitted(76, 44) Source(135, 43) + SourceIndex(0) -19>Emitted(76, 45) Source(135, 44) + SourceIndex(0) +1->Emitted(122, 1) Source(135, 1) + SourceIndex(0) +2 >Emitted(122, 6) Source(135, 6) + SourceIndex(0) +3 >Emitted(122, 7) Source(135, 7) + SourceIndex(0) +4 >Emitted(122, 10) Source(135, 10) + SourceIndex(0) +5 >Emitted(122, 13) Source(135, 13) + SourceIndex(0) +--- +>>> function (n, s) { +1->^^^^ +2 > ^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +1->[ +2 > function( +3 > n +4 > , +5 > s +1->Emitted(123, 5) Source(135, 14) + SourceIndex(0) +2 >Emitted(123, 15) Source(135, 23) + SourceIndex(0) +3 >Emitted(123, 16) Source(135, 24) + SourceIndex(0) +4 >Emitted(123, 18) Source(135, 26) + SourceIndex(0) +5 >Emitted(123, 19) Source(135, 27) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(124, 9) Source(135, 31) + SourceIndex(0) +2 >Emitted(124, 15) Source(135, 37) + SourceIndex(0) +3 >Emitted(124, 16) Source(135, 38) + SourceIndex(0) +4 >Emitted(124, 17) Source(135, 39) + SourceIndex(0) +5 >Emitted(124, 18) Source(135, 40) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(125, 5) Source(135, 41) + SourceIndex(0) +2 >Emitted(125, 6) Source(135, 42) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(126, 2) Source(135, 43) + SourceIndex(0) +2 >Emitted(126, 3) Source(135, 44) + SourceIndex(0) --- >>>objc8.t12 = { -1 > +1-> 2 >^^^^^ 3 > ^ 4 > ^^^ 5 > ^^^ 6 > ^^-> -1 > +1-> > 2 >objc8 3 > . 4 > t12 5 > = -1 >Emitted(77, 1) Source(136, 1) + SourceIndex(0) -2 >Emitted(77, 6) Source(136, 6) + SourceIndex(0) -3 >Emitted(77, 7) Source(136, 7) + SourceIndex(0) -4 >Emitted(77, 10) Source(136, 10) + SourceIndex(0) -5 >Emitted(77, 13) Source(136, 13) + SourceIndex(0) +1->Emitted(127, 1) Source(136, 1) + SourceIndex(0) +2 >Emitted(127, 6) Source(136, 6) + SourceIndex(0) +3 >Emitted(127, 7) Source(136, 7) + SourceIndex(0) +4 >Emitted(127, 10) Source(136, 10) + SourceIndex(0) +5 >Emitted(127, 13) Source(136, 13) + SourceIndex(0) --- >>> foo: ({}) 1->^^^^ @@ -2003,12 +2120,12 @@ sourceFile:contextualTyping.ts 4 > ( 5 > {} 6 > ) -1->Emitted(78, 5) Source(137, 5) + SourceIndex(0) -2 >Emitted(78, 8) Source(137, 8) + SourceIndex(0) -3 >Emitted(78, 10) Source(137, 16) + SourceIndex(0) -4 >Emitted(78, 11) Source(137, 17) + SourceIndex(0) -5 >Emitted(78, 13) Source(137, 19) + SourceIndex(0) -6 >Emitted(78, 14) Source(137, 20) + SourceIndex(0) +1->Emitted(128, 5) Source(137, 5) + SourceIndex(0) +2 >Emitted(128, 8) Source(137, 8) + SourceIndex(0) +3 >Emitted(128, 10) Source(137, 16) + SourceIndex(0) +4 >Emitted(128, 11) Source(137, 17) + SourceIndex(0) +5 >Emitted(128, 13) Source(137, 19) + SourceIndex(0) +6 >Emitted(128, 14) Source(137, 20) + SourceIndex(0) --- >>>}; 1 >^ @@ -2017,8 +2134,8 @@ sourceFile:contextualTyping.ts 1 > >} 2 > -1 >Emitted(79, 2) Source(138, 2) + SourceIndex(0) -2 >Emitted(79, 3) Source(138, 2) + SourceIndex(0) +1 >Emitted(129, 2) Source(138, 2) + SourceIndex(0) +2 >Emitted(129, 3) Source(138, 2) + SourceIndex(0) --- >>>objc8.t13 = ({ 1-> @@ -2027,7 +2144,7 @@ sourceFile:contextualTyping.ts 4 > ^^^ 5 > ^^^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^-> 1-> > 2 >objc8 @@ -2035,14 +2152,14 @@ sourceFile:contextualTyping.ts 4 > t13 5 > = 6 > ( -1->Emitted(80, 1) Source(139, 1) + SourceIndex(0) -2 >Emitted(80, 6) Source(139, 6) + SourceIndex(0) -3 >Emitted(80, 7) Source(139, 7) + SourceIndex(0) -4 >Emitted(80, 10) Source(139, 10) + SourceIndex(0) -5 >Emitted(80, 13) Source(139, 19) + SourceIndex(0) -6 >Emitted(80, 14) Source(139, 20) + SourceIndex(0) +1->Emitted(130, 1) Source(139, 1) + SourceIndex(0) +2 >Emitted(130, 6) Source(139, 6) + SourceIndex(0) +3 >Emitted(130, 7) Source(139, 7) + SourceIndex(0) +4 >Emitted(130, 10) Source(139, 10) + SourceIndex(0) +5 >Emitted(130, 13) Source(139, 19) + SourceIndex(0) +6 >Emitted(130, 14) Source(139, 20) + SourceIndex(0) --- ->>> f: function (i, s) { return s; } +>>> f: function (i, s) { 1->^^^^ 2 > ^ 3 > ^^ @@ -2050,13 +2167,6 @@ sourceFile:contextualTyping.ts 5 > ^ 6 > ^^ 7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ 1->{ > 2 > f @@ -2065,27 +2175,38 @@ sourceFile:contextualTyping.ts 5 > i 6 > , 7 > s -8 > ) { -9 > return -10> -11> s -12> ; -13> -14> } -1->Emitted(81, 5) Source(140, 5) + SourceIndex(0) -2 >Emitted(81, 6) Source(140, 6) + SourceIndex(0) -3 >Emitted(81, 8) Source(140, 8) + SourceIndex(0) -4 >Emitted(81, 18) Source(140, 17) + SourceIndex(0) -5 >Emitted(81, 19) Source(140, 18) + SourceIndex(0) -6 >Emitted(81, 21) Source(140, 20) + SourceIndex(0) -7 >Emitted(81, 22) Source(140, 21) + SourceIndex(0) -8 >Emitted(81, 26) Source(140, 25) + SourceIndex(0) -9 >Emitted(81, 32) Source(140, 31) + SourceIndex(0) -10>Emitted(81, 33) Source(140, 32) + SourceIndex(0) -11>Emitted(81, 34) Source(140, 33) + SourceIndex(0) -12>Emitted(81, 35) Source(140, 34) + SourceIndex(0) -13>Emitted(81, 36) Source(140, 35) + SourceIndex(0) -14>Emitted(81, 37) Source(140, 36) + SourceIndex(0) +1->Emitted(131, 5) Source(140, 5) + SourceIndex(0) +2 >Emitted(131, 6) Source(140, 6) + SourceIndex(0) +3 >Emitted(131, 8) Source(140, 8) + SourceIndex(0) +4 >Emitted(131, 18) Source(140, 17) + SourceIndex(0) +5 >Emitted(131, 19) Source(140, 18) + SourceIndex(0) +6 >Emitted(131, 21) Source(140, 20) + SourceIndex(0) +7 >Emitted(131, 22) Source(140, 21) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(132, 9) Source(140, 25) + SourceIndex(0) +2 >Emitted(132, 15) Source(140, 31) + SourceIndex(0) +3 >Emitted(132, 16) Source(140, 32) + SourceIndex(0) +4 >Emitted(132, 17) Source(140, 33) + SourceIndex(0) +5 >Emitted(132, 18) Source(140, 34) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(133, 5) Source(140, 35) + SourceIndex(0) +2 >Emitted(133, 6) Source(140, 36) + SourceIndex(0) --- >>>}); 1 >^ @@ -2096,9 +2217,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(82, 2) Source(141, 2) + SourceIndex(0) -2 >Emitted(82, 3) Source(141, 3) + SourceIndex(0) -3 >Emitted(82, 4) Source(141, 3) + SourceIndex(0) +1 >Emitted(134, 2) Source(141, 2) + SourceIndex(0) +2 >Emitted(134, 3) Source(141, 3) + SourceIndex(0) +3 >Emitted(134, 4) Source(141, 3) + SourceIndex(0) --- >>>objc8.t14 = ({ 1-> @@ -2114,12 +2235,12 @@ sourceFile:contextualTyping.ts 4 > t14 5 > = 6 > ( -1->Emitted(83, 1) Source(142, 1) + SourceIndex(0) -2 >Emitted(83, 6) Source(142, 6) + SourceIndex(0) -3 >Emitted(83, 7) Source(142, 7) + SourceIndex(0) -4 >Emitted(83, 10) Source(142, 10) + SourceIndex(0) -5 >Emitted(83, 13) Source(142, 19) + SourceIndex(0) -6 >Emitted(83, 14) Source(142, 20) + SourceIndex(0) +1->Emitted(135, 1) Source(142, 1) + SourceIndex(0) +2 >Emitted(135, 6) Source(142, 6) + SourceIndex(0) +3 >Emitted(135, 7) Source(142, 7) + SourceIndex(0) +4 >Emitted(135, 10) Source(142, 10) + SourceIndex(0) +5 >Emitted(135, 13) Source(142, 19) + SourceIndex(0) +6 >Emitted(135, 14) Source(142, 20) + SourceIndex(0) --- >>> a: [] 1 >^^^^ @@ -2131,10 +2252,10 @@ sourceFile:contextualTyping.ts 2 > a 3 > : 4 > [] -1 >Emitted(84, 5) Source(143, 5) + SourceIndex(0) -2 >Emitted(84, 6) Source(143, 6) + SourceIndex(0) -3 >Emitted(84, 8) Source(143, 8) + SourceIndex(0) -4 >Emitted(84, 10) Source(143, 10) + SourceIndex(0) +1 >Emitted(136, 5) Source(143, 5) + SourceIndex(0) +2 >Emitted(136, 6) Source(143, 6) + SourceIndex(0) +3 >Emitted(136, 8) Source(143, 8) + SourceIndex(0) +4 >Emitted(136, 10) Source(143, 10) + SourceIndex(0) --- >>>}); 1 >^ @@ -2145,9 +2266,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(85, 2) Source(144, 2) + SourceIndex(0) -2 >Emitted(85, 3) Source(144, 3) + SourceIndex(0) -3 >Emitted(85, 4) Source(144, 3) + SourceIndex(0) +1 >Emitted(137, 2) Source(144, 2) + SourceIndex(0) +2 >Emitted(137, 3) Source(144, 3) + SourceIndex(0) +3 >Emitted(137, 4) Source(144, 3) + SourceIndex(0) --- >>>// CONTEXT: Function call 1-> @@ -2158,33 +2279,36 @@ sourceFile:contextualTyping.ts > 2 > 3 >// CONTEXT: Function call -1->Emitted(86, 1) Source(146, 1) + SourceIndex(0) -2 >Emitted(86, 1) Source(145, 1) + SourceIndex(0) -3 >Emitted(86, 26) Source(145, 26) + SourceIndex(0) +1->Emitted(138, 1) Source(146, 1) + SourceIndex(0) +2 >Emitted(138, 1) Source(145, 1) + SourceIndex(0) +3 >Emitted(138, 26) Source(145, 26) + SourceIndex(0) --- ->>>function c9t5(f) { } +>>>function c9t5(f) { 1 >^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^ -4 > ^ 1 > >function c9t5( 2 > f: (n: number) => IFoo -3 > ) { -4 > } -1 >Emitted(87, 15) Source(146, 15) + SourceIndex(0) -2 >Emitted(87, 16) Source(146, 37) + SourceIndex(0) -3 >Emitted(87, 20) Source(146, 40) + SourceIndex(0) name (c9t5) -4 >Emitted(87, 21) Source(146, 41) + SourceIndex(0) name (c9t5) +1 >Emitted(139, 15) Source(146, 15) + SourceIndex(0) +2 >Emitted(139, 16) Source(146, 37) + SourceIndex(0) --- ->>>; +>>>} 1 > 2 >^ +3 > ^-> +1 >) { +2 >} +1 >Emitted(140, 1) Source(146, 40) + SourceIndex(0) name (c9t5) +2 >Emitted(140, 2) Source(146, 41) + SourceIndex(0) name (c9t5) +--- +>>>; +1-> +2 >^ 3 > ^^^^^^^^^^^^^^^^^^^-> -1 > +1-> 2 >; -1 >Emitted(88, 1) Source(146, 41) + SourceIndex(0) -2 >Emitted(88, 2) Source(146, 42) + SourceIndex(0) +1->Emitted(141, 1) Source(146, 41) + SourceIndex(0) +2 >Emitted(141, 2) Source(146, 42) + SourceIndex(0) --- >>>c9t5(function (n) { 1-> @@ -2199,11 +2323,11 @@ sourceFile:contextualTyping.ts 3 > ( 4 > function( 5 > n -1->Emitted(89, 1) Source(147, 1) + SourceIndex(0) -2 >Emitted(89, 5) Source(147, 5) + SourceIndex(0) -3 >Emitted(89, 6) Source(147, 6) + SourceIndex(0) -4 >Emitted(89, 16) Source(147, 15) + SourceIndex(0) -5 >Emitted(89, 17) Source(147, 16) + SourceIndex(0) +1->Emitted(142, 1) Source(147, 1) + SourceIndex(0) +2 >Emitted(142, 5) Source(147, 5) + SourceIndex(0) +3 >Emitted(142, 6) Source(147, 6) + SourceIndex(0) +4 >Emitted(142, 16) Source(147, 15) + SourceIndex(0) +5 >Emitted(142, 17) Source(147, 16) + SourceIndex(0) --- >>> return ({}); 1->^^^^ @@ -2221,13 +2345,13 @@ sourceFile:contextualTyping.ts 5 > {} 6 > ) 7 > ; -1->Emitted(90, 5) Source(148, 5) + SourceIndex(0) -2 >Emitted(90, 11) Source(148, 11) + SourceIndex(0) -3 >Emitted(90, 12) Source(148, 18) + SourceIndex(0) -4 >Emitted(90, 13) Source(148, 19) + SourceIndex(0) -5 >Emitted(90, 15) Source(148, 21) + SourceIndex(0) -6 >Emitted(90, 16) Source(148, 22) + SourceIndex(0) -7 >Emitted(90, 17) Source(148, 23) + SourceIndex(0) +1->Emitted(143, 5) Source(148, 5) + SourceIndex(0) +2 >Emitted(143, 11) Source(148, 11) + SourceIndex(0) +3 >Emitted(143, 12) Source(148, 18) + SourceIndex(0) +4 >Emitted(143, 13) Source(148, 19) + SourceIndex(0) +5 >Emitted(143, 15) Source(148, 21) + SourceIndex(0) +6 >Emitted(143, 16) Source(148, 22) + SourceIndex(0) +7 >Emitted(143, 17) Source(148, 23) + SourceIndex(0) --- >>>}); 1 > @@ -2240,106 +2364,115 @@ sourceFile:contextualTyping.ts 2 >} 3 > ) 4 > ; -1 >Emitted(91, 1) Source(149, 1) + SourceIndex(0) -2 >Emitted(91, 2) Source(149, 2) + SourceIndex(0) -3 >Emitted(91, 3) Source(149, 3) + SourceIndex(0) -4 >Emitted(91, 4) Source(149, 4) + SourceIndex(0) +1 >Emitted(144, 1) Source(149, 1) + SourceIndex(0) +2 >Emitted(144, 2) Source(149, 2) + SourceIndex(0) +3 >Emitted(144, 3) Source(149, 3) + SourceIndex(0) +4 >Emitted(144, 4) Source(149, 4) + SourceIndex(0) --- >>>// CONTEXT: Return statement 1-> 2 > 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > >// CONTEXT: Return statement > 2 > 3 >// CONTEXT: Return statement -1->Emitted(92, 1) Source(152, 1) + SourceIndex(0) -2 >Emitted(92, 1) Source(151, 1) + SourceIndex(0) -3 >Emitted(92, 29) Source(151, 29) + SourceIndex(0) +1->Emitted(145, 1) Source(152, 1) + SourceIndex(0) +2 >Emitted(145, 1) Source(151, 1) + SourceIndex(0) +3 >Emitted(145, 29) Source(151, 29) + SourceIndex(0) --- ->>>var c10t5 = function () { return function (n) { return ({}); }; }; -1->^^^^ +>>>var c10t5 = function () { +1 >^^^^ 2 > ^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^ -6 > ^ -7 > ^^^^^^^^^^ -8 > ^ -9 > ^^^^ -10> ^^^^^^ -11> ^ -12> ^ -13> ^^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ -19> ^ -20> ^ -21> ^ -1-> +4 > ^^^^^^^^^^^^^^-> +1 > >var 2 > c10t5 3 > : () => (n: number) => IFoo = -4 > function() { -5 > return -6 > -7 > function( -8 > n -9 > ) { -10> return -11> -12> ( -13> {} -14> ) -15> -16> -17> } -18> -19> -20> } -21> ; -1->Emitted(93, 5) Source(152, 5) + SourceIndex(0) -2 >Emitted(93, 10) Source(152, 10) + SourceIndex(0) -3 >Emitted(93, 13) Source(152, 40) + SourceIndex(0) -4 >Emitted(93, 27) Source(152, 53) + SourceIndex(0) -5 >Emitted(93, 33) Source(152, 59) + SourceIndex(0) -6 >Emitted(93, 34) Source(152, 60) + SourceIndex(0) -7 >Emitted(93, 44) Source(152, 69) + SourceIndex(0) -8 >Emitted(93, 45) Source(152, 70) + SourceIndex(0) -9 >Emitted(93, 49) Source(152, 74) + SourceIndex(0) -10>Emitted(93, 55) Source(152, 80) + SourceIndex(0) -11>Emitted(93, 56) Source(152, 87) + SourceIndex(0) -12>Emitted(93, 57) Source(152, 88) + SourceIndex(0) -13>Emitted(93, 59) Source(152, 90) + SourceIndex(0) -14>Emitted(93, 60) Source(152, 91) + SourceIndex(0) -15>Emitted(93, 61) Source(152, 91) + SourceIndex(0) -16>Emitted(93, 62) Source(152, 92) + SourceIndex(0) -17>Emitted(93, 63) Source(152, 93) + SourceIndex(0) -18>Emitted(93, 64) Source(152, 93) + SourceIndex(0) -19>Emitted(93, 65) Source(152, 94) + SourceIndex(0) -20>Emitted(93, 66) Source(152, 95) + SourceIndex(0) -21>Emitted(93, 67) Source(152, 96) + SourceIndex(0) +1 >Emitted(146, 5) Source(152, 5) + SourceIndex(0) +2 >Emitted(146, 10) Source(152, 10) + SourceIndex(0) +3 >Emitted(146, 13) Source(152, 40) + SourceIndex(0) +--- +>>> return function (n) { +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^^^^^^^ +5 > ^ +1->function() { +2 > return +3 > +4 > function( +5 > n +1->Emitted(147, 5) Source(152, 53) + SourceIndex(0) +2 >Emitted(147, 11) Source(152, 59) + SourceIndex(0) +3 >Emitted(147, 12) Source(152, 60) + SourceIndex(0) +4 >Emitted(147, 22) Source(152, 69) + SourceIndex(0) +5 >Emitted(147, 23) Source(152, 70) + SourceIndex(0) +--- +>>> return ({}); +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(148, 9) Source(152, 74) + SourceIndex(0) +2 >Emitted(148, 15) Source(152, 80) + SourceIndex(0) +3 >Emitted(148, 16) Source(152, 87) + SourceIndex(0) +4 >Emitted(148, 17) Source(152, 88) + SourceIndex(0) +5 >Emitted(148, 19) Source(152, 90) + SourceIndex(0) +6 >Emitted(148, 20) Source(152, 91) + SourceIndex(0) +7 >Emitted(148, 21) Source(152, 91) + SourceIndex(0) +--- +>>> }; +1 >^^^^ +2 > ^ +3 > ^ +1 > +2 > } +3 > +1 >Emitted(149, 5) Source(152, 92) + SourceIndex(0) +2 >Emitted(149, 6) Source(152, 93) + SourceIndex(0) +3 >Emitted(149, 7) Source(152, 93) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(150, 1) Source(152, 94) + SourceIndex(0) +2 >Emitted(150, 2) Source(152, 95) + SourceIndex(0) +3 >Emitted(150, 3) Source(152, 96) + SourceIndex(0) --- >>>// CONTEXT: Newing a class -1 > +1-> 2 > 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^-> -1 > +1-> > >// CONTEXT: Newing a class > 2 > 3 >// CONTEXT: Newing a class -1 >Emitted(94, 1) Source(155, 1) + SourceIndex(0) -2 >Emitted(94, 1) Source(154, 1) + SourceIndex(0) -3 >Emitted(94, 27) Source(154, 27) + SourceIndex(0) +1->Emitted(151, 1) Source(155, 1) + SourceIndex(0) +2 >Emitted(151, 1) Source(154, 1) + SourceIndex(0) +3 >Emitted(151, 27) Source(154, 27) + SourceIndex(0) --- >>>var C11t5 = (function () { >>> function C11t5(f) { @@ -2350,9 +2483,9 @@ sourceFile:contextualTyping.ts >class C11t5 { 2 > constructor( 3 > f: (n: number) => IFoo -1->Emitted(96, 5) Source(155, 15) + SourceIndex(0) name (C11t5) -2 >Emitted(96, 20) Source(155, 27) + SourceIndex(0) name (C11t5) -3 >Emitted(96, 21) Source(155, 49) + SourceIndex(0) name (C11t5) +1->Emitted(153, 5) Source(155, 15) + SourceIndex(0) name (C11t5) +2 >Emitted(153, 20) Source(155, 27) + SourceIndex(0) name (C11t5) +3 >Emitted(153, 21) Source(155, 49) + SourceIndex(0) name (C11t5) --- >>> } 1 >^^^^ @@ -2360,16 +2493,16 @@ sourceFile:contextualTyping.ts 3 > ^^^^^^^^^^^^^-> 1 >) { 2 > } -1 >Emitted(97, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor) -2 >Emitted(97, 6) Source(155, 54) + SourceIndex(0) name (C11t5.constructor) +1 >Emitted(154, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor) +2 >Emitted(154, 6) Source(155, 54) + SourceIndex(0) name (C11t5.constructor) --- >>> return C11t5; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(98, 5) Source(155, 55) + SourceIndex(0) name (C11t5) -2 >Emitted(98, 17) Source(155, 56) + SourceIndex(0) name (C11t5) +1->Emitted(155, 5) Source(155, 55) + SourceIndex(0) name (C11t5) +2 >Emitted(155, 17) Source(155, 56) + SourceIndex(0) name (C11t5) --- >>>})(); 1 > @@ -2380,21 +2513,21 @@ sourceFile:contextualTyping.ts 2 >} 3 > 4 > class C11t5 { constructor(f: (n: number) => IFoo) { } } -1 >Emitted(99, 1) Source(155, 55) + SourceIndex(0) name (C11t5) -2 >Emitted(99, 2) Source(155, 56) + SourceIndex(0) name (C11t5) -3 >Emitted(99, 2) Source(155, 1) + SourceIndex(0) -4 >Emitted(99, 6) Source(155, 56) + SourceIndex(0) +1 >Emitted(156, 1) Source(155, 55) + SourceIndex(0) name (C11t5) +2 >Emitted(156, 2) Source(155, 56) + SourceIndex(0) name (C11t5) +3 >Emitted(156, 2) Source(155, 1) + SourceIndex(0) +4 >Emitted(156, 6) Source(155, 56) + SourceIndex(0) --- >>>; 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >; -1 >Emitted(100, 1) Source(155, 56) + SourceIndex(0) -2 >Emitted(100, 2) Source(155, 57) + SourceIndex(0) +1 >Emitted(157, 1) Source(155, 56) + SourceIndex(0) +2 >Emitted(157, 2) Source(155, 57) + SourceIndex(0) --- ->>>var i = new C11t5(function (n) { return ({}); }); +>>>var i = new C11t5(function (n) { 1-> 2 >^^^^ 3 > ^ @@ -2404,17 +2537,6 @@ sourceFile:contextualTyping.ts 7 > ^ 8 > ^^^^^^^^^^ 9 > ^ -10> ^^^^ -11> ^^^^^^ -12> ^ -13> ^ -14> ^^ -15> ^ -16> ^ -17> ^ -18> ^ -19> ^ -20> ^ 1-> > 2 >var @@ -2425,118 +2547,138 @@ sourceFile:contextualTyping.ts 7 > ( 8 > function( 9 > n -10> ) { -11> return -12> -13> ( -14> {} -15> ) -16> -17> -18> } -19> ) -20> ; -1->Emitted(101, 1) Source(156, 1) + SourceIndex(0) -2 >Emitted(101, 5) Source(156, 5) + SourceIndex(0) -3 >Emitted(101, 6) Source(156, 6) + SourceIndex(0) -4 >Emitted(101, 9) Source(156, 9) + SourceIndex(0) -5 >Emitted(101, 13) Source(156, 13) + SourceIndex(0) -6 >Emitted(101, 18) Source(156, 18) + SourceIndex(0) -7 >Emitted(101, 19) Source(156, 19) + SourceIndex(0) -8 >Emitted(101, 29) Source(156, 28) + SourceIndex(0) -9 >Emitted(101, 30) Source(156, 29) + SourceIndex(0) -10>Emitted(101, 34) Source(156, 33) + SourceIndex(0) -11>Emitted(101, 40) Source(156, 39) + SourceIndex(0) -12>Emitted(101, 41) Source(156, 46) + SourceIndex(0) -13>Emitted(101, 42) Source(156, 47) + SourceIndex(0) -14>Emitted(101, 44) Source(156, 49) + SourceIndex(0) -15>Emitted(101, 45) Source(156, 50) + SourceIndex(0) -16>Emitted(101, 46) Source(156, 50) + SourceIndex(0) -17>Emitted(101, 47) Source(156, 51) + SourceIndex(0) -18>Emitted(101, 48) Source(156, 52) + SourceIndex(0) -19>Emitted(101, 49) Source(156, 53) + SourceIndex(0) -20>Emitted(101, 50) Source(156, 54) + SourceIndex(0) +1->Emitted(158, 1) Source(156, 1) + SourceIndex(0) +2 >Emitted(158, 5) Source(156, 5) + SourceIndex(0) +3 >Emitted(158, 6) Source(156, 6) + SourceIndex(0) +4 >Emitted(158, 9) Source(156, 9) + SourceIndex(0) +5 >Emitted(158, 13) Source(156, 13) + SourceIndex(0) +6 >Emitted(158, 18) Source(156, 18) + SourceIndex(0) +7 >Emitted(158, 19) Source(156, 19) + SourceIndex(0) +8 >Emitted(158, 29) Source(156, 28) + SourceIndex(0) +9 >Emitted(158, 30) Source(156, 29) + SourceIndex(0) +--- +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(159, 5) Source(156, 33) + SourceIndex(0) +2 >Emitted(159, 11) Source(156, 39) + SourceIndex(0) +3 >Emitted(159, 12) Source(156, 46) + SourceIndex(0) +4 >Emitted(159, 13) Source(156, 47) + SourceIndex(0) +5 >Emitted(159, 15) Source(156, 49) + SourceIndex(0) +6 >Emitted(159, 16) Source(156, 50) + SourceIndex(0) +7 >Emitted(159, 17) Source(156, 50) + SourceIndex(0) +--- +>>>}); +1 > +2 >^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ) +4 > ; +1 >Emitted(160, 1) Source(156, 51) + SourceIndex(0) +2 >Emitted(160, 2) Source(156, 52) + SourceIndex(0) +3 >Emitted(160, 3) Source(156, 53) + SourceIndex(0) +4 >Emitted(160, 4) Source(156, 54) + SourceIndex(0) --- >>>// CONTEXT: Type annotated expression -1 > +1-> 2 > 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^-> -1 > +1-> > >// CONTEXT: Type annotated expression > 2 > 3 >// CONTEXT: Type annotated expression -1 >Emitted(102, 1) Source(159, 1) + SourceIndex(0) -2 >Emitted(102, 1) Source(158, 1) + SourceIndex(0) -3 >Emitted(102, 38) Source(158, 38) + SourceIndex(0) +1->Emitted(161, 1) Source(159, 1) + SourceIndex(0) +2 >Emitted(161, 1) Source(158, 1) + SourceIndex(0) +3 >Emitted(161, 38) Source(158, 38) + SourceIndex(0) --- ->>>var c12t1 = (function (s) { return s; }); -1->^^^^ +>>>var c12t1 = (function (s) { +1 >^^^^ 2 > ^^^^^ 3 > ^^^ 4 > ^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^ -1-> +1 > >var 2 > c12t1 3 > = <(s: string) => string> 4 > ( 5 > function( 6 > s -7 > ) { -8 > return -9 > -10> s -11> -12> -13> } -14> ) -15> ; -1->Emitted(103, 5) Source(159, 5) + SourceIndex(0) -2 >Emitted(103, 10) Source(159, 10) + SourceIndex(0) -3 >Emitted(103, 13) Source(159, 37) + SourceIndex(0) -4 >Emitted(103, 14) Source(159, 38) + SourceIndex(0) -5 >Emitted(103, 24) Source(159, 47) + SourceIndex(0) -6 >Emitted(103, 25) Source(159, 48) + SourceIndex(0) -7 >Emitted(103, 29) Source(159, 52) + SourceIndex(0) -8 >Emitted(103, 35) Source(159, 58) + SourceIndex(0) -9 >Emitted(103, 36) Source(159, 59) + SourceIndex(0) -10>Emitted(103, 37) Source(159, 60) + SourceIndex(0) -11>Emitted(103, 38) Source(159, 60) + SourceIndex(0) -12>Emitted(103, 39) Source(159, 61) + SourceIndex(0) -13>Emitted(103, 40) Source(159, 62) + SourceIndex(0) -14>Emitted(103, 41) Source(159, 63) + SourceIndex(0) -15>Emitted(103, 42) Source(159, 64) + SourceIndex(0) +1 >Emitted(162, 5) Source(159, 5) + SourceIndex(0) +2 >Emitted(162, 10) Source(159, 10) + SourceIndex(0) +3 >Emitted(162, 13) Source(159, 37) + SourceIndex(0) +4 >Emitted(162, 14) Source(159, 38) + SourceIndex(0) +5 >Emitted(162, 24) Source(159, 47) + SourceIndex(0) +6 >Emitted(162, 25) Source(159, 48) + SourceIndex(0) +--- +>>> return s; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > +1 >Emitted(163, 5) Source(159, 52) + SourceIndex(0) +2 >Emitted(163, 11) Source(159, 58) + SourceIndex(0) +3 >Emitted(163, 12) Source(159, 59) + SourceIndex(0) +4 >Emitted(163, 13) Source(159, 60) + SourceIndex(0) +5 >Emitted(163, 14) Source(159, 60) + SourceIndex(0) +--- +>>>}); +1 > +2 >^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^^^-> +1 > +2 >} +3 > ) +4 > ; +1 >Emitted(164, 1) Source(159, 61) + SourceIndex(0) +2 >Emitted(164, 2) Source(159, 62) + SourceIndex(0) +3 >Emitted(164, 3) Source(159, 63) + SourceIndex(0) +4 >Emitted(164, 4) Source(159, 64) + SourceIndex(0) --- >>>var c12t2 = ({ -1 > +1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ 5 > ^ -1 > +1-> > 2 >var 3 > c12t2 4 > = 5 > ( -1 >Emitted(104, 1) Source(160, 1) + SourceIndex(0) -2 >Emitted(104, 5) Source(160, 5) + SourceIndex(0) -3 >Emitted(104, 10) Source(160, 10) + SourceIndex(0) -4 >Emitted(104, 13) Source(160, 20) + SourceIndex(0) -5 >Emitted(104, 14) Source(160, 21) + SourceIndex(0) +1->Emitted(165, 1) Source(160, 1) + SourceIndex(0) +2 >Emitted(165, 5) Source(160, 5) + SourceIndex(0) +3 >Emitted(165, 10) Source(160, 10) + SourceIndex(0) +4 >Emitted(165, 13) Source(160, 20) + SourceIndex(0) +5 >Emitted(165, 14) Source(160, 21) + SourceIndex(0) --- >>> n: 1 1 >^^^^ @@ -2548,10 +2690,10 @@ sourceFile:contextualTyping.ts 2 > n 3 > : 4 > 1 -1 >Emitted(105, 5) Source(161, 5) + SourceIndex(0) -2 >Emitted(105, 6) Source(161, 6) + SourceIndex(0) -3 >Emitted(105, 8) Source(161, 8) + SourceIndex(0) -4 >Emitted(105, 9) Source(161, 9) + SourceIndex(0) +1 >Emitted(166, 5) Source(161, 5) + SourceIndex(0) +2 >Emitted(166, 6) Source(161, 6) + SourceIndex(0) +3 >Emitted(166, 8) Source(161, 8) + SourceIndex(0) +4 >Emitted(166, 9) Source(161, 9) + SourceIndex(0) --- >>>}); 1 >^ @@ -2562,9 +2704,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > ; -1 >Emitted(106, 2) Source(162, 2) + SourceIndex(0) -2 >Emitted(106, 3) Source(162, 3) + SourceIndex(0) -3 >Emitted(106, 4) Source(162, 4) + SourceIndex(0) +1 >Emitted(167, 2) Source(162, 2) + SourceIndex(0) +2 >Emitted(167, 3) Source(162, 3) + SourceIndex(0) +3 >Emitted(167, 4) Source(162, 4) + SourceIndex(0) --- >>>var c12t3 = []; 1-> @@ -2573,7 +2715,7 @@ sourceFile:contextualTyping.ts 4 > ^^^ 5 > ^^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^-> 1-> > 2 >var @@ -2581,77 +2723,71 @@ sourceFile:contextualTyping.ts 4 > = 5 > [] 6 > ; -1->Emitted(107, 1) Source(163, 1) + SourceIndex(0) -2 >Emitted(107, 5) Source(163, 5) + SourceIndex(0) -3 >Emitted(107, 10) Source(163, 10) + SourceIndex(0) -4 >Emitted(107, 13) Source(163, 24) + SourceIndex(0) -5 >Emitted(107, 15) Source(163, 26) + SourceIndex(0) -6 >Emitted(107, 16) Source(163, 27) + SourceIndex(0) +1->Emitted(168, 1) Source(163, 1) + SourceIndex(0) +2 >Emitted(168, 5) Source(163, 5) + SourceIndex(0) +3 >Emitted(168, 10) Source(163, 10) + SourceIndex(0) +4 >Emitted(168, 13) Source(163, 24) + SourceIndex(0) +5 >Emitted(168, 15) Source(163, 26) + SourceIndex(0) +6 >Emitted(168, 16) Source(163, 27) + SourceIndex(0) --- ->>>var c12t4 = function () { return ({}); }; +>>>var c12t4 = function () { 1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^^^^ -7 > ^ -8 > ^ -9 > ^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^^-> +5 > ^^^^^-> 1-> > 2 >var 3 > c12t4 4 > = <() => IFoo> -5 > function() { -6 > return -7 > -8 > ( -9 > {} -10> ) -11> -12> -13> } -14> ; -1->Emitted(108, 1) Source(164, 1) + SourceIndex(0) -2 >Emitted(108, 5) Source(164, 5) + SourceIndex(0) -3 >Emitted(108, 10) Source(164, 10) + SourceIndex(0) -4 >Emitted(108, 13) Source(164, 26) + SourceIndex(0) -5 >Emitted(108, 27) Source(164, 39) + SourceIndex(0) -6 >Emitted(108, 33) Source(164, 45) + SourceIndex(0) -7 >Emitted(108, 34) Source(164, 52) + SourceIndex(0) -8 >Emitted(108, 35) Source(164, 53) + SourceIndex(0) -9 >Emitted(108, 37) Source(164, 55) + SourceIndex(0) -10>Emitted(108, 38) Source(164, 56) + SourceIndex(0) -11>Emitted(108, 39) Source(164, 56) + SourceIndex(0) -12>Emitted(108, 40) Source(164, 57) + SourceIndex(0) -13>Emitted(108, 41) Source(164, 58) + SourceIndex(0) -14>Emitted(108, 42) Source(164, 59) + SourceIndex(0) +1->Emitted(169, 1) Source(164, 1) + SourceIndex(0) +2 >Emitted(169, 5) Source(164, 5) + SourceIndex(0) +3 >Emitted(169, 10) Source(164, 10) + SourceIndex(0) +4 >Emitted(169, 13) Source(164, 26) + SourceIndex(0) --- ->>>var c12t5 = function (n) { return ({}); }; +>>> return ({}); +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1->function() { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1->Emitted(170, 5) Source(164, 39) + SourceIndex(0) +2 >Emitted(170, 11) Source(164, 45) + SourceIndex(0) +3 >Emitted(170, 12) Source(164, 52) + SourceIndex(0) +4 >Emitted(170, 13) Source(164, 53) + SourceIndex(0) +5 >Emitted(170, 15) Source(164, 55) + SourceIndex(0) +6 >Emitted(170, 16) Source(164, 56) + SourceIndex(0) +7 >Emitted(170, 17) Source(164, 56) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(171, 1) Source(164, 57) + SourceIndex(0) +2 >Emitted(171, 2) Source(164, 58) + SourceIndex(0) +3 >Emitted(171, 3) Source(164, 59) + SourceIndex(0) +--- +>>>var c12t5 = function (n) { 1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^^^^-> 1-> > 2 >var @@ -2659,34 +2795,49 @@ sourceFile:contextualTyping.ts 4 > = <(n: number) => IFoo> 5 > function( 6 > n -7 > ) { -8 > return -9 > -10> ( -11> {} -12> ) -13> -14> -15> } -16> ; -1->Emitted(109, 1) Source(165, 1) + SourceIndex(0) -2 >Emitted(109, 5) Source(165, 5) + SourceIndex(0) -3 >Emitted(109, 10) Source(165, 10) + SourceIndex(0) -4 >Emitted(109, 13) Source(165, 35) + SourceIndex(0) -5 >Emitted(109, 23) Source(165, 44) + SourceIndex(0) -6 >Emitted(109, 24) Source(165, 45) + SourceIndex(0) -7 >Emitted(109, 28) Source(165, 49) + SourceIndex(0) -8 >Emitted(109, 34) Source(165, 55) + SourceIndex(0) -9 >Emitted(109, 35) Source(165, 62) + SourceIndex(0) -10>Emitted(109, 36) Source(165, 63) + SourceIndex(0) -11>Emitted(109, 38) Source(165, 65) + SourceIndex(0) -12>Emitted(109, 39) Source(165, 66) + SourceIndex(0) -13>Emitted(109, 40) Source(165, 66) + SourceIndex(0) -14>Emitted(109, 41) Source(165, 67) + SourceIndex(0) -15>Emitted(109, 42) Source(165, 68) + SourceIndex(0) -16>Emitted(109, 43) Source(165, 69) + SourceIndex(0) +1->Emitted(172, 1) Source(165, 1) + SourceIndex(0) +2 >Emitted(172, 5) Source(165, 5) + SourceIndex(0) +3 >Emitted(172, 10) Source(165, 10) + SourceIndex(0) +4 >Emitted(172, 13) Source(165, 35) + SourceIndex(0) +5 >Emitted(172, 23) Source(165, 44) + SourceIndex(0) +6 >Emitted(172, 24) Source(165, 45) + SourceIndex(0) --- ->>>var c12t6 = function (n, s) { return ({}); }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(173, 5) Source(165, 49) + SourceIndex(0) +2 >Emitted(173, 11) Source(165, 55) + SourceIndex(0) +3 >Emitted(173, 12) Source(165, 62) + SourceIndex(0) +4 >Emitted(173, 13) Source(165, 63) + SourceIndex(0) +5 >Emitted(173, 15) Source(165, 65) + SourceIndex(0) +6 >Emitted(173, 16) Source(165, 66) + SourceIndex(0) +7 >Emitted(173, 17) Source(165, 66) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(174, 1) Source(165, 67) + SourceIndex(0) +2 >Emitted(174, 2) Source(165, 68) + SourceIndex(0) +3 >Emitted(174, 3) Source(165, 69) + SourceIndex(0) +--- +>>>var c12t6 = function (n, s) { 1-> 2 >^^^^ 3 > ^^^^^ @@ -2695,16 +2846,6 @@ sourceFile:contextualTyping.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^^ -10> ^^^^^^ -11> ^ -12> ^ -13> ^^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ 1-> > 2 >var @@ -2714,52 +2855,58 @@ sourceFile:contextualTyping.ts 6 > n 7 > , 8 > s -9 > ) { -10> return -11> -12> ( -13> {} -14> ) -15> -16> -17> } -18> ; -1->Emitted(110, 1) Source(166, 1) + SourceIndex(0) -2 >Emitted(110, 5) Source(166, 5) + SourceIndex(0) -3 >Emitted(110, 10) Source(166, 10) + SourceIndex(0) -4 >Emitted(110, 13) Source(166, 46) + SourceIndex(0) -5 >Emitted(110, 23) Source(166, 55) + SourceIndex(0) -6 >Emitted(110, 24) Source(166, 56) + SourceIndex(0) -7 >Emitted(110, 26) Source(166, 58) + SourceIndex(0) -8 >Emitted(110, 27) Source(166, 59) + SourceIndex(0) -9 >Emitted(110, 31) Source(166, 63) + SourceIndex(0) -10>Emitted(110, 37) Source(166, 69) + SourceIndex(0) -11>Emitted(110, 38) Source(166, 76) + SourceIndex(0) -12>Emitted(110, 39) Source(166, 77) + SourceIndex(0) -13>Emitted(110, 41) Source(166, 79) + SourceIndex(0) -14>Emitted(110, 42) Source(166, 80) + SourceIndex(0) -15>Emitted(110, 43) Source(166, 80) + SourceIndex(0) -16>Emitted(110, 44) Source(166, 81) + SourceIndex(0) -17>Emitted(110, 45) Source(166, 82) + SourceIndex(0) -18>Emitted(110, 46) Source(166, 83) + SourceIndex(0) +1->Emitted(175, 1) Source(166, 1) + SourceIndex(0) +2 >Emitted(175, 5) Source(166, 5) + SourceIndex(0) +3 >Emitted(175, 10) Source(166, 10) + SourceIndex(0) +4 >Emitted(175, 13) Source(166, 46) + SourceIndex(0) +5 >Emitted(175, 23) Source(166, 55) + SourceIndex(0) +6 >Emitted(175, 24) Source(166, 56) + SourceIndex(0) +7 >Emitted(175, 26) Source(166, 58) + SourceIndex(0) +8 >Emitted(175, 27) Source(166, 59) + SourceIndex(0) --- ->>>var c12t7 = function (n) { return n; }; +>>> return ({}); +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^ +6 > ^ +7 > ^ +1 >) { +2 > return +3 > +4 > ( +5 > {} +6 > ) +7 > +1 >Emitted(176, 5) Source(166, 63) + SourceIndex(0) +2 >Emitted(176, 11) Source(166, 69) + SourceIndex(0) +3 >Emitted(176, 12) Source(166, 76) + SourceIndex(0) +4 >Emitted(176, 13) Source(166, 77) + SourceIndex(0) +5 >Emitted(176, 15) Source(166, 79) + SourceIndex(0) +6 >Emitted(176, 16) Source(166, 80) + SourceIndex(0) +7 >Emitted(176, 17) Source(166, 80) + SourceIndex(0) +--- +>>>}; 1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(177, 1) Source(166, 81) + SourceIndex(0) +2 >Emitted(177, 2) Source(166, 82) + SourceIndex(0) +3 >Emitted(177, 3) Source(166, 83) + SourceIndex(0) +--- +>>>var c12t7 = function (n) { +1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ -15> ^-> -1 > +1-> > 2 >var 3 > c12t7 @@ -2769,44 +2916,49 @@ sourceFile:contextualTyping.ts > }> 5 > function( 6 > n:number -7 > ) { -8 > return -9 > -10> n -11> -12> -13> } -14> ; -1 >Emitted(111, 1) Source(167, 1) + SourceIndex(0) -2 >Emitted(111, 5) Source(167, 5) + SourceIndex(0) -3 >Emitted(111, 10) Source(167, 10) + SourceIndex(0) -4 >Emitted(111, 13) Source(170, 4) + SourceIndex(0) -5 >Emitted(111, 23) Source(170, 13) + SourceIndex(0) -6 >Emitted(111, 24) Source(170, 21) + SourceIndex(0) -7 >Emitted(111, 28) Source(170, 25) + SourceIndex(0) -8 >Emitted(111, 34) Source(170, 31) + SourceIndex(0) -9 >Emitted(111, 35) Source(170, 32) + SourceIndex(0) -10>Emitted(111, 36) Source(170, 33) + SourceIndex(0) -11>Emitted(111, 37) Source(170, 33) + SourceIndex(0) -12>Emitted(111, 38) Source(170, 34) + SourceIndex(0) -13>Emitted(111, 39) Source(170, 35) + SourceIndex(0) -14>Emitted(111, 40) Source(170, 36) + SourceIndex(0) +1->Emitted(178, 1) Source(167, 1) + SourceIndex(0) +2 >Emitted(178, 5) Source(167, 5) + SourceIndex(0) +3 >Emitted(178, 10) Source(167, 10) + SourceIndex(0) +4 >Emitted(178, 13) Source(170, 4) + SourceIndex(0) +5 >Emitted(178, 23) Source(170, 13) + SourceIndex(0) +6 >Emitted(178, 24) Source(170, 21) + SourceIndex(0) --- ->>>var c12t8 = function (n) { return n; }; +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > +1 >Emitted(179, 5) Source(170, 25) + SourceIndex(0) +2 >Emitted(179, 11) Source(170, 31) + SourceIndex(0) +3 >Emitted(179, 12) Source(170, 32) + SourceIndex(0) +4 >Emitted(179, 13) Source(170, 33) + SourceIndex(0) +5 >Emitted(179, 14) Source(170, 33) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(180, 1) Source(170, 34) + SourceIndex(0) +2 >Emitted(180, 2) Source(170, 35) + SourceIndex(0) +3 >Emitted(180, 3) Source(170, 36) + SourceIndex(0) +--- +>>>var c12t8 = function (n) { 1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ 5 > ^^^^^^^^^^ 6 > ^ -7 > ^^^^ -8 > ^^^^^^ -9 > ^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ 1-> > > @@ -2815,181 +2967,218 @@ sourceFile:contextualTyping.ts 4 > = <(n: number, s: string) => number> 5 > function( 6 > n -7 > ) { -8 > return -9 > -10> n -11> ; -12> -13> } -14> ; -1->Emitted(112, 1) Source(172, 1) + SourceIndex(0) -2 >Emitted(112, 5) Source(172, 5) + SourceIndex(0) -3 >Emitted(112, 10) Source(172, 10) + SourceIndex(0) -4 >Emitted(112, 13) Source(172, 48) + SourceIndex(0) -5 >Emitted(112, 23) Source(172, 57) + SourceIndex(0) -6 >Emitted(112, 24) Source(172, 58) + SourceIndex(0) -7 >Emitted(112, 28) Source(172, 62) + SourceIndex(0) -8 >Emitted(112, 34) Source(172, 68) + SourceIndex(0) -9 >Emitted(112, 35) Source(172, 69) + SourceIndex(0) -10>Emitted(112, 36) Source(172, 70) + SourceIndex(0) -11>Emitted(112, 37) Source(172, 71) + SourceIndex(0) -12>Emitted(112, 38) Source(172, 72) + SourceIndex(0) -13>Emitted(112, 39) Source(172, 73) + SourceIndex(0) -14>Emitted(112, 40) Source(172, 74) + SourceIndex(0) +1->Emitted(181, 1) Source(172, 1) + SourceIndex(0) +2 >Emitted(181, 5) Source(172, 5) + SourceIndex(0) +3 >Emitted(181, 10) Source(172, 10) + SourceIndex(0) +4 >Emitted(181, 13) Source(172, 48) + SourceIndex(0) +5 >Emitted(181, 23) Source(172, 57) + SourceIndex(0) +6 >Emitted(181, 24) Source(172, 58) + SourceIndex(0) --- ->>>var c12t9 = [[], []]; +>>> return n; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > n +5 > ; +1 >Emitted(182, 5) Source(172, 62) + SourceIndex(0) +2 >Emitted(182, 11) Source(172, 68) + SourceIndex(0) +3 >Emitted(182, 12) Source(172, 69) + SourceIndex(0) +4 >Emitted(182, 13) Source(172, 70) + SourceIndex(0) +5 >Emitted(182, 14) Source(172, 71) + SourceIndex(0) +--- +>>>}; 1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^-> +1 > +2 >} +3 > ; +1 >Emitted(183, 1) Source(172, 72) + SourceIndex(0) +2 >Emitted(183, 2) Source(172, 73) + SourceIndex(0) +3 >Emitted(183, 3) Source(172, 74) + SourceIndex(0) +--- +>>>var c12t9 = [ +1-> 2 >^^^^ 3 > ^^^^^ 4 > ^^^ -5 > ^ -6 > ^^ -7 > ^^ -8 > ^^ -9 > ^ -10> ^ -11> ^^^^^^-> -1 > +1-> > 2 >var 3 > c12t9 4 > = -5 > [ -6 > [] -7 > , -8 > [] -9 > ] -10> ; -1 >Emitted(113, 1) Source(173, 1) + SourceIndex(0) -2 >Emitted(113, 5) Source(173, 5) + SourceIndex(0) -3 >Emitted(113, 10) Source(173, 10) + SourceIndex(0) -4 >Emitted(113, 13) Source(173, 26) + SourceIndex(0) -5 >Emitted(113, 14) Source(173, 27) + SourceIndex(0) -6 >Emitted(113, 16) Source(173, 29) + SourceIndex(0) -7 >Emitted(113, 18) Source(173, 30) + SourceIndex(0) -8 >Emitted(113, 20) Source(173, 32) + SourceIndex(0) -9 >Emitted(113, 21) Source(173, 33) + SourceIndex(0) -10>Emitted(113, 22) Source(173, 34) + SourceIndex(0) +1->Emitted(184, 1) Source(173, 1) + SourceIndex(0) +2 >Emitted(184, 5) Source(173, 5) + SourceIndex(0) +3 >Emitted(184, 10) Source(173, 10) + SourceIndex(0) +4 >Emitted(184, 13) Source(173, 26) + SourceIndex(0) --- ->>>var c12t10 = [({}), ({})]; +>>> [], +1 >^^^^ +2 > ^^ +3 > ^-> +1 >[ +2 > [] +1 >Emitted(185, 5) Source(173, 27) + SourceIndex(0) +2 >Emitted(185, 7) Source(173, 29) + SourceIndex(0) +--- +>>> [] +1->^^^^ +2 > ^^ +1->, +2 > [] +1->Emitted(186, 5) Source(173, 30) + SourceIndex(0) +2 >Emitted(186, 7) Source(173, 32) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(187, 2) Source(173, 33) + SourceIndex(0) +2 >Emitted(187, 3) Source(173, 34) + SourceIndex(0) +--- +>>>var c12t10 = [ 1-> 2 >^^^^ 3 > ^^^^^^ 4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^^ -10> ^ -11> ^^ -12> ^ -13> ^ -14> ^ -15> ^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >var 3 > c12t10 4 > = -5 > [ -6 > ( -7 > {} -8 > ) -9 > , -10> ( -11> {} -12> ) -13> ] -14> ; -1->Emitted(114, 1) Source(174, 1) + SourceIndex(0) -2 >Emitted(114, 5) Source(174, 5) + SourceIndex(0) -3 >Emitted(114, 11) Source(174, 11) + SourceIndex(0) -4 >Emitted(114, 14) Source(174, 23) + SourceIndex(0) -5 >Emitted(114, 15) Source(174, 30) + SourceIndex(0) -6 >Emitted(114, 16) Source(174, 31) + SourceIndex(0) -7 >Emitted(114, 18) Source(174, 33) + SourceIndex(0) -8 >Emitted(114, 19) Source(174, 34) + SourceIndex(0) -9 >Emitted(114, 21) Source(174, 41) + SourceIndex(0) -10>Emitted(114, 22) Source(174, 42) + SourceIndex(0) -11>Emitted(114, 24) Source(174, 44) + SourceIndex(0) -12>Emitted(114, 25) Source(174, 45) + SourceIndex(0) -13>Emitted(114, 26) Source(174, 46) + SourceIndex(0) -14>Emitted(114, 27) Source(174, 47) + SourceIndex(0) +1->Emitted(188, 1) Source(174, 1) + SourceIndex(0) +2 >Emitted(188, 5) Source(174, 5) + SourceIndex(0) +3 >Emitted(188, 11) Source(174, 11) + SourceIndex(0) +4 >Emitted(188, 14) Source(174, 23) + SourceIndex(0) --- ->>>var c12t11 = [function (n, s) { return s; }]; +>>> ({}), +1 >^^^^ +2 > ^ +3 > ^^ +4 > ^ +5 > ^-> +1 >[ +2 > ( +3 > {} +4 > ) +1 >Emitted(189, 5) Source(174, 30) + SourceIndex(0) +2 >Emitted(189, 6) Source(174, 31) + SourceIndex(0) +3 >Emitted(189, 8) Source(174, 33) + SourceIndex(0) +4 >Emitted(189, 9) Source(174, 34) + SourceIndex(0) +--- +>>> ({}) +1->^^^^ +2 > ^ +3 > ^^ +4 > ^ +1->, +2 > ( +3 > {} +4 > ) +1->Emitted(190, 5) Source(174, 41) + SourceIndex(0) +2 >Emitted(190, 6) Source(174, 42) + SourceIndex(0) +3 >Emitted(190, 8) Source(174, 44) + SourceIndex(0) +4 >Emitted(190, 9) Source(174, 45) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(191, 2) Source(174, 46) + SourceIndex(0) +2 >Emitted(191, 3) Source(174, 47) + SourceIndex(0) +--- +>>>var c12t11 = [ 1-> 2 >^^^^ 3 > ^^^^^^ 4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^ -7 > ^ -8 > ^^ -9 > ^ -10> ^^^^ -11> ^^^^^^ -12> ^ -13> ^ -14> ^ -15> ^ -16> ^ -17> ^ -18> ^ +5 > ^^^^^^^^^-> 1-> > 2 >var 3 > c12t11 4 > = <{(n: number, s: string): string;}[]> -5 > [ -6 > function( -7 > n -8 > , -9 > s -10> ) { -11> return -12> -13> s -14> ; -15> -16> } -17> ] -18> ; -1->Emitted(115, 1) Source(175, 1) + SourceIndex(0) -2 >Emitted(115, 5) Source(175, 5) + SourceIndex(0) -3 >Emitted(115, 11) Source(175, 11) + SourceIndex(0) -4 >Emitted(115, 14) Source(175, 52) + SourceIndex(0) -5 >Emitted(115, 15) Source(175, 53) + SourceIndex(0) -6 >Emitted(115, 25) Source(175, 62) + SourceIndex(0) -7 >Emitted(115, 26) Source(175, 63) + SourceIndex(0) -8 >Emitted(115, 28) Source(175, 65) + SourceIndex(0) -9 >Emitted(115, 29) Source(175, 66) + SourceIndex(0) -10>Emitted(115, 33) Source(175, 70) + SourceIndex(0) -11>Emitted(115, 39) Source(175, 76) + SourceIndex(0) -12>Emitted(115, 40) Source(175, 77) + SourceIndex(0) -13>Emitted(115, 41) Source(175, 78) + SourceIndex(0) -14>Emitted(115, 42) Source(175, 79) + SourceIndex(0) -15>Emitted(115, 43) Source(175, 80) + SourceIndex(0) -16>Emitted(115, 44) Source(175, 81) + SourceIndex(0) -17>Emitted(115, 45) Source(175, 82) + SourceIndex(0) -18>Emitted(115, 46) Source(175, 83) + SourceIndex(0) +1->Emitted(192, 1) Source(175, 1) + SourceIndex(0) +2 >Emitted(192, 5) Source(175, 5) + SourceIndex(0) +3 >Emitted(192, 11) Source(175, 11) + SourceIndex(0) +4 >Emitted(192, 14) Source(175, 52) + SourceIndex(0) +--- +>>> function (n, s) { +1->^^^^ +2 > ^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +1->[ +2 > function( +3 > n +4 > , +5 > s +1->Emitted(193, 5) Source(175, 53) + SourceIndex(0) +2 >Emitted(193, 15) Source(175, 62) + SourceIndex(0) +3 >Emitted(193, 16) Source(175, 63) + SourceIndex(0) +4 >Emitted(193, 18) Source(175, 65) + SourceIndex(0) +5 >Emitted(193, 19) Source(175, 66) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(194, 9) Source(175, 70) + SourceIndex(0) +2 >Emitted(194, 15) Source(175, 76) + SourceIndex(0) +3 >Emitted(194, 16) Source(175, 77) + SourceIndex(0) +4 >Emitted(194, 17) Source(175, 78) + SourceIndex(0) +5 >Emitted(194, 18) Source(175, 79) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(195, 5) Source(175, 80) + SourceIndex(0) +2 >Emitted(195, 6) Source(175, 81) + SourceIndex(0) +--- +>>>]; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^^-> +1 >] +2 > ; +1 >Emitted(196, 2) Source(175, 82) + SourceIndex(0) +2 >Emitted(196, 3) Source(175, 83) + SourceIndex(0) --- >>>var c12t12 = { -1 > +1-> 2 >^^^^ 3 > ^^^^^^ 4 > ^^^ 5 > ^-> -1 > +1-> > 2 >var 3 > c12t12 4 > = -1 >Emitted(116, 1) Source(176, 1) + SourceIndex(0) -2 >Emitted(116, 5) Source(176, 5) + SourceIndex(0) -3 >Emitted(116, 11) Source(176, 11) + SourceIndex(0) -4 >Emitted(116, 14) Source(176, 21) + SourceIndex(0) +1->Emitted(197, 1) Source(176, 1) + SourceIndex(0) +2 >Emitted(197, 5) Source(176, 5) + SourceIndex(0) +3 >Emitted(197, 11) Source(176, 11) + SourceIndex(0) +4 >Emitted(197, 14) Source(176, 21) + SourceIndex(0) --- >>> foo: ({}) 1->^^^^ @@ -3005,12 +3194,12 @@ sourceFile:contextualTyping.ts 4 > ( 5 > {} 6 > ) -1->Emitted(117, 5) Source(177, 5) + SourceIndex(0) -2 >Emitted(117, 8) Source(177, 8) + SourceIndex(0) -3 >Emitted(117, 10) Source(177, 16) + SourceIndex(0) -4 >Emitted(117, 11) Source(177, 17) + SourceIndex(0) -5 >Emitted(117, 13) Source(177, 19) + SourceIndex(0) -6 >Emitted(117, 14) Source(177, 20) + SourceIndex(0) +1->Emitted(198, 5) Source(177, 5) + SourceIndex(0) +2 >Emitted(198, 8) Source(177, 8) + SourceIndex(0) +3 >Emitted(198, 10) Source(177, 16) + SourceIndex(0) +4 >Emitted(198, 11) Source(177, 17) + SourceIndex(0) +5 >Emitted(198, 13) Source(177, 19) + SourceIndex(0) +6 >Emitted(198, 14) Source(177, 20) + SourceIndex(0) --- >>>}; 1 >^ @@ -3019,8 +3208,8 @@ sourceFile:contextualTyping.ts 1 > >} 2 > -1 >Emitted(118, 2) Source(178, 2) + SourceIndex(0) -2 >Emitted(118, 3) Source(178, 2) + SourceIndex(0) +1 >Emitted(199, 2) Source(178, 2) + SourceIndex(0) +2 >Emitted(199, 3) Source(178, 2) + SourceIndex(0) --- >>>var c12t13 = ({ 1-> @@ -3028,20 +3217,20 @@ sourceFile:contextualTyping.ts 3 > ^^^^^^ 4 > ^^^ 5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^-> +6 > ^^^^^^^^^^^-> 1-> > 2 >var 3 > c12t13 4 > = 5 > ( -1->Emitted(119, 1) Source(179, 1) + SourceIndex(0) -2 >Emitted(119, 5) Source(179, 5) + SourceIndex(0) -3 >Emitted(119, 11) Source(179, 11) + SourceIndex(0) -4 >Emitted(119, 14) Source(179, 21) + SourceIndex(0) -5 >Emitted(119, 15) Source(179, 22) + SourceIndex(0) +1->Emitted(200, 1) Source(179, 1) + SourceIndex(0) +2 >Emitted(200, 5) Source(179, 5) + SourceIndex(0) +3 >Emitted(200, 11) Source(179, 11) + SourceIndex(0) +4 >Emitted(200, 14) Source(179, 21) + SourceIndex(0) +5 >Emitted(200, 15) Source(179, 22) + SourceIndex(0) --- ->>> f: function (i, s) { return s; } +>>> f: function (i, s) { 1->^^^^ 2 > ^ 3 > ^^ @@ -3049,13 +3238,6 @@ sourceFile:contextualTyping.ts 5 > ^ 6 > ^^ 7 > ^ -8 > ^^^^ -9 > ^^^^^^ -10> ^ -11> ^ -12> ^ -13> ^ -14> ^ 1->{ > 2 > f @@ -3064,27 +3246,38 @@ sourceFile:contextualTyping.ts 5 > i 6 > , 7 > s -8 > ) { -9 > return -10> -11> s -12> ; -13> -14> } -1->Emitted(120, 5) Source(180, 5) + SourceIndex(0) -2 >Emitted(120, 6) Source(180, 6) + SourceIndex(0) -3 >Emitted(120, 8) Source(180, 8) + SourceIndex(0) -4 >Emitted(120, 18) Source(180, 17) + SourceIndex(0) -5 >Emitted(120, 19) Source(180, 18) + SourceIndex(0) -6 >Emitted(120, 21) Source(180, 20) + SourceIndex(0) -7 >Emitted(120, 22) Source(180, 21) + SourceIndex(0) -8 >Emitted(120, 26) Source(180, 25) + SourceIndex(0) -9 >Emitted(120, 32) Source(180, 31) + SourceIndex(0) -10>Emitted(120, 33) Source(180, 32) + SourceIndex(0) -11>Emitted(120, 34) Source(180, 33) + SourceIndex(0) -12>Emitted(120, 35) Source(180, 34) + SourceIndex(0) -13>Emitted(120, 36) Source(180, 35) + SourceIndex(0) -14>Emitted(120, 37) Source(180, 36) + SourceIndex(0) +1->Emitted(201, 5) Source(180, 5) + SourceIndex(0) +2 >Emitted(201, 6) Source(180, 6) + SourceIndex(0) +3 >Emitted(201, 8) Source(180, 8) + SourceIndex(0) +4 >Emitted(201, 18) Source(180, 17) + SourceIndex(0) +5 >Emitted(201, 19) Source(180, 18) + SourceIndex(0) +6 >Emitted(201, 21) Source(180, 20) + SourceIndex(0) +7 >Emitted(201, 22) Source(180, 21) + SourceIndex(0) +--- +>>> return s; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^ +1 >) { +2 > return +3 > +4 > s +5 > ; +1 >Emitted(202, 9) Source(180, 25) + SourceIndex(0) +2 >Emitted(202, 15) Source(180, 31) + SourceIndex(0) +3 >Emitted(202, 16) Source(180, 32) + SourceIndex(0) +4 >Emitted(202, 17) Source(180, 33) + SourceIndex(0) +5 >Emitted(202, 18) Source(180, 34) + SourceIndex(0) +--- +>>> } +1 >^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(203, 5) Source(180, 35) + SourceIndex(0) +2 >Emitted(203, 6) Source(180, 36) + SourceIndex(0) --- >>>}); 1 >^ @@ -3095,9 +3288,9 @@ sourceFile:contextualTyping.ts >} 2 > ) 3 > -1 >Emitted(121, 2) Source(181, 2) + SourceIndex(0) -2 >Emitted(121, 3) Source(181, 3) + SourceIndex(0) -3 >Emitted(121, 4) Source(181, 3) + SourceIndex(0) +1 >Emitted(204, 2) Source(181, 2) + SourceIndex(0) +2 >Emitted(204, 3) Source(181, 3) + SourceIndex(0) +3 >Emitted(204, 4) Source(181, 3) + SourceIndex(0) --- >>>var c12t14 = ({ 1-> @@ -3111,11 +3304,11 @@ sourceFile:contextualTyping.ts 3 > c12t14 4 > = 5 > ( -1->Emitted(122, 1) Source(182, 1) + SourceIndex(0) -2 >Emitted(122, 5) Source(182, 5) + SourceIndex(0) -3 >Emitted(122, 11) Source(182, 11) + SourceIndex(0) -4 >Emitted(122, 14) Source(182, 21) + SourceIndex(0) -5 >Emitted(122, 15) Source(182, 22) + SourceIndex(0) +1->Emitted(205, 1) Source(182, 1) + SourceIndex(0) +2 >Emitted(205, 5) Source(182, 5) + SourceIndex(0) +3 >Emitted(205, 11) Source(182, 11) + SourceIndex(0) +4 >Emitted(205, 14) Source(182, 21) + SourceIndex(0) +5 >Emitted(205, 15) Source(182, 22) + SourceIndex(0) --- >>> a: [] 1 >^^^^ @@ -3127,39 +3320,31 @@ sourceFile:contextualTyping.ts 2 > a 3 > : 4 > [] -1 >Emitted(123, 5) Source(183, 5) + SourceIndex(0) -2 >Emitted(123, 6) Source(183, 6) + SourceIndex(0) -3 >Emitted(123, 8) Source(183, 8) + SourceIndex(0) -4 >Emitted(123, 10) Source(183, 10) + SourceIndex(0) +1 >Emitted(206, 5) Source(183, 5) + SourceIndex(0) +2 >Emitted(206, 6) Source(183, 6) + SourceIndex(0) +3 >Emitted(206, 8) Source(183, 8) + SourceIndex(0) +4 >Emitted(206, 10) Source(183, 10) + SourceIndex(0) --- >>>}); 1 >^ 2 > ^ 3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +4 > ^^^^^^^^^^^^^^^^^^-> 1 > >} 2 > ) 3 > -1 >Emitted(124, 2) Source(184, 2) + SourceIndex(0) -2 >Emitted(124, 3) Source(184, 3) + SourceIndex(0) -3 >Emitted(124, 4) Source(184, 3) + SourceIndex(0) +1 >Emitted(207, 2) Source(184, 2) + SourceIndex(0) +2 >Emitted(207, 3) Source(184, 3) + SourceIndex(0) +3 >Emitted(207, 4) Source(184, 3) + SourceIndex(0) --- ->>>function EF1(a, b) { return a + b; } +>>>function EF1(a, b) { 1-> 2 >^^^^^^^^^^^^^ 3 > ^ 4 > ^^ 5 > ^ -6 > ^^^^ -7 > ^^^^^^ -8 > ^ -9 > ^ -10> ^^^ -11> ^ -12> ^ -13> ^ -14> ^ +6 > ^-> 1-> > >// CONTEXT: Contextual typing declarations @@ -3172,32 +3357,46 @@ sourceFile:contextualTyping.ts 3 > a 4 > , 5 > b -6 > ) { -7 > return -8 > -9 > a -10> + -11> b -12> ; -13> -14> } -1->Emitted(125, 1) Source(191, 1) + SourceIndex(0) -2 >Emitted(125, 14) Source(191, 14) + SourceIndex(0) -3 >Emitted(125, 15) Source(191, 15) + SourceIndex(0) -4 >Emitted(125, 17) Source(191, 16) + SourceIndex(0) -5 >Emitted(125, 18) Source(191, 17) + SourceIndex(0) -6 >Emitted(125, 22) Source(191, 21) + SourceIndex(0) name (EF1) -7 >Emitted(125, 28) Source(191, 27) + SourceIndex(0) name (EF1) -8 >Emitted(125, 29) Source(191, 28) + SourceIndex(0) name (EF1) -9 >Emitted(125, 30) Source(191, 29) + SourceIndex(0) name (EF1) -10>Emitted(125, 33) Source(191, 30) + SourceIndex(0) name (EF1) -11>Emitted(125, 34) Source(191, 31) + SourceIndex(0) name (EF1) -12>Emitted(125, 35) Source(191, 32) + SourceIndex(0) name (EF1) -13>Emitted(125, 36) Source(191, 33) + SourceIndex(0) name (EF1) -14>Emitted(125, 37) Source(191, 34) + SourceIndex(0) name (EF1) +1->Emitted(208, 1) Source(191, 1) + SourceIndex(0) +2 >Emitted(208, 14) Source(191, 14) + SourceIndex(0) +3 >Emitted(208, 15) Source(191, 15) + SourceIndex(0) +4 >Emitted(208, 17) Source(191, 16) + SourceIndex(0) +5 >Emitted(208, 18) Source(191, 17) + SourceIndex(0) +--- +>>> return a + b; +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^ +5 > ^^^ +6 > ^ +7 > ^ +1->) { +2 > return +3 > +4 > a +5 > + +6 > b +7 > ; +1->Emitted(209, 5) Source(191, 21) + SourceIndex(0) name (EF1) +2 >Emitted(209, 11) Source(191, 27) + SourceIndex(0) name (EF1) +3 >Emitted(209, 12) Source(191, 28) + SourceIndex(0) name (EF1) +4 >Emitted(209, 13) Source(191, 29) + SourceIndex(0) name (EF1) +5 >Emitted(209, 16) Source(191, 30) + SourceIndex(0) name (EF1) +6 >Emitted(209, 17) Source(191, 31) + SourceIndex(0) name (EF1) +7 >Emitted(209, 18) Source(191, 32) + SourceIndex(0) name (EF1) +--- +>>>} +1 > +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >} +1 >Emitted(210, 1) Source(191, 33) + SourceIndex(0) name (EF1) +2 >Emitted(210, 2) Source(191, 34) + SourceIndex(0) name (EF1) --- >>>var efv = EF1(1, 2); -1 > +1-> 2 >^^^^ 3 > ^^^ 4 > ^^^ @@ -3209,7 +3408,7 @@ sourceFile:contextualTyping.ts 10> ^ 11> ^ 12> ^^^-> -1 > +1-> > > 2 >var @@ -3222,17 +3421,17 @@ sourceFile:contextualTyping.ts 9 > 2 10> ) 11> ; -1 >Emitted(126, 1) Source(193, 1) + SourceIndex(0) -2 >Emitted(126, 5) Source(193, 5) + SourceIndex(0) -3 >Emitted(126, 8) Source(193, 8) + SourceIndex(0) -4 >Emitted(126, 11) Source(193, 11) + SourceIndex(0) -5 >Emitted(126, 14) Source(193, 14) + SourceIndex(0) -6 >Emitted(126, 15) Source(193, 15) + SourceIndex(0) -7 >Emitted(126, 16) Source(193, 16) + SourceIndex(0) -8 >Emitted(126, 18) Source(193, 17) + SourceIndex(0) -9 >Emitted(126, 19) Source(193, 18) + SourceIndex(0) -10>Emitted(126, 20) Source(193, 19) + SourceIndex(0) -11>Emitted(126, 21) Source(193, 20) + SourceIndex(0) +1->Emitted(211, 1) Source(193, 1) + SourceIndex(0) +2 >Emitted(211, 5) Source(193, 5) + SourceIndex(0) +3 >Emitted(211, 8) Source(193, 8) + SourceIndex(0) +4 >Emitted(211, 11) Source(193, 11) + SourceIndex(0) +5 >Emitted(211, 14) Source(193, 14) + SourceIndex(0) +6 >Emitted(211, 15) Source(193, 15) + SourceIndex(0) +7 >Emitted(211, 16) Source(193, 16) + SourceIndex(0) +8 >Emitted(211, 18) Source(193, 17) + SourceIndex(0) +9 >Emitted(211, 19) Source(193, 18) + SourceIndex(0) +10>Emitted(211, 20) Source(193, 19) + SourceIndex(0) +11>Emitted(211, 21) Source(193, 20) + SourceIndex(0) --- >>>function Point(x, y) { 1-> @@ -3259,11 +3458,11 @@ sourceFile:contextualTyping.ts 3 > x 4 > , 5 > y -1->Emitted(127, 1) Source(207, 1) + SourceIndex(0) -2 >Emitted(127, 16) Source(207, 16) + SourceIndex(0) -3 >Emitted(127, 17) Source(207, 17) + SourceIndex(0) -4 >Emitted(127, 19) Source(207, 19) + SourceIndex(0) -5 >Emitted(127, 20) Source(207, 20) + SourceIndex(0) +1->Emitted(212, 1) Source(207, 1) + SourceIndex(0) +2 >Emitted(212, 16) Source(207, 16) + SourceIndex(0) +3 >Emitted(212, 17) Source(207, 17) + SourceIndex(0) +4 >Emitted(212, 19) Source(207, 19) + SourceIndex(0) +5 >Emitted(212, 20) Source(207, 20) + SourceIndex(0) --- >>> this.x = x; 1 >^^^^ @@ -3282,13 +3481,13 @@ sourceFile:contextualTyping.ts 5 > = 6 > x 7 > ; -1 >Emitted(128, 5) Source(208, 5) + SourceIndex(0) name (Point) -2 >Emitted(128, 9) Source(208, 9) + SourceIndex(0) name (Point) -3 >Emitted(128, 10) Source(208, 10) + SourceIndex(0) name (Point) -4 >Emitted(128, 11) Source(208, 11) + SourceIndex(0) name (Point) -5 >Emitted(128, 14) Source(208, 14) + SourceIndex(0) name (Point) -6 >Emitted(128, 15) Source(208, 15) + SourceIndex(0) name (Point) -7 >Emitted(128, 16) Source(208, 16) + SourceIndex(0) name (Point) +1 >Emitted(213, 5) Source(208, 5) + SourceIndex(0) name (Point) +2 >Emitted(213, 9) Source(208, 9) + SourceIndex(0) name (Point) +3 >Emitted(213, 10) Source(208, 10) + SourceIndex(0) name (Point) +4 >Emitted(213, 11) Source(208, 11) + SourceIndex(0) name (Point) +5 >Emitted(213, 14) Source(208, 14) + SourceIndex(0) name (Point) +6 >Emitted(213, 15) Source(208, 15) + SourceIndex(0) name (Point) +7 >Emitted(213, 16) Source(208, 16) + SourceIndex(0) name (Point) --- >>> this.y = y; 1->^^^^ @@ -3307,13 +3506,13 @@ sourceFile:contextualTyping.ts 5 > = 6 > y 7 > ; -1->Emitted(129, 5) Source(209, 5) + SourceIndex(0) name (Point) -2 >Emitted(129, 9) Source(209, 9) + SourceIndex(0) name (Point) -3 >Emitted(129, 10) Source(209, 10) + SourceIndex(0) name (Point) -4 >Emitted(129, 11) Source(209, 11) + SourceIndex(0) name (Point) -5 >Emitted(129, 14) Source(209, 14) + SourceIndex(0) name (Point) -6 >Emitted(129, 15) Source(209, 15) + SourceIndex(0) name (Point) -7 >Emitted(129, 16) Source(209, 16) + SourceIndex(0) name (Point) +1->Emitted(214, 5) Source(209, 5) + SourceIndex(0) name (Point) +2 >Emitted(214, 9) Source(209, 9) + SourceIndex(0) name (Point) +3 >Emitted(214, 10) Source(209, 10) + SourceIndex(0) name (Point) +4 >Emitted(214, 11) Source(209, 11) + SourceIndex(0) name (Point) +5 >Emitted(214, 14) Source(209, 14) + SourceIndex(0) name (Point) +6 >Emitted(214, 15) Source(209, 15) + SourceIndex(0) name (Point) +7 >Emitted(214, 16) Source(209, 16) + SourceIndex(0) name (Point) --- >>> return this; 1->^^^^ @@ -3328,11 +3527,11 @@ sourceFile:contextualTyping.ts 3 > 4 > this 5 > ; -1->Emitted(130, 5) Source(211, 5) + SourceIndex(0) name (Point) -2 >Emitted(130, 11) Source(211, 11) + SourceIndex(0) name (Point) -3 >Emitted(130, 12) Source(211, 12) + SourceIndex(0) name (Point) -4 >Emitted(130, 16) Source(211, 16) + SourceIndex(0) name (Point) -5 >Emitted(130, 17) Source(211, 17) + SourceIndex(0) name (Point) +1->Emitted(215, 5) Source(211, 5) + SourceIndex(0) name (Point) +2 >Emitted(215, 11) Source(211, 11) + SourceIndex(0) name (Point) +3 >Emitted(215, 12) Source(211, 12) + SourceIndex(0) name (Point) +4 >Emitted(215, 16) Source(211, 16) + SourceIndex(0) name (Point) +5 >Emitted(215, 17) Source(211, 17) + SourceIndex(0) name (Point) --- >>>} 1 > @@ -3341,8 +3540,8 @@ sourceFile:contextualTyping.ts 1 > > 2 >} -1 >Emitted(131, 1) Source(212, 1) + SourceIndex(0) name (Point) -2 >Emitted(131, 2) Source(212, 2) + SourceIndex(0) name (Point) +1 >Emitted(216, 1) Source(212, 1) + SourceIndex(0) name (Point) +2 >Emitted(216, 2) Source(212, 2) + SourceIndex(0) name (Point) --- >>>Point.origin = new Point(0, 0); 1-> @@ -3374,19 +3573,19 @@ sourceFile:contextualTyping.ts 11> 0 12> ) 13> ; -1->Emitted(132, 1) Source(214, 1) + SourceIndex(0) -2 >Emitted(132, 6) Source(214, 6) + SourceIndex(0) -3 >Emitted(132, 7) Source(214, 7) + SourceIndex(0) -4 >Emitted(132, 13) Source(214, 13) + SourceIndex(0) -5 >Emitted(132, 16) Source(214, 16) + SourceIndex(0) -6 >Emitted(132, 20) Source(214, 20) + SourceIndex(0) -7 >Emitted(132, 25) Source(214, 25) + SourceIndex(0) -8 >Emitted(132, 26) Source(214, 26) + SourceIndex(0) -9 >Emitted(132, 27) Source(214, 27) + SourceIndex(0) -10>Emitted(132, 29) Source(214, 29) + SourceIndex(0) -11>Emitted(132, 30) Source(214, 30) + SourceIndex(0) -12>Emitted(132, 31) Source(214, 31) + SourceIndex(0) -13>Emitted(132, 32) Source(214, 32) + SourceIndex(0) +1->Emitted(217, 1) Source(214, 1) + SourceIndex(0) +2 >Emitted(217, 6) Source(214, 6) + SourceIndex(0) +3 >Emitted(217, 7) Source(214, 7) + SourceIndex(0) +4 >Emitted(217, 13) Source(214, 13) + SourceIndex(0) +5 >Emitted(217, 16) Source(214, 16) + SourceIndex(0) +6 >Emitted(217, 20) Source(214, 20) + SourceIndex(0) +7 >Emitted(217, 25) Source(214, 25) + SourceIndex(0) +8 >Emitted(217, 26) Source(214, 26) + SourceIndex(0) +9 >Emitted(217, 27) Source(214, 27) + SourceIndex(0) +10>Emitted(217, 29) Source(214, 29) + SourceIndex(0) +11>Emitted(217, 30) Source(214, 30) + SourceIndex(0) +12>Emitted(217, 31) Source(214, 31) + SourceIndex(0) +13>Emitted(217, 32) Source(214, 32) + SourceIndex(0) --- >>>Point.prototype.add = function (dx, dy) { 1-> @@ -3414,17 +3613,17 @@ sourceFile:contextualTyping.ts 9 > dx 10> , 11> dy -1->Emitted(133, 1) Source(216, 1) + SourceIndex(0) -2 >Emitted(133, 6) Source(216, 6) + SourceIndex(0) -3 >Emitted(133, 7) Source(216, 7) + SourceIndex(0) -4 >Emitted(133, 16) Source(216, 16) + SourceIndex(0) -5 >Emitted(133, 17) Source(216, 17) + SourceIndex(0) -6 >Emitted(133, 20) Source(216, 20) + SourceIndex(0) -7 >Emitted(133, 23) Source(216, 23) + SourceIndex(0) -8 >Emitted(133, 33) Source(216, 32) + SourceIndex(0) -9 >Emitted(133, 35) Source(216, 34) + SourceIndex(0) -10>Emitted(133, 37) Source(216, 36) + SourceIndex(0) -11>Emitted(133, 39) Source(216, 38) + SourceIndex(0) +1->Emitted(218, 1) Source(216, 1) + SourceIndex(0) +2 >Emitted(218, 6) Source(216, 6) + SourceIndex(0) +3 >Emitted(218, 7) Source(216, 7) + SourceIndex(0) +4 >Emitted(218, 16) Source(216, 16) + SourceIndex(0) +5 >Emitted(218, 17) Source(216, 17) + SourceIndex(0) +6 >Emitted(218, 20) Source(216, 20) + SourceIndex(0) +7 >Emitted(218, 23) Source(216, 23) + SourceIndex(0) +8 >Emitted(218, 33) Source(216, 32) + SourceIndex(0) +9 >Emitted(218, 35) Source(216, 34) + SourceIndex(0) +10>Emitted(218, 37) Source(216, 36) + SourceIndex(0) +11>Emitted(218, 39) Source(216, 38) + SourceIndex(0) --- >>> return new Point(this.x + dx, this.y + dy); 1->^^^^ @@ -3466,25 +3665,25 @@ sourceFile:contextualTyping.ts 17> dy 18> ) 19> ; -1->Emitted(134, 5) Source(217, 5) + SourceIndex(0) -2 >Emitted(134, 11) Source(217, 11) + SourceIndex(0) -3 >Emitted(134, 12) Source(217, 12) + SourceIndex(0) -4 >Emitted(134, 16) Source(217, 16) + SourceIndex(0) -5 >Emitted(134, 21) Source(217, 21) + SourceIndex(0) -6 >Emitted(134, 22) Source(217, 22) + SourceIndex(0) -7 >Emitted(134, 26) Source(217, 26) + SourceIndex(0) -8 >Emitted(134, 27) Source(217, 27) + SourceIndex(0) -9 >Emitted(134, 28) Source(217, 28) + SourceIndex(0) -10>Emitted(134, 31) Source(217, 31) + SourceIndex(0) -11>Emitted(134, 33) Source(217, 33) + SourceIndex(0) -12>Emitted(134, 35) Source(217, 35) + SourceIndex(0) -13>Emitted(134, 39) Source(217, 39) + SourceIndex(0) -14>Emitted(134, 40) Source(217, 40) + SourceIndex(0) -15>Emitted(134, 41) Source(217, 41) + SourceIndex(0) -16>Emitted(134, 44) Source(217, 44) + SourceIndex(0) -17>Emitted(134, 46) Source(217, 46) + SourceIndex(0) -18>Emitted(134, 47) Source(217, 47) + SourceIndex(0) -19>Emitted(134, 48) Source(217, 48) + SourceIndex(0) +1->Emitted(219, 5) Source(217, 5) + SourceIndex(0) +2 >Emitted(219, 11) Source(217, 11) + SourceIndex(0) +3 >Emitted(219, 12) Source(217, 12) + SourceIndex(0) +4 >Emitted(219, 16) Source(217, 16) + SourceIndex(0) +5 >Emitted(219, 21) Source(217, 21) + SourceIndex(0) +6 >Emitted(219, 22) Source(217, 22) + SourceIndex(0) +7 >Emitted(219, 26) Source(217, 26) + SourceIndex(0) +8 >Emitted(219, 27) Source(217, 27) + SourceIndex(0) +9 >Emitted(219, 28) Source(217, 28) + SourceIndex(0) +10>Emitted(219, 31) Source(217, 31) + SourceIndex(0) +11>Emitted(219, 33) Source(217, 33) + SourceIndex(0) +12>Emitted(219, 35) Source(217, 35) + SourceIndex(0) +13>Emitted(219, 39) Source(217, 39) + SourceIndex(0) +14>Emitted(219, 40) Source(217, 40) + SourceIndex(0) +15>Emitted(219, 41) Source(217, 41) + SourceIndex(0) +16>Emitted(219, 44) Source(217, 44) + SourceIndex(0) +17>Emitted(219, 46) Source(217, 46) + SourceIndex(0) +18>Emitted(219, 47) Source(217, 47) + SourceIndex(0) +19>Emitted(219, 48) Source(217, 48) + SourceIndex(0) --- >>>}; 1 > @@ -3495,9 +3694,9 @@ sourceFile:contextualTyping.ts > 2 >} 3 > ; -1 >Emitted(135, 1) Source(218, 1) + SourceIndex(0) -2 >Emitted(135, 2) Source(218, 2) + SourceIndex(0) -3 >Emitted(135, 3) Source(218, 3) + SourceIndex(0) +1 >Emitted(220, 1) Source(218, 1) + SourceIndex(0) +2 >Emitted(220, 2) Source(218, 2) + SourceIndex(0) +3 >Emitted(220, 3) Source(218, 3) + SourceIndex(0) --- >>>Point.prototype = { 1-> @@ -3512,11 +3711,11 @@ sourceFile:contextualTyping.ts 3 > . 4 > prototype 5 > = -1->Emitted(136, 1) Source(220, 1) + SourceIndex(0) -2 >Emitted(136, 6) Source(220, 6) + SourceIndex(0) -3 >Emitted(136, 7) Source(220, 7) + SourceIndex(0) -4 >Emitted(136, 16) Source(220, 16) + SourceIndex(0) -5 >Emitted(136, 19) Source(220, 19) + SourceIndex(0) +1->Emitted(221, 1) Source(220, 1) + SourceIndex(0) +2 >Emitted(221, 6) Source(220, 6) + SourceIndex(0) +3 >Emitted(221, 7) Source(220, 7) + SourceIndex(0) +4 >Emitted(221, 16) Source(220, 16) + SourceIndex(0) +5 >Emitted(221, 19) Source(220, 19) + SourceIndex(0) --- >>> x: 0, 1 >^^^^ @@ -3529,10 +3728,10 @@ sourceFile:contextualTyping.ts 2 > x 3 > : 4 > 0 -1 >Emitted(137, 5) Source(221, 5) + SourceIndex(0) -2 >Emitted(137, 6) Source(221, 6) + SourceIndex(0) -3 >Emitted(137, 8) Source(221, 8) + SourceIndex(0) -4 >Emitted(137, 9) Source(221, 9) + SourceIndex(0) +1 >Emitted(222, 5) Source(221, 5) + SourceIndex(0) +2 >Emitted(222, 6) Source(221, 6) + SourceIndex(0) +3 >Emitted(222, 8) Source(221, 8) + SourceIndex(0) +4 >Emitted(222, 9) Source(221, 9) + SourceIndex(0) --- >>> y: 0, 1->^^^^ @@ -3545,10 +3744,10 @@ sourceFile:contextualTyping.ts 2 > y 3 > : 4 > 0 -1->Emitted(138, 5) Source(222, 5) + SourceIndex(0) -2 >Emitted(138, 6) Source(222, 6) + SourceIndex(0) -3 >Emitted(138, 8) Source(222, 8) + SourceIndex(0) -4 >Emitted(138, 9) Source(222, 9) + SourceIndex(0) +1->Emitted(223, 5) Source(222, 5) + SourceIndex(0) +2 >Emitted(223, 6) Source(222, 6) + SourceIndex(0) +3 >Emitted(223, 8) Source(222, 8) + SourceIndex(0) +4 >Emitted(223, 9) Source(222, 9) + SourceIndex(0) --- >>> add: function (dx, dy) { 1->^^^^ @@ -3567,13 +3766,13 @@ sourceFile:contextualTyping.ts 5 > dx 6 > , 7 > dy -1->Emitted(139, 5) Source(223, 5) + SourceIndex(0) -2 >Emitted(139, 8) Source(223, 8) + SourceIndex(0) -3 >Emitted(139, 10) Source(223, 10) + SourceIndex(0) -4 >Emitted(139, 20) Source(223, 19) + SourceIndex(0) -5 >Emitted(139, 22) Source(223, 21) + SourceIndex(0) -6 >Emitted(139, 24) Source(223, 23) + SourceIndex(0) -7 >Emitted(139, 26) Source(223, 25) + SourceIndex(0) +1->Emitted(224, 5) Source(223, 5) + SourceIndex(0) +2 >Emitted(224, 8) Source(223, 8) + SourceIndex(0) +3 >Emitted(224, 10) Source(223, 10) + SourceIndex(0) +4 >Emitted(224, 20) Source(223, 19) + SourceIndex(0) +5 >Emitted(224, 22) Source(223, 21) + SourceIndex(0) +6 >Emitted(224, 24) Source(223, 23) + SourceIndex(0) +7 >Emitted(224, 26) Source(223, 25) + SourceIndex(0) --- >>> return new Point(this.x + dx, this.y + dy); 1->^^^^^^^^ @@ -3615,25 +3814,25 @@ sourceFile:contextualTyping.ts 17> dy 18> ) 19> ; -1->Emitted(140, 9) Source(224, 9) + SourceIndex(0) -2 >Emitted(140, 15) Source(224, 15) + SourceIndex(0) -3 >Emitted(140, 16) Source(224, 16) + SourceIndex(0) -4 >Emitted(140, 20) Source(224, 20) + SourceIndex(0) -5 >Emitted(140, 25) Source(224, 25) + SourceIndex(0) -6 >Emitted(140, 26) Source(224, 26) + SourceIndex(0) -7 >Emitted(140, 30) Source(224, 30) + SourceIndex(0) -8 >Emitted(140, 31) Source(224, 31) + SourceIndex(0) -9 >Emitted(140, 32) Source(224, 32) + SourceIndex(0) -10>Emitted(140, 35) Source(224, 35) + SourceIndex(0) -11>Emitted(140, 37) Source(224, 37) + SourceIndex(0) -12>Emitted(140, 39) Source(224, 39) + SourceIndex(0) -13>Emitted(140, 43) Source(224, 43) + SourceIndex(0) -14>Emitted(140, 44) Source(224, 44) + SourceIndex(0) -15>Emitted(140, 45) Source(224, 45) + SourceIndex(0) -16>Emitted(140, 48) Source(224, 48) + SourceIndex(0) -17>Emitted(140, 50) Source(224, 50) + SourceIndex(0) -18>Emitted(140, 51) Source(224, 51) + SourceIndex(0) -19>Emitted(140, 52) Source(224, 52) + SourceIndex(0) +1->Emitted(225, 9) Source(224, 9) + SourceIndex(0) +2 >Emitted(225, 15) Source(224, 15) + SourceIndex(0) +3 >Emitted(225, 16) Source(224, 16) + SourceIndex(0) +4 >Emitted(225, 20) Source(224, 20) + SourceIndex(0) +5 >Emitted(225, 25) Source(224, 25) + SourceIndex(0) +6 >Emitted(225, 26) Source(224, 26) + SourceIndex(0) +7 >Emitted(225, 30) Source(224, 30) + SourceIndex(0) +8 >Emitted(225, 31) Source(224, 31) + SourceIndex(0) +9 >Emitted(225, 32) Source(224, 32) + SourceIndex(0) +10>Emitted(225, 35) Source(224, 35) + SourceIndex(0) +11>Emitted(225, 37) Source(224, 37) + SourceIndex(0) +12>Emitted(225, 39) Source(224, 39) + SourceIndex(0) +13>Emitted(225, 43) Source(224, 43) + SourceIndex(0) +14>Emitted(225, 44) Source(224, 44) + SourceIndex(0) +15>Emitted(225, 45) Source(224, 45) + SourceIndex(0) +16>Emitted(225, 48) Source(224, 48) + SourceIndex(0) +17>Emitted(225, 50) Source(224, 50) + SourceIndex(0) +18>Emitted(225, 51) Source(224, 51) + SourceIndex(0) +19>Emitted(225, 52) Source(224, 52) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -3641,8 +3840,8 @@ sourceFile:contextualTyping.ts 1 > > 2 > } -1 >Emitted(141, 5) Source(225, 5) + SourceIndex(0) -2 >Emitted(141, 6) Source(225, 6) + SourceIndex(0) +1 >Emitted(226, 5) Source(225, 5) + SourceIndex(0) +2 >Emitted(226, 6) Source(225, 6) + SourceIndex(0) --- >>>}; 1 >^ @@ -3651,8 +3850,8 @@ sourceFile:contextualTyping.ts 1 > >} 2 > ; -1 >Emitted(142, 2) Source(226, 2) + SourceIndex(0) -2 >Emitted(142, 3) Source(226, 3) + SourceIndex(0) +1 >Emitted(227, 2) Source(226, 2) + SourceIndex(0) +2 >Emitted(227, 3) Source(226, 3) + SourceIndex(0) --- >>>var x = {}; 1-> @@ -3672,11 +3871,11 @@ sourceFile:contextualTyping.ts 4 > : B = 5 > { } 6 > ; -1->Emitted(143, 1) Source(230, 1) + SourceIndex(0) -2 >Emitted(143, 5) Source(230, 5) + SourceIndex(0) -3 >Emitted(143, 6) Source(230, 6) + SourceIndex(0) -4 >Emitted(143, 9) Source(230, 12) + SourceIndex(0) -5 >Emitted(143, 11) Source(230, 15) + SourceIndex(0) -6 >Emitted(143, 12) Source(230, 16) + SourceIndex(0) +1->Emitted(228, 1) Source(230, 1) + SourceIndex(0) +2 >Emitted(228, 5) Source(230, 5) + SourceIndex(0) +3 >Emitted(228, 6) Source(230, 6) + SourceIndex(0) +4 >Emitted(228, 9) Source(230, 12) + SourceIndex(0) +5 >Emitted(228, 11) Source(230, 15) + SourceIndex(0) +6 >Emitted(228, 12) Source(230, 16) + SourceIndex(0) --- >>>//# sourceMappingURL=contextualTyping.js.map \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping1.js b/tests/baselines/reference/contextualTyping1.js index 7f1e12c744b..6b1b88c36ff 100644 --- a/tests/baselines/reference/contextualTyping1.js +++ b/tests/baselines/reference/contextualTyping1.js @@ -2,4 +2,4 @@ var foo: {id:number;} = {id:4}; //// [contextualTyping1.js] -var foo = { id: 4 };\n \ No newline at end of file +var foo = {\n id: 4\n};\n \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping10.js b/tests/baselines/reference/contextualTyping10.js index 08a2172b69a..e6afd72e817 100644 --- a/tests/baselines/reference/contextualTyping10.js +++ b/tests/baselines/reference/contextualTyping10.js @@ -4,7 +4,14 @@ class foo { public bar:{id:number;}[] = [{id:1}, {id:2}]; } //// [contextualTyping10.js] var foo = (function () { function foo() { - this.bar = [{ id: 1 }, { id: 2 }]; + this.bar = [ + { + id: 1 + }, + { + id: 2 + } + ]; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping11.js b/tests/baselines/reference/contextualTyping11.js index a7ec3815fae..123295d5387 100644 --- a/tests/baselines/reference/contextualTyping11.js +++ b/tests/baselines/reference/contextualTyping11.js @@ -4,7 +4,9 @@ class foo { public bar:{id:number;}[] = [({})]; } //// [contextualTyping11.js] var foo = (function () { function foo() { - this.bar = [({})]; + this.bar = [ + ({}) + ]; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping12.js b/tests/baselines/reference/contextualTyping12.js index c41ccbed990..60f3965f95a 100644 --- a/tests/baselines/reference/contextualTyping12.js +++ b/tests/baselines/reference/contextualTyping12.js @@ -4,7 +4,15 @@ class foo { public bar:{id:number;}[] = [{id:1}, {id:2, name:"foo"}]; } //// [contextualTyping12.js] var foo = (function () { function foo() { - this.bar = [{ id: 1 }, { id: 2, name: "foo" }]; + this.bar = [ + { + id: 1 + }, + { + id: 2, + name: "foo" + } + ]; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping13.js b/tests/baselines/reference/contextualTyping13.js index 7965745b943..c035434342e 100644 --- a/tests/baselines/reference/contextualTyping13.js +++ b/tests/baselines/reference/contextualTyping13.js @@ -2,4 +2,6 @@ var foo:(a:number)=>number = function(a){return a}; //// [contextualTyping13.js] -var foo = function (a) { return a; }; +var foo = function (a) { + return a; +}; diff --git a/tests/baselines/reference/contextualTyping14.js b/tests/baselines/reference/contextualTyping14.js index 5bae8c948a2..ea9539ef41e 100644 --- a/tests/baselines/reference/contextualTyping14.js +++ b/tests/baselines/reference/contextualTyping14.js @@ -4,7 +4,9 @@ class foo { public bar:(a:number)=>number = function(a){return a}; } //// [contextualTyping14.js] var foo = (function () { function foo() { - this.bar = function (a) { return a; }; + this.bar = function (a) { + return a; + }; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping15.js b/tests/baselines/reference/contextualTyping15.js index 250076ec4d5..99855681571 100644 --- a/tests/baselines/reference/contextualTyping15.js +++ b/tests/baselines/reference/contextualTyping15.js @@ -4,7 +4,9 @@ class foo { public bar: { (): number; (i: number): number; } = function() { retu //// [contextualTyping15.js] var foo = (function () { function foo() { - this.bar = function () { return 1; }; + this.bar = function () { + return 1; + }; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping16.js b/tests/baselines/reference/contextualTyping16.js index 1a4c28ba745..bccf047ad13 100644 --- a/tests/baselines/reference/contextualTyping16.js +++ b/tests/baselines/reference/contextualTyping16.js @@ -2,5 +2,9 @@ var foo: {id:number;} = {id:4}; foo = {id:5}; //// [contextualTyping16.js] -var foo = { id: 4 }; -foo = { id: 5 }; +var foo = { + id: 4 +}; +foo = { + id: 5 +}; diff --git a/tests/baselines/reference/contextualTyping17.js b/tests/baselines/reference/contextualTyping17.js index 0ae2605dbd6..2e433cd4dfd 100644 --- a/tests/baselines/reference/contextualTyping17.js +++ b/tests/baselines/reference/contextualTyping17.js @@ -2,5 +2,10 @@ var foo: {id:number;} = {id:4}; foo = {id: 5, name:"foo"}; //// [contextualTyping17.js] -var foo = { id: 4 }; -foo = { id: 5, name: "foo" }; +var foo = { + id: 4 +}; +foo = { + id: 5, + name: "foo" +}; diff --git a/tests/baselines/reference/contextualTyping18.js b/tests/baselines/reference/contextualTyping18.js index fb058032ed2..7289d73ba18 100644 --- a/tests/baselines/reference/contextualTyping18.js +++ b/tests/baselines/reference/contextualTyping18.js @@ -3,4 +3,6 @@ var foo: {id:number;} = <{id:number;}>({ }); foo = {id: 5}; //// [contextualTyping18.js] var foo = ({}); -foo = { id: 5 }; +foo = { + id: 5 +}; diff --git a/tests/baselines/reference/contextualTyping19.js b/tests/baselines/reference/contextualTyping19.js index e4e51372858..2b70fc19767 100644 --- a/tests/baselines/reference/contextualTyping19.js +++ b/tests/baselines/reference/contextualTyping19.js @@ -2,5 +2,16 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2}]; //// [contextualTyping19.js] -var foo = [{ id: 1 }]; -foo = [{ id: 1 }, { id: 2 }]; +var foo = [ + { + id: 1 + } +]; +foo = [ + { + id: 1 + }, + { + id: 2 + } +]; diff --git a/tests/baselines/reference/contextualTyping2.js b/tests/baselines/reference/contextualTyping2.js index 4dc3f71e9b0..4240ce23a1f 100644 --- a/tests/baselines/reference/contextualTyping2.js +++ b/tests/baselines/reference/contextualTyping2.js @@ -2,4 +2,7 @@ var foo: {id:number;} = {id:4, name:"foo"}; //// [contextualTyping2.js] -var foo = { id: 4, name: "foo" }; +var foo = { + id: 4, + name: "foo" +}; diff --git a/tests/baselines/reference/contextualTyping20.js b/tests/baselines/reference/contextualTyping20.js index f53a7f7554b..e2afa7a21ff 100644 --- a/tests/baselines/reference/contextualTyping20.js +++ b/tests/baselines/reference/contextualTyping20.js @@ -2,5 +2,17 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, {id:2, name:"foo"}]; //// [contextualTyping20.js] -var foo = [{ id: 1 }]; -foo = [{ id: 1 }, { id: 2, name: "foo" }]; +var foo = [ + { + id: 1 + } +]; +foo = [ + { + id: 1 + }, + { + id: 2, + name: "foo" + } +]; diff --git a/tests/baselines/reference/contextualTyping21.js b/tests/baselines/reference/contextualTyping21.js index 3d87d9e4245..6c3aa6e885f 100644 --- a/tests/baselines/reference/contextualTyping21.js +++ b/tests/baselines/reference/contextualTyping21.js @@ -2,5 +2,14 @@ var foo:{id:number;}[] = [{id:1}]; foo = [{id:1}, 1]; //// [contextualTyping21.js] -var foo = [{ id: 1 }]; -foo = [{ id: 1 }, 1]; +var foo = [ + { + id: 1 + } +]; +foo = [ + { + id: 1 + }, + 1 +]; diff --git a/tests/baselines/reference/contextualTyping22.js b/tests/baselines/reference/contextualTyping22.js index 3c9a5cb4d3e..b8ebfd3ecb7 100644 --- a/tests/baselines/reference/contextualTyping22.js +++ b/tests/baselines/reference/contextualTyping22.js @@ -2,5 +2,9 @@ var foo:(a:number)=>number = function(a){return a}; foo = function(b){return b}; //// [contextualTyping22.js] -var foo = function (a) { return a; }; -foo = function (b) { return b; }; +var foo = function (a) { + return a; +}; +foo = function (b) { + return b; +}; diff --git a/tests/baselines/reference/contextualTyping23.js b/tests/baselines/reference/contextualTyping23.js index 0207f6af15d..187fd3f86d3 100644 --- a/tests/baselines/reference/contextualTyping23.js +++ b/tests/baselines/reference/contextualTyping23.js @@ -3,4 +3,6 @@ var foo:(a:{():number; (i:number):number; })=>number; foo = function(a){return 5 //// [contextualTyping23.js] var foo; -foo = function (a) { return 5; }; +foo = function (a) { + return 5; +}; diff --git a/tests/baselines/reference/contextualTyping24.js b/tests/baselines/reference/contextualTyping24.js index 04c4ecba21b..170a6983b9f 100644 --- a/tests/baselines/reference/contextualTyping24.js +++ b/tests/baselines/reference/contextualTyping24.js @@ -3,4 +3,6 @@ var foo:(a:{():number; (i:number):number; })=>number; foo = function(a:string){r //// [contextualTyping24.js] var foo; -foo = function (a) { return 5; }; +foo = function (a) { + return 5; +}; diff --git a/tests/baselines/reference/contextualTyping25.js b/tests/baselines/reference/contextualTyping25.js index f90a70098d7..808ee2202ec 100644 --- a/tests/baselines/reference/contextualTyping25.js +++ b/tests/baselines/reference/contextualTyping25.js @@ -2,6 +2,7 @@ function foo(param:{id:number;}){}; foo(<{id:number;}>({})); //// [contextualTyping25.js] -function foo(param) { } +function foo(param) { +} ; foo(({})); diff --git a/tests/baselines/reference/contextualTyping26.js b/tests/baselines/reference/contextualTyping26.js index feacf3da328..fabd810c8f5 100644 --- a/tests/baselines/reference/contextualTyping26.js +++ b/tests/baselines/reference/contextualTyping26.js @@ -2,6 +2,7 @@ function foo(param:{id:number;}){}; foo(<{id:number;}>({})); //// [contextualTyping26.js] -function foo(param) { } +function foo(param) { +} ; foo(({})); diff --git a/tests/baselines/reference/contextualTyping27.js b/tests/baselines/reference/contextualTyping27.js index ce35e606196..11b8c251416 100644 --- a/tests/baselines/reference/contextualTyping27.js +++ b/tests/baselines/reference/contextualTyping27.js @@ -2,6 +2,7 @@ function foo(param:{id:number;}){}; foo(<{id:number;}>({})); //// [contextualTyping27.js] -function foo(param) { } +function foo(param) { +} ; foo(({})); diff --git a/tests/baselines/reference/contextualTyping28.js b/tests/baselines/reference/contextualTyping28.js index 095e3812400..a9dd848a2c0 100644 --- a/tests/baselines/reference/contextualTyping28.js +++ b/tests/baselines/reference/contextualTyping28.js @@ -2,6 +2,9 @@ function foo(param:number[]){}; foo([1]); //// [contextualTyping28.js] -function foo(param) { } +function foo(param) { +} ; -foo([1]); +foo([ + 1 +]); diff --git a/tests/baselines/reference/contextualTyping29.js b/tests/baselines/reference/contextualTyping29.js index 1d5b32c208d..cf3a8e340a1 100644 --- a/tests/baselines/reference/contextualTyping29.js +++ b/tests/baselines/reference/contextualTyping29.js @@ -2,6 +2,10 @@ function foo(param:number[]){}; foo([1, 3]); //// [contextualTyping29.js] -function foo(param) { } +function foo(param) { +} ; -foo([1, 3]); +foo([ + 1, + 3 +]); diff --git a/tests/baselines/reference/contextualTyping3.js b/tests/baselines/reference/contextualTyping3.js index 19d71f4ca71..8ea5481037d 100644 --- a/tests/baselines/reference/contextualTyping3.js +++ b/tests/baselines/reference/contextualTyping3.js @@ -4,7 +4,9 @@ class foo { public bar:{id:number;} = {id:5}; } //// [contextualTyping3.js] var foo = (function () { function foo() { - this.bar = { id: 5 }; + this.bar = { + id: 5 + }; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping30.js b/tests/baselines/reference/contextualTyping30.js index 94547a387d7..25b8d9c6f55 100644 --- a/tests/baselines/reference/contextualTyping30.js +++ b/tests/baselines/reference/contextualTyping30.js @@ -2,6 +2,10 @@ function foo(param:number[]){}; foo([1, "a"]); //// [contextualTyping30.js] -function foo(param) { } +function foo(param) { +} ; -foo([1, "a"]); +foo([ + 1, + "a" +]); diff --git a/tests/baselines/reference/contextualTyping31.js b/tests/baselines/reference/contextualTyping31.js index 1eb4d5660fc..0e29d9f68c0 100644 --- a/tests/baselines/reference/contextualTyping31.js +++ b/tests/baselines/reference/contextualTyping31.js @@ -2,6 +2,9 @@ function foo(param:number[]){}; foo([1]); //// [contextualTyping31.js] -function foo(param) { } +function foo(param) { +} ; -foo([1]); +foo([ + 1 +]); diff --git a/tests/baselines/reference/contextualTyping32.js b/tests/baselines/reference/contextualTyping32.js index bbbafa70796..8a47a109aec 100644 --- a/tests/baselines/reference/contextualTyping32.js +++ b/tests/baselines/reference/contextualTyping32.js @@ -2,6 +2,14 @@ function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return 4}]); //// [contextualTyping32.js] -function foo(param) { } +function foo(param) { +} ; -foo([function () { return 1; }, function () { return 4; }]); +foo([ + function () { + return 1; + }, + function () { + return 4; + } +]); diff --git a/tests/baselines/reference/contextualTyping33.js b/tests/baselines/reference/contextualTyping33.js index 1d800b1d113..9ee3245416f 100644 --- a/tests/baselines/reference/contextualTyping33.js +++ b/tests/baselines/reference/contextualTyping33.js @@ -2,6 +2,14 @@ function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return "foo"}]); //// [contextualTyping33.js] -function foo(param) { } +function foo(param) { +} ; -foo([function () { return 1; }, function () { return "foo"; }]); +foo([ + function () { + return 1; + }, + function () { + return "foo"; + } +]); diff --git a/tests/baselines/reference/contextualTyping34.js b/tests/baselines/reference/contextualTyping34.js index 5e12ba602ae..fc801d3cd7e 100644 --- a/tests/baselines/reference/contextualTyping34.js +++ b/tests/baselines/reference/contextualTyping34.js @@ -2,4 +2,6 @@ var foo = <{ id: number;}> ({id:4}); //// [contextualTyping34.js] -var foo = ({ id: 4 }); +var foo = ({ + id: 4 +}); diff --git a/tests/baselines/reference/contextualTyping35.js b/tests/baselines/reference/contextualTyping35.js index 34d9e6b39a8..bf9e02dd903 100644 --- a/tests/baselines/reference/contextualTyping35.js +++ b/tests/baselines/reference/contextualTyping35.js @@ -2,4 +2,7 @@ var foo = <{ id: number;}> {id:4, name: "as"}; //// [contextualTyping35.js] -var foo = { id: 4, name: "as" }; +var foo = { + id: 4, + name: "as" +}; diff --git a/tests/baselines/reference/contextualTyping36.js b/tests/baselines/reference/contextualTyping36.js index 3bdaf5a8d05..623a1e92ad2 100644 --- a/tests/baselines/reference/contextualTyping36.js +++ b/tests/baselines/reference/contextualTyping36.js @@ -2,4 +2,9 @@ var foo = <{ id: number; }[]>[{ id: 4 }, <{ id: number; }>({ })]; //// [contextualTyping36.js] -var foo = [{ id: 4 }, ({})]; +var foo = [ + { + id: 4 + }, + ({}) +]; diff --git a/tests/baselines/reference/contextualTyping37.js b/tests/baselines/reference/contextualTyping37.js index 4bb6e7b350f..2f2636579bf 100644 --- a/tests/baselines/reference/contextualTyping37.js +++ b/tests/baselines/reference/contextualTyping37.js @@ -2,4 +2,9 @@ var foo = <{ id: number; }[]>[{ foo: "s" }, { }]; //// [contextualTyping37.js] -var foo = [{ foo: "s" }, {}]; +var foo = [ + { + foo: "s" + }, + {} +]; diff --git a/tests/baselines/reference/contextualTyping38.js b/tests/baselines/reference/contextualTyping38.js index 9bed543ff7f..71ed8ece57d 100644 --- a/tests/baselines/reference/contextualTyping38.js +++ b/tests/baselines/reference/contextualTyping38.js @@ -2,4 +2,6 @@ var foo = <{ (): number; }> function(a) { return a }; //// [contextualTyping38.js] -var foo = function (a) { return a; }; +var foo = function (a) { + return a; +}; diff --git a/tests/baselines/reference/contextualTyping39.js b/tests/baselines/reference/contextualTyping39.js index 89d045830a3..9a97b7eb3cc 100644 --- a/tests/baselines/reference/contextualTyping39.js +++ b/tests/baselines/reference/contextualTyping39.js @@ -2,4 +2,6 @@ var foo = <{ (): number; }> function() { return "err"; }; //// [contextualTyping39.js] -var foo = function () { return "err"; }; +var foo = function () { + return "err"; +}; diff --git a/tests/baselines/reference/contextualTyping4.js b/tests/baselines/reference/contextualTyping4.js index af79e3732f2..902791adcbc 100644 --- a/tests/baselines/reference/contextualTyping4.js +++ b/tests/baselines/reference/contextualTyping4.js @@ -4,7 +4,10 @@ class foo { public bar:{id:number;} = {id:5, name:"foo"}; } //// [contextualTyping4.js] var foo = (function () { function foo() { - this.bar = { id: 5, name: "foo" }; + this.bar = { + id: 5, + name: "foo" + }; } return foo; })(); diff --git a/tests/baselines/reference/contextualTyping40.js b/tests/baselines/reference/contextualTyping40.js index 0b98f8e45c6..ba2c447b10f 100644 --- a/tests/baselines/reference/contextualTyping40.js +++ b/tests/baselines/reference/contextualTyping40.js @@ -2,4 +2,6 @@ var foo = <{():number; (i:number):number; }> function(){return 1;}; //// [contextualTyping40.js] -var foo = function () { return 1; }; +var foo = function () { + return 1; +}; diff --git a/tests/baselines/reference/contextualTyping41.js b/tests/baselines/reference/contextualTyping41.js index 8bce7918dd2..720f1d178f6 100644 --- a/tests/baselines/reference/contextualTyping41.js +++ b/tests/baselines/reference/contextualTyping41.js @@ -2,4 +2,6 @@ var foo = <{():number; (i:number):number; }> (function(){return "err";}); //// [contextualTyping41.js] -var foo = (function () { return "err"; }); +var foo = (function () { + return "err"; +}); diff --git a/tests/baselines/reference/contextualTyping6.js b/tests/baselines/reference/contextualTyping6.js index df2d2ac15cb..c1fb58d4d2d 100644 --- a/tests/baselines/reference/contextualTyping6.js +++ b/tests/baselines/reference/contextualTyping6.js @@ -2,4 +2,11 @@ var foo:{id:number;}[] = [{id:1}, {id:2}]; //// [contextualTyping6.js] -var foo = [{ id: 1 }, { id: 2 }]; +var foo = [ + { + id: 1 + }, + { + id: 2 + } +]; diff --git a/tests/baselines/reference/contextualTyping7.js b/tests/baselines/reference/contextualTyping7.js index 2cd2494c3bf..6b93e7308d5 100644 --- a/tests/baselines/reference/contextualTyping7.js +++ b/tests/baselines/reference/contextualTyping7.js @@ -2,4 +2,6 @@ var foo:{id:number;}[] = [<{id:number;}>({})]; //// [contextualTyping7.js] -var foo = [({})]; +var foo = [ + ({}) +]; diff --git a/tests/baselines/reference/contextualTyping8.js b/tests/baselines/reference/contextualTyping8.js index a0e3b5b9ef5..276b32bed68 100644 --- a/tests/baselines/reference/contextualTyping8.js +++ b/tests/baselines/reference/contextualTyping8.js @@ -2,4 +2,6 @@ var foo:{id:number;}[] = [<{id:number;}>({})]; //// [contextualTyping8.js] -var foo = [({})]; +var foo = [ + ({}) +]; diff --git a/tests/baselines/reference/contextualTyping9.js b/tests/baselines/reference/contextualTyping9.js index 71384cf8b04..19d0f0fba79 100644 --- a/tests/baselines/reference/contextualTyping9.js +++ b/tests/baselines/reference/contextualTyping9.js @@ -2,4 +2,12 @@ var foo:{id:number;}[] = [{id:1}, {id:2, name:"foo"}]; //// [contextualTyping9.js] -var foo = [{ id: 1 }, { id: 2, name: "foo" }]; +var foo = [ + { + id: 1 + }, + { + id: 2, + name: "foo" + } +]; diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.js b/tests/baselines/reference/contextualTypingArrayOfLambdas.js index 844a50428e2..b9ea5beaa77 100644 --- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js +++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js @@ -40,4 +40,11 @@ var C = (function (_super) { } return C; })(A); -var xs = [function (x) { }, function (x) { }, function (x) { }]; +var xs = [ + function (x) { + }, + function (x) { + }, + function (x) { + } +]; diff --git a/tests/baselines/reference/contextualTypingOfAccessors.js b/tests/baselines/reference/contextualTypingOfAccessors.js index f785d19636c..0f45574be99 100644 --- a/tests/baselines/reference/contextualTypingOfAccessors.js +++ b/tests/baselines/reference/contextualTypingOfAccessors.js @@ -18,7 +18,10 @@ x = { var x; x = { get foo() { - return function (n) { return n; }; + return function (n) { + return n; + }; }, - set foo(x) { } + set foo(x) { + } }; diff --git a/tests/baselines/reference/contextualTypingOfArrayLiterals1.js b/tests/baselines/reference/contextualTypingOfArrayLiterals1.js index e7513093402..e2edcb3d5df 100644 --- a/tests/baselines/reference/contextualTypingOfArrayLiterals1.js +++ b/tests/baselines/reference/contextualTypingOfArrayLiterals1.js @@ -9,6 +9,9 @@ r2.getDate(); //// [contextualTypingOfArrayLiterals1.js] -var x3 = [new Date(), 1]; +var x3 = [ + new Date(), + 1 +]; var r2 = x3[1]; r2.getDate(); diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.js b/tests/baselines/reference/contextualTypingOfConditionalExpression.js index b1100ba80a9..805ffca7508 100644 --- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js +++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js @@ -21,7 +21,11 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -var x = true ? function (a) { return a.toExponential(); } : function (b) { return b.toFixed(); }; +var x = true ? function (a) { + return a.toExponential(); +} : function (b) { + return b.toFixed(); +}; var A = (function () { function A() { } @@ -41,4 +45,8 @@ var C = (function (_super) { } return C; })(A); -var x2 = true ? function (a) { return a.foo; } : function (b) { return b.foo; }; +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 f832d2766ee..c84fa87e817 100644 --- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js +++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js @@ -38,4 +38,7 @@ var C = (function (_super) { } return C; })(A); -var x2 = true ? function (a) { return a.foo; } : function (b) { }; +var x2 = true ? function (a) { + return a.foo; +} : function (b) { +}; diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js index 8142b51dcdd..b2a8bf0dba1 100644 --- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js +++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.js @@ -22,6 +22,10 @@ var r6 = _.forEach(c2, (x) => { return x.toFixed() }); var c2; var _; // errors on all 3 lines, bug was that r5 was the only line with errors -var f = function (x) { return x.toFixed(); }; +var f = function (x) { + return x.toFixed(); +}; var r5 = _.forEach(c2, f); -var r6 = _.forEach(c2, function (x) { return x.toFixed(); }); +var r6 = _.forEach(c2, function (x) { + return x.toFixed(); +}); diff --git a/tests/baselines/reference/contextualTypingOfLambdaReturnExpression.js b/tests/baselines/reference/contextualTypingOfLambdaReturnExpression.js index 67670bf872e..ecc6a0ecd16 100644 --- a/tests/baselines/reference/contextualTypingOfLambdaReturnExpression.js +++ b/tests/baselines/reference/contextualTypingOfLambdaReturnExpression.js @@ -7,6 +7,11 @@ callb((a) => a.length); // Ok, we choose the second overload because the first o callb((a) => { a.length; }); // Error, we picked the first overload and errored when type checking the lambda body //// [contextualTypingOfLambdaReturnExpression.js] -function callb(a) { } -callb(function (a) { return a.length; }); // Ok, we choose the second overload because the first one gave us an error when trying to resolve the lambda return type -callb(function (a) { a.length; }); // Error, we picked the first overload and errored when type checking the lambda body +function callb(a) { +} +callb(function (a) { + return a.length; +}); // Ok, we choose the second overload because the first one gave us an error when trying to resolve the lambda return type +callb(function (a) { + a.length; +}); // Error, we picked the first overload and errored when type checking the lambda body diff --git a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.js b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.js index f21bc852af8..400a052a7bb 100644 --- a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.js +++ b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.js @@ -9,4 +9,5 @@ foo.getFoo = bar => { }; //// [contextualTypingOfLambdaWithMultipleSignatures.js] var foo; -foo.getFoo = function (bar) { }; +foo.getFoo = function (bar) { +}; diff --git a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures2.js b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures2.js index 442ded4ba75..415fc3acd2e 100644 --- a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures2.js +++ b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures2.js @@ -8,4 +8,6 @@ f = (a) => { return a.asdf } //// [contextualTypingOfLambdaWithMultipleSignatures2.js] var f; -f = function (a) { return a.asdf; }; +f = function (a) { + return a.asdf; +}; diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals.js b/tests/baselines/reference/contextualTypingOfObjectLiterals.js index e267ce6269e..d965ef5828c 100644 --- a/tests/baselines/reference/contextualTypingOfObjectLiterals.js +++ b/tests/baselines/reference/contextualTypingOfObjectLiterals.js @@ -12,10 +12,13 @@ f(obj2); // Error - indexer doesn't match //// [contextualTypingOfObjectLiterals.js] var obj1; -var obj2 = { x: "" }; +var obj2 = { + x: "" +}; obj1 = {}; // Ok obj1 = obj2; // Error - indexer doesn't match -function f(x) { } +function f(x) { +} f({}); // Ok f(obj1); // Ok f(obj2); // Error - indexer doesn't match diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals2.js b/tests/baselines/reference/contextualTypingOfObjectLiterals2.js index 4c450d31152..f709890c550 100644 --- a/tests/baselines/reference/contextualTypingOfObjectLiterals2.js +++ b/tests/baselines/reference/contextualTypingOfObjectLiterals2.js @@ -6,5 +6,10 @@ function f2(args: Foo) { } f2({ foo: s => s.hmm }) // 's' should be 'string', so this should be an error //// [contextualTypingOfObjectLiterals2.js] -function f2(args) { } -f2({ foo: function (s) { return s.hmm; } }); // 's' should be 'string', so this should be an error +function f2(args) { +} +f2({ + foo: function (s) { + return s.hmm; + } +}); // 's' should be 'string', so this should be an error diff --git a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.js b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.js index 4b392bac80a..96e8f860358 100644 --- a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.js +++ b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.js @@ -8,4 +8,8 @@ f6(x => f6(y => x = y)); function f6(x) { return null; } -f6(function (x) { return f6(function (y) { return x = y; }); }); +f6(function (x) { + return f6(function (y) { + return x = y; + }); +}); diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js index 55f7580b3f8..f8804547d46 100644 --- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js +++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js @@ -5,5 +5,13 @@ var r9 = f10('', () => (a => a.foo), 1); // error //// [contextualTypingWithFixedTypeParameters1.js] var f10; -f10('', function () { return function (a) { return a.foo; }; }, ''); // a is string -var r9 = f10('', function () { return (function (a) { return a.foo; }); }, 1); // error +f10('', function () { + return function (a) { + return a.foo; + }; +}, ''); // a is string +var r9 = f10('', function () { + return (function (a) { + return a.foo; + }); +}, 1); // error diff --git a/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.js b/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.js index 5ee0c758022..f548b6daaad 100644 --- a/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.js +++ b/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.js @@ -19,6 +19,10 @@ f3 = (x, y) => { return x } //// [contextualTypingWithGenericAndNonGenericSignature.js] //• If e is a FunctionExpression or ArrowFunctionExpression with no type parameters and no parameter or return type annotations, and T is a function type with EXACTLY ONE non - generic call signature, then any inferences made for type parameters referenced by the parameters of T’s call signature are fixed(section 4.12.2) and e is processed with the contextual type T, as described in section 4.9.3. var f2; -f2 = function (x, y) { return x; }; +f2 = function (x, y) { + return x; +}; var f3; -f3 = function (x, y) { return x; }; +f3 = function (x, y) { + return x; +}; diff --git a/tests/baselines/reference/contextualTypingWithGenericSignature.js b/tests/baselines/reference/contextualTypingWithGenericSignature.js index 611a35f38ac..a1417e90b43 100644 --- a/tests/baselines/reference/contextualTypingWithGenericSignature.js +++ b/tests/baselines/reference/contextualTypingWithGenericSignature.js @@ -10,4 +10,6 @@ f2 = (x, y) => { return x } //// [contextualTypingWithGenericSignature.js] // If e is a FunctionExpression or ArrowFunctionExpression with no type parameters and no parameter or return type annotations, and T is a function type with EXACTLY ONE non - generic call signature, then any inferences made for type parameters referenced by the parameters of T’s call signature are fixed(section 4.12.2) and e is processed with the contextual type T, as described in section 4.9.3. var f2; -f2 = function (x, y) { return x; }; +f2 = function (x, y) { + return x; +}; diff --git a/tests/baselines/reference/contextuallyTypingOrOperator.js b/tests/baselines/reference/contextuallyTypingOrOperator.js index 6dc3e09bf89..6ffd81b1e03 100644 --- a/tests/baselines/reference/contextuallyTypingOrOperator.js +++ b/tests/baselines/reference/contextuallyTypingOrOperator.js @@ -7,7 +7,27 @@ var v3 = (s: string) => s.length || function (s: number) { return 1 }; var v4 = (s: number) => 1 || function (s: string) { return s.length }; //// [contextuallyTypingOrOperator.js] -var v = { a: function (s) { return s.length; } } || { a: function (s) { return 1; } }; -var v2 = function (s) { return s.length || function (s) { s.length; }; }; -var v3 = function (s) { return s.length || function (s) { return 1; }; }; -var v4 = function (s) { return 1 || function (s) { return s.length; }; }; +var v = { + a: function (s) { + return s.length; + } +} || { + a: function (s) { + return 1; + } +}; +var v2 = function (s) { + return s.length || function (s) { + s.length; + }; +}; +var v3 = function (s) { + return s.length || function (s) { + return 1; + }; +}; +var v4 = function (s) { + return 1 || function (s) { + return s.length; + }; +}; diff --git a/tests/baselines/reference/contextuallyTypingOrOperator2.js b/tests/baselines/reference/contextuallyTypingOrOperator2.js index fa850929b3e..0b4dfa46bc4 100644 --- a/tests/baselines/reference/contextuallyTypingOrOperator2.js +++ b/tests/baselines/reference/contextuallyTypingOrOperator2.js @@ -4,5 +4,17 @@ var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 }; var v2 = (s: string) => s.length || function (s) { s.aaa }; //// [contextuallyTypingOrOperator2.js] -var v = { a: function (s) { return s.length; } } || { a: function (s) { return 1; } }; -var v2 = function (s) { return s.length || function (s) { s.aaa; }; }; +var v = { + a: function (s) { + return s.length; + } +} || { + a: function (s) { + return 1; + } +}; +var v2 = function (s) { + return s.length || function (s) { + s.aaa; + }; +}; diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js index a68f751f434..deae65b54c9 100644 --- a/tests/baselines/reference/convertKeywordsYes.js +++ b/tests/baselines/reference/convertKeywordsYes.js @@ -325,7 +325,8 @@ var string = 0; var get = 0; var yield = 0; var declare = 0; -function bigGeneric(c, a, b2, i, i2, l, m, n, p, p2, p3, p4, s, s2, s3, g, y, d) { } +function bigGeneric(c, a, b2, i, i2, l, m, n, p, p2, p3, p4, s, s2, s3, g, y, d) { +} var bigObject = { constructor: 0, any: 0, diff --git a/tests/baselines/reference/couldNotSelectGenericOverload.js b/tests/baselines/reference/couldNotSelectGenericOverload.js index 996ebde8448..44bd87ace5d 100644 --- a/tests/baselines/reference/couldNotSelectGenericOverload.js +++ b/tests/baselines/reference/couldNotSelectGenericOverload.js @@ -9,9 +9,16 @@ var b3G = makeArray2(1, ""); // error //// [couldNotSelectGenericOverload.js] -function makeArray(items) { return items; } -var b = [1, ""]; +function makeArray(items) { + return items; +} +var b = [ + 1, + "" +]; var b1G = makeArray(1, ""); // any, no error var b2G = makeArray(b); // any[] -function makeArray2(items) { return items; } +function makeArray2(items) { + return items; +} var b3G = makeArray2(1, ""); // error diff --git a/tests/baselines/reference/covariance1.js b/tests/baselines/reference/covariance1.js index bed31338cbe..9c012ca85c8 100644 --- a/tests/baselines/reference/covariance1.js +++ b/tests/baselines/reference/covariance1.js @@ -27,10 +27,15 @@ var M; return XX; })(); M.XX = XX; - function f(y) { } + function f(y) { + } M.f = f; var a; - f({ x: a }); // ok + f({ + x: a + }); // ok var b; - f({ x: b }); // ok covariant subtype + f({ + x: b + }); // ok covariant subtype })(M || (M = {})); diff --git a/tests/baselines/reference/crashInResolveInterface.js b/tests/baselines/reference/crashInResolveInterface.js index 85b6217726a..94c60a7cc85 100644 --- a/tests/baselines/reference/crashInResolveInterface.js +++ b/tests/baselines/reference/crashInResolveInterface.js @@ -20,6 +20,8 @@ interface C { //// [file1.js] var q1; -var x = q1.each(function (x) { return c.log(x); }); +var x = q1.each(function (x) { + return c.log(x); +}); //// [file2.js] /// diff --git a/tests/baselines/reference/customEventDetail.js b/tests/baselines/reference/customEventDetail.js index 7207ecf0628..c88c6e677bf 100644 --- a/tests/baselines/reference/customEventDetail.js +++ b/tests/baselines/reference/customEventDetail.js @@ -8,5 +8,8 @@ var y = x.detail.name; //// [customEventDetail.js] var x; // valid since detail is any -x.initCustomEvent('hello', true, true, { id: 12, name: 'hello' }); +x.initCustomEvent('hello', true, true, { + id: 12, + name: 'hello' +}); var y = x.detail.name; diff --git a/tests/baselines/reference/debuggerEmit.js b/tests/baselines/reference/debuggerEmit.js index 8cf5dc69cd0..c2f730271be 100644 --- a/tests/baselines/reference/debuggerEmit.js +++ b/tests/baselines/reference/debuggerEmit.js @@ -3,5 +3,7 @@ var x = function () { debugger; } x(); //// [debuggerEmit.js] -var x = function () { debugger; }; +var x = function () { + debugger; +}; x(); diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index 7814e9641ba..30ba24ed405 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -16,7 +16,8 @@ var Foo = (function () { })(); exports.Foo = Foo; //// [declFileAliasUseBeforeDeclaration_test.js] -function bar(a) { } +function bar(a) { +} exports.bar = bar; diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js index 5d7273098f1..52d11836b11 100644 --- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js +++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js @@ -31,22 +31,28 @@ interface I extends A, B { var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); var D = (function () { function D() { } - D.prototype.baz = function () { }; - D.prototype.bat = function () { }; - D.prototype.foo = function () { }; - D.prototype.bar = function () { }; + D.prototype.baz = function () { + }; + D.prototype.bat = function () { + }; + D.prototype.foo = function () { + }; + D.prototype.bar = function () { + }; return D; })(); diff --git a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js index ee2dc8e83bd..545b70f743a 100644 --- a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js +++ b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js @@ -10,7 +10,8 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index e01626a7ead..3c8120e8db9 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -60,17 +60,29 @@ var C; return B; })(); C.B = B; - function F(x) { return null; } + function F(x) { + return null; + } C.F = F; - function F2(x) { return null; } + function F2(x) { + return null; + } C.F2 = F2; - function F3(x) { return null; } + function F3(x) { + return null; + } C.F3 = F3; - function F4(x) { return null; } + function F4(x) { + return null; + } C.F4 = F4; - function F5() { return null; } + function F5() { + return null; + } C.F5 = F5; - function F6(x) { return null; } + function F6(x) { + return null; + } C.F6 = F6; var D = (function () { function D(val) { @@ -86,7 +98,8 @@ exports.c = C.F2; exports.d = C.F3; exports.e = C.F4; exports.x = (new C.D(new C.A())).val; -function f() { } +function f() { +} exports.f = f; exports.g = C.F5(); var h = (function (_super) { diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index 443933069da..400c53a171a 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -20,8 +20,12 @@ var m1; m1.c = c; })(m1 || (m1 = {})); var d = { - m1: { m: m1 }, - m2: { c: m1.c } + m1: { + m: m1 + }, + m2: { + c: m1.c + } }; diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.js b/tests/baselines/reference/declFileObjectLiteralWithAccessors.js index 85897bc2c9d..7d7c6ee73d3 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.js +++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.js @@ -15,8 +15,12 @@ point./*3*/x = 30; function makePoint(x) { return { b: 10, - get x() { return x; }, - set x(a) { this.b = a; } + get x() { + return x; + }, + set x(a) { + this.b = a; + } }; } ; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js index dd39a30f7a2..b3d41829637 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js @@ -12,7 +12,9 @@ var /*2*/x = point./*3*/x; //// [declFileObjectLiteralWithOnlyGetter.js] function makePoint(x) { return { - get x() { return x; } + get x() { + return x; + } }; } ; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js index e219e885053..dae362caf36 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js @@ -13,7 +13,9 @@ point./*2*/x = 30; function makePoint(x) { return { b: 10, - set x(a) { this.b = a; } + set x(a) { + this.b = a; + } }; } ; diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js index 326ce62171d..5bec38e4dee 100644 --- a/tests/baselines/reference/declFilePrivateStatic.js +++ b/tests/baselines/reference/declFilePrivateStatic.js @@ -18,25 +18,33 @@ class C { var C = (function () { function C() { } - C.a = function () { }; - C.b = function () { }; + C.a = function () { + }; + C.b = function () { + }; Object.defineProperty(C, "c", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "d", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); Object.defineProperty(C, "e", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); Object.defineProperty(C, "f", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/declFileRegressionTests.js b/tests/baselines/reference/declFileRegressionTests.js index a8bf23a8ea8..6178398ef31 100644 --- a/tests/baselines/reference/declFileRegressionTests.js +++ b/tests/baselines/reference/declFileRegressionTests.js @@ -8,7 +8,13 @@ var n = { w: null, x: '', y: () => { }, z: 32 }; //// [declFileRegressionTests.js] // 'null' not converted to 'any' in d.ts // function types not piped through correctly -var n = { w: null, x: '', y: function () { }, z: 32 }; +var n = { + w: null, + x: '', + y: function () { + }, + z: 32 +}; //// [declFileRegressionTests.d.ts] diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js index 563551d67a8..7c6122fc17d 100644 --- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js +++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js @@ -17,11 +17,19 @@ function f1() { args[_i - 0] = arguments[_i]; } } -function f2(x) { } -function f3(x) { } -function f4() { } -function f5() { } -var f6 = function () { return [10]; }; +function f2(x) { +} +function f3(x) { +} +function f4() { +} +function f5() { +} +var f6 = function () { + return [ + 10 + ]; +}; //// [declFileRestParametersOfFunctionAndFunctionType.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js index 0a9d04d6bc7..34c150cb992 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js @@ -79,38 +79,60 @@ var g = (function () { })(); // Just the name function foo() { - return [new c()]; + return [ + new c() + ]; } function foo2() { - return [new c()]; + return [ + new c() + ]; } // Qualified name function foo3() { - return [new m.c()]; + return [ + new m.c() + ]; } function foo4() { return m.c; } // Just the name with type arguments function foo5() { - return [new g()]; + return [ + new g() + ]; } function foo6() { - return [new g()]; + return [ + new g() + ]; } // Qualified name with type arguments function foo7() { - return [new m.g()]; + return [ + new m.g() + ]; } function foo8() { - return [new m.g()]; + return [ + new m.g() + ]; } // Array of function types function foo9() { - return [function () { return new c(); }]; + return [ + function () { + return new c(); + } + ]; } function foo10() { - return [function () { return new c(); }]; + return [ + function () { + return new c(); + } + ]; } diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.js b/tests/baselines/reference/declFileTypeAnnotationParenType.js index c61517c7339..7b8498ac2cc 100644 --- a/tests/baselines/reference/declFileTypeAnnotationParenType.js +++ b/tests/baselines/reference/declFileTypeAnnotationParenType.js @@ -16,10 +16,22 @@ var c = (function () { } return c; })(); -var x = [function () { return new c(); }]; -var y = [function () { return new c(); }]; -var k = (function () { return new c(); }) || ""; -var l = (function () { return new c(); }) || ""; +var x = [ + function () { + return new c(); + } +]; +var y = [ + function () { + return new c(); + } +]; +var k = (function () { + return new c(); +}) || ""; +var l = (function () { + return new c(); +}) || ""; //// [declFileTypeAnnotationParenType.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js index 91d44c2b07f..3c610bb9d04 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js @@ -45,9 +45,18 @@ var g = (function () { return g; })(); // Just the name -var k = [new c(), new m.c()]; +var k = [ + new c(), + new m.c() +]; var l = k; -var x = [new g(), new m.g(), function () { return new c(); }]; +var x = [ + new g(), + new m.g(), + function () { + return new c(); + } +]; var y = x; diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js index 0a8e256ef28..40edf72d361 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js @@ -51,8 +51,12 @@ var g = (function () { // Just the name var k = new c() || new m.c(); var l = new c() || new m.c(); -var x = new g() || new m.g() || (function () { return new c(); }); -var y = new g() || new m.g() || (function () { return new c(); }); +var x = new g() || new m.g() || (function () { + return new c(); +}); +var y = new g() || new m.g() || (function () { + return new c(); +}); //// [declFileTypeAnnotationUnionType.d.ts] diff --git a/tests/baselines/reference/declFileTypeofFunction.js b/tests/baselines/reference/declFileTypeofFunction.js index 656e02b8ddd..2af519f411d 100644 --- a/tests/baselines/reference/declFileTypeofFunction.js +++ b/tests/baselines/reference/declFileTypeofFunction.js @@ -34,8 +34,12 @@ function foo5(x: number) { } //// [declFileTypeofFunction.js] -function f() { return undefined; } -function g() { return undefined; } +function f() { + return undefined; +} +function g() { + return undefined; +} var b; function b1() { return b1; diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index 2210f189d16..ab812720d9a 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -43,11 +43,19 @@ var b = { c: m1.c, m1: m1 }; -var c = { m1: m1 }; +var c = { + m1: m1 +}; var d = { - m: { mod: m1 }, - mc: { cl: m1.c }, - me: { en: m1.e }, + m: { + mod: m1 + }, + mc: { + cl: m1.c + }, + me: { + en: m1.e + }, mh: 2 /* holiday */ }; diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index dcd37454ef0..3ba5ae11bf6 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -38,12 +38,22 @@ var M; var D = (function () { function D() { } - D.prototype.m232 = function () { return null; }; - D.prototype.m242 = function () { return null; }; - D.prototype.m252 = function () { return null; }; // don't generate - D.prototype.m26 = function (i) { }; - D.prototype.m262 = function (i) { }; - D.prototype.m3 = function () { return new C(); }; + D.prototype.m232 = function () { + return null; + }; + D.prototype.m242 = function () { + return null; + }; + D.prototype.m252 = function () { + return null; + }; // don't generate + D.prototype.m26 = function (i) { + }; + D.prototype.m262 = function (i) { + }; + D.prototype.m3 = function () { + return new C(); + }; return D; })(); M.D = D; diff --git a/tests/baselines/reference/declInput.js b/tests/baselines/reference/declInput.js index cd558c93403..538770668c1 100644 --- a/tests/baselines/reference/declInput.js +++ b/tests/baselines/reference/declInput.js @@ -14,8 +14,16 @@ class bar { var bar = (function () { function bar() { } - bar.prototype.f = function () { return ''; }; - bar.prototype.g = function () { return { a: null, b: undefined, c: void 4 }; }; + bar.prototype.f = function () { + return ''; + }; + bar.prototype.g = function () { + return { + a: null, + b: undefined, + c: void 4 + }; + }; bar.prototype.h = function (x, y, z) { if (x === void 0) { x = 4; } if (y === void 0) { y = null; } diff --git a/tests/baselines/reference/declInput3.js b/tests/baselines/reference/declInput3.js index 3be31de3de0..52328b01d6d 100644 --- a/tests/baselines/reference/declInput3.js +++ b/tests/baselines/reference/declInput3.js @@ -14,8 +14,16 @@ class bar { var bar = (function () { function bar() { } - bar.prototype.f = function () { return ''; }; - bar.prototype.g = function () { return { a: null, b: undefined, c: void 4 }; }; + bar.prototype.f = function () { + return ''; + }; + bar.prototype.g = function () { + return { + a: null, + b: undefined, + c: void 4 + }; + }; bar.prototype.h = function (x, y, z) { if (x === void 0) { x = 4; } if (y === void 0) { y = null; } diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js index 07b6f091a14..18025c808fa 100644 --- a/tests/baselines/reference/declInput4.js +++ b/tests/baselines/reference/declInput4.js @@ -32,9 +32,14 @@ var M; var D = (function () { function D() { } - D.prototype.m232 = function () { return null; }; - D.prototype.m242 = function () { return null; }; - D.prototype.m26 = function (i) { }; + D.prototype.m232 = function () { + return null; + }; + D.prototype.m242 = function () { + return null; + }; + D.prototype.m26 = function (i) { + }; return D; })(); M.D = D; diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js index ae517bb7460..161224659f1 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts.js @@ -64,7 +64,8 @@ module.exports = f; var im = require('declarationEmit_nameConflicts_1'); var M; (function (M) { - function f() { } + function f() { + } M.f = f; var C = (function () { function C() { @@ -74,7 +75,8 @@ var M; M.C = C; var N; (function (N) { - function g() { } + function g() { + } N.g = g; ; })(N = M.N || (M.N = {})); @@ -87,7 +89,8 @@ var M; (function (M) { var P; (function (P) { - function f() { } + function f() { + } P.f = f; var C = (function () { function C() { @@ -97,7 +100,8 @@ var M; P.C = C; var N; (function (N) { - function g() { } + function g() { + } N.g = g; ; })(N = P.N || (P.N = {})); @@ -113,7 +117,8 @@ var M; (function (M) { var Q; (function (Q) { - function f() { } + function f() { + } Q.f = f; var C = (function () { function C() { @@ -123,7 +128,8 @@ var M; Q.C = C; var N; (function (N) { - function g() { } + function g() { + } N.g = g; ; })(N = Q.N || (Q.N = {})); diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js index 2a228080c68..43167f531d7 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js @@ -22,7 +22,8 @@ var X; (function (Y) { var base; (function (base) { - function f() { } + function f() { + } base.f = f; var C = (function () { function C() { diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js index 0d68c38cfda..848343362bc 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js @@ -37,17 +37,20 @@ var M; (function (M) { var D; (function (D) { - function f() { } + function f() { + } D.f = f; })(D = M.D || (M.D = {})); var C; (function (C) { - function f() { } + function f() { + } C.f = f; })(C = M.C || (M.C = {})); var E; (function (E) { - function f() { } + function f() { + } E.f = f; })(E = M.E || (M.E = {})); })(M || (M = {})); @@ -58,7 +61,8 @@ var M; var C = (function () { function C() { } - C.f = function () { }; + C.f = function () { + }; return C; })(); P.C = C; diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.js b/tests/baselines/reference/declarationEmit_protectedMembers.js index 61a4ebdfcab..dc8506b220b 100644 --- a/tests/baselines/reference/declarationEmit_protectedMembers.js +++ b/tests/baselines/reference/declarationEmit_protectedMembers.js @@ -65,8 +65,11 @@ var C1 = (function () { return this.x; }; Object.defineProperty(C1.prototype, "accessor", { - get: function () { return 0; }, - set: function (a) { }, + get: function () { + return 0; + }, + set: function (a) { + }, enumerable: true, configurable: true }); @@ -74,12 +77,15 @@ var C1 = (function () { return this.sx; }; Object.defineProperty(C1, "staticSetter", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); Object.defineProperty(C1, "staticGetter", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); @@ -112,7 +118,9 @@ var C3 = (function (_super) { return _super.sf.call(this); }; Object.defineProperty(C3, "staticGetter", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js index 032f4cb0e63..6772a842a49 100644 --- a/tests/baselines/reference/declarationsAndAssignments.js +++ b/tests/baselines/reference/declarationsAndAssignments.js @@ -182,16 +182,35 @@ function f21() { //// [declarationsAndAssignments.js] function f0() { - var _a = [1, "hello"]; - var x = ([1, "hello"])[0]; - var _b = [1, "hello"], x = _b[0], y = _b[1]; - var _c = [1, "hello"], x = _c[0], y = _c[1], z = _c[2]; // Error - var _d = [0, 1, 2], z = _d[2]; + var _a = [ + 1, + "hello" + ]; + var x = ([ + 1, + "hello" + ])[0]; + var _b = [ + 1, + "hello" + ], x = _b[0], y = _b[1]; + var _c = [ + 1, + "hello" + ], x = _c[0], y = _c[1], z = _c[2]; // Error + var _d = [ + 0, + 1, + 2 + ], z = _d[2]; var x; var y; } function f1() { - var a = [1, "hello"]; + var a = [ + 1, + "hello" + ]; var x = a[0]; var x = a[0], y = a[1]; var x = a[0], y = a[1], z = a[2]; @@ -200,71 +219,161 @@ function f1() { var z; } function f2() { - var _a = { x: 5, y: "hello" }; - var x = ({ x: 5, y: "hello" }).x; - var y = ({ x: 5, y: "hello" }).y; - var _b = { x: 5, y: "hello" }, x = _b.x, y = _b.y; + var _a = { + x: 5, + y: "hello" + }; + var x = ({ + x: 5, + y: "hello" + }).x; + var y = ({ + x: 5, + y: "hello" + }).y; + var _b = { + x: 5, + y: "hello" + }, x = _b.x, y = _b.y; var x; var y; - var a = ({ x: 5, y: "hello" }).x; - var b = ({ x: 5, y: "hello" }).y; - var _c = { x: 5, y: "hello" }, a = _c.x, b = _c.y; + var a = ({ + x: 5, + y: "hello" + }).x; + var b = ({ + x: 5, + y: "hello" + }).y; + var _c = { + x: 5, + y: "hello" + }, a = _c.x, b = _c.y; var a; var b; } function f3() { - var _a = [1, ["hello", [true]]], x = _a[0], _b = _a[1], y = _b[0], z = _b[1][0]; + var _a = [ + 1, + [ + "hello", + [ + true + ] + ] + ], x = _a[0], _b = _a[1], y = _b[0], z = _b[1][0]; var x; var y; var z; } function f4() { - var _a = { a: 1, b: { a: "hello", b: { a: true } } }, x = _a.a, _b = _a.b, y = _b.a, z = _b.b.a; + var _a = { + a: 1, + b: { + a: "hello", + b: { + a: true + } + } + }, x = _a.a, _b = _a.b, y = _b.a, z = _b.b.a; var x; var y; var z; } function f6() { - var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? "" : _c; + var _a = [ + 1, + "hello" + ], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? "" : _c; var x; var y; } function f7() { - var _a = [1, "hello"], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? 1 : _c; // Error, initializer for y must be string + var _a = [ + 1, + "hello" + ], _b = _a[0], x = _b === void 0 ? 0 : _b, _c = _a[1], y = _c === void 0 ? 1 : _c; // Error, initializer for y must be string var x; var y; } function f8() { var _a = [], a = _a[0], b = _a[1], c = _a[2]; // Ok, [] is an array - var _b = [1], d = _b[0], e = _b[1], f = _b[2]; // Error, [1] is a tuple + var _b = [ + 1 + ], d = _b[0], e = _b[1], f = _b[2]; // Error, [1] is a tuple } function f9() { var _a = {}, a = _a[0], b = _a[1]; // Error, not array type - var _b = { 0: 10, 1: 20 }, c = _b[0], d = _b[1]; // Error, not array type - var _c = [10, 20], e = _c[0], f = _c[1]; + var _b = { + 0: 10, + 1: 20 + }, c = _b[0], d = _b[1]; // Error, not array type + var _c = [ + 10, + 20 + ], e = _c[0], f = _c[1]; } function f10() { var _a = {}, a = _a.a, b = _a.b; // Error var _b = [], a = _b.a, b = _b.b; // Error } function f11() { - var _a = { x: 10, y: "hello" }, a = _a.x, b = _a.y; - var _b = { 0: 10, 1: "hello" }, a = _b[0], b = _b[1]; - var _c = { "<": 10, ">": "hello" }, a = _c["<"], b = _c[">"]; - var _d = [10, "hello"], a = _d[0], b = _d[1]; + var _a = { + x: 10, + y: "hello" + }, a = _a.x, b = _a.y; + var _b = { + 0: 10, + 1: "hello" + }, a = _b[0], b = _b[1]; + var _c = { + "<": 10, + ">": "hello" + }, a = _c["<"], b = _c[">"]; + var _d = [ + 10, + "hello" + ], a = _d[0], b = _d[1]; var a; var b; } function f12() { - var _a = [1, ["hello", { x: 5, y: true }]], a = _a[0], _b = _a[1], _c = _b === void 0 ? ["abc", { x: 10, y: false }] : _b, b = _c[0], _d = _c[1], x = _d.x, c = _d.y; + var _a = [ + 1, + [ + "hello", + { + x: 5, + y: true + } + ] + ], a = _a[0], _b = _a[1], _c = _b === void 0 ? [ + "abc", + { + x: 10, + y: false + } + ] : _b, b = _c[0], _d = _c[1], x = _d.x, c = _d.y; var a; var b; var x; var c; } function f13() { - var _a = [1, "hello"], x = _a[0], y = _a[1]; - var _b = [[x, y], { x: x, y: y }], a = _b[0], b = _b[1]; + var _a = [ + 1, + "hello" + ], x = _a[0], y = _a[1]; + var _b = [ + [ + x, + y + ], + { + x: x, + y: y + } + ], a = _b[0], b = _b[1]; } function f14(_a) { var _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], _d = _c[0], b = _d === void 0 ? "hello" : _d, _e = _c[1], x = _e.x, _f = _e.y, c = _f === void 0 ? false : _f; @@ -272,19 +381,51 @@ function f14(_a) { var b; var c; } -f14([2, ["abc", { x: 0, y: true }]]); -f14([2, ["abc", { x: 0 }]]); -f14([2, ["abc", { y: false }]]); // Error, no x +f14([ + 2, + [ + "abc", + { + x: 0, + y: true + } + ] +]); +f14([ + 2, + [ + "abc", + { + x: 0 + } + ] +]); +f14([ + 2, + [ + "abc", + { + y: false + } + ] +]); // Error, no x var M; (function (M) { - _a = [1, 2], M.a = _a[0], M.b = _a[1]; + _a = [ + 1, + 2 + ], M.a = _a[0], M.b = _a[1]; var _a; })(M || (M = {})); function f15() { var a = "hello"; var b = 1; var c = true; - return { a: a, b: b, c: c }; + return { + a: a, + b: b, + c: c + }; } function f16() { var _a = f15(), a = _a.a, b = _a.b, c = _a.c; @@ -293,27 +434,66 @@ function f17(_a) { var _b = _a.a, a = _b === void 0 ? "" : _b, _c = _a.b, b = _c === void 0 ? 0 : _c, _d = _a.c, c = _d === void 0 ? false : _d; } f17({}); -f17({ a: "hello" }); -f17({ c: true }); +f17({ + a: "hello" +}); +f17({ + c: true +}); f17(f15()); function f18() { var a; var b; var aa; - (_a = { a: a, b: b }, a = _a.a, b = _a.b, _a); - (_b = { b: b, a: a }, a = _b.a, b = _b.b, _b); - _c = [a, b], aa[0] = _c[0], b = _c[1]; - _d = [b, a], a = _d[0], b = _d[1]; // Error - _e = [2, "def"], _f = _e[0], a = _f === void 0 ? 1 : _f, _g = _e[1], b = _g === void 0 ? "abc" : _g; + (_a = { + a: a, + b: b + }, a = _a.a, b = _a.b, _a); + (_b = { + b: b, + a: a + }, a = _b.a, b = _b.b, _b); + _c = [ + a, + b + ], aa[0] = _c[0], b = _c[1]; + _d = [ + b, + a + ], a = _d[0], b = _d[1]; // Error + _e = [ + 2, + "def" + ], _f = _e[0], a = _f === void 0 ? 1 : _f, _g = _e[1], b = _g === void 0 ? "abc" : _g; var _a, _b, _c, _d, _e, _f, _g; } function f19() { var a, b; - _a = [1, 2], a = _a[0], b = _a[1]; - _b = [b, a], a = _b[0], b = _b[1]; - (_c = { b: b, a: a }, a = _c.a, b = _c.b, _c); - _d = ([[2, 3]])[0], _e = _d === void 0 ? [1, 2] : _d, a = _e[0], b = _e[1]; - var x = (_f = [1, 2], a = _f[0], b = _f[1], _f); + _a = [ + 1, + 2 + ], a = _a[0], b = _a[1]; + _b = [ + b, + a + ], a = _b[0], b = _b[1]; + (_c = { + b: b, + a: a + }, a = _c.a, b = _c.b, _c); + _d = ([ + [ + 2, + 3 + ] + ])[0], _e = _d === void 0 ? [ + 1, + 2 + ] : _d, a = _e[0], b = _e[1]; + var x = (_f = [ + 1, + 2 + ], a = _f[0], b = _f[1], _f); var _a, _b, _c, _d, _e, _f; } function f20() { @@ -321,14 +501,46 @@ function f20() { var x; var y; var z; - var _a = [1, 2, 3], a = _a.slice(0); - var _b = [1, 2, 3], x = _b[0], a = _b.slice(1); - var _c = [1, 2, 3], x = _c[0], y = _c[1], a = _c.slice(2); - var _d = [1, 2, 3], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); - _e = [1, 2, 3], a = _e.slice(0); - _f = [1, 2, 3], x = _f[0], a = _f.slice(1); - _g = [1, 2, 3], x = _g[0], y = _g[1], a = _g.slice(2); - _h = [1, 2, 3], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); + var _a = [ + 1, + 2, + 3 + ], a = _a.slice(0); + var _b = [ + 1, + 2, + 3 + ], x = _b[0], a = _b.slice(1); + var _c = [ + 1, + 2, + 3 + ], x = _c[0], y = _c[1], a = _c.slice(2); + var _d = [ + 1, + 2, + 3 + ], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); + _e = [ + 1, + 2, + 3 + ], a = _e.slice(0); + _f = [ + 1, + 2, + 3 + ], x = _f[0], a = _f.slice(1); + _g = [ + 1, + 2, + 3 + ], x = _g[0], y = _g[1], a = _g.slice(2); + _h = [ + 1, + 2, + 3 + ], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); var _e, _f, _g, _h; } function f21() { @@ -336,13 +548,45 @@ function f21() { var x; var y; var z; - var _a = [1, "hello", true], a = _a.slice(0); - var _b = [1, "hello", true], x = _b[0], a = _b.slice(1); - var _c = [1, "hello", true], x = _c[0], y = _c[1], a = _c.slice(2); - var _d = [1, "hello", true], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); - _e = [1, "hello", true], a = _e.slice(0); - _f = [1, "hello", true], x = _f[0], a = _f.slice(1); - _g = [1, "hello", true], x = _g[0], y = _g[1], a = _g.slice(2); - _h = [1, "hello", true], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); + var _a = [ + 1, + "hello", + true + ], a = _a.slice(0); + var _b = [ + 1, + "hello", + true + ], x = _b[0], a = _b.slice(1); + var _c = [ + 1, + "hello", + true + ], x = _c[0], y = _c[1], a = _c.slice(2); + var _d = [ + 1, + "hello", + true + ], x = _d[0], y = _d[1], z = _d[2], a = _d.slice(3); + _e = [ + 1, + "hello", + true + ], a = _e.slice(0); + _f = [ + 1, + "hello", + true + ], x = _f[0], a = _f.slice(1); + _g = [ + 1, + "hello", + true + ], x = _g[0], y = _g[1], a = _g.slice(2); + _h = [ + 1, + "hello", + true + ], x = _h[0], y = _h[1], z = _h[2], a = _h.slice(3); var _e, _f, _g, _h; } diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js index 34ea154daa6..12632572918 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js @@ -52,8 +52,14 @@ M.n--; // -- operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; -var obj = { x: 1, y: null }; +var ANY2 = [ + "", + "" +]; +var obj = { + x: 1, + y: null +}; var A = (function () { function A() { } diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js index 8e4f927a920..e5a73aea37d 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -75,9 +75,16 @@ ANY2--; //// [decrementOperatorWithAnyOtherTypeInvalidOperations.js] // -- operator on any type var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.js b/tests/baselines/reference/decrementOperatorWithNumberType.js index 85ed9ca548a..faef864184b 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.js +++ b/tests/baselines/reference/decrementOperatorWithNumberType.js @@ -42,7 +42,10 @@ objA.a--, M.n--; //// [decrementOperatorWithNumberType.js] // -- operator on number type var NUMBER; -var NUMBER1 = [1, 2]; +var NUMBER1 = [ + 1, + 2 +]; var A = (function () { function A() { } diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js index 34e862063ce..ccc5b6eaa1c 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js @@ -49,12 +49,19 @@ foo()--; //// [decrementOperatorWithNumberTypeInvalidOperations.js] // -- operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -67,11 +74,27 @@ var ResultIsNumber1 = --NUMBER1; var ResultIsNumber2 = NUMBER1--; // number type literal var ResultIsNumber3 = --1; -var ResultIsNumber4 = --{ x: 1, y: 2 }; -var ResultIsNumber5 = --{ x: 1, y: function (n) { return n; } }; +var ResultIsNumber4 = --{ + x: 1, + y: 2 +}; +var ResultIsNumber5 = --{ + x: 1, + y: function (n) { + return n; + } +}; var ResultIsNumber6 = 1--; -var ResultIsNumber7 = { x: 1, y: 2 }--; -var ResultIsNumber8 = { x: 1, y: function (n) { return n; } }--; +var ResultIsNumber7 = { + x: 1, + y: 2 +}--; +var ResultIsNumber8 = { + x: 1, + y: function (n) { + return n; + } +}--; // number type expressions var ResultIsNumber9 = --foo(); var ResultIsNumber10 = --A.foo(); diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js index 2be74a64d8f..93737ea87cd 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js @@ -57,11 +57,15 @@ objA.a--, M.n--; //// [decrementOperatorWithUnsupportedBooleanType.js] // -- operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return true; }; + A.foo = function () { + return true; + }; return A; })(); var M; @@ -74,11 +78,27 @@ var ResultIsNumber1 = --BOOLEAN; var ResultIsNumber2 = BOOLEAN--; // boolean type literal var ResultIsNumber3 = --true; -var ResultIsNumber4 = --{ x: true, y: false }; -var ResultIsNumber5 = --{ x: true, y: function (n) { return n; } }; +var ResultIsNumber4 = --{ + x: true, + y: false +}; +var ResultIsNumber5 = --{ + x: true, + y: function (n) { + return n; + } +}; var ResultIsNumber6 = true--; -var ResultIsNumber7 = { x: true, y: false }--; -var ResultIsNumber8 = { x: true, y: function (n) { return n; } }--; +var ResultIsNumber7 = { + x: true, + y: false +}--; +var ResultIsNumber8 = { + x: true, + y: function (n) { + return n; + } +}--; // boolean type expressions var ResultIsNumber9 = --objA.a; var ResultIsNumber10 = --M.n; diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js index 430f9af963f..e033acf3e1e 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js @@ -68,12 +68,19 @@ objA.a--, M.n--; //// [decrementOperatorWithUnsupportedStringType.js] // -- operator on string type var STRING; -var STRING1 = ["", ""]; -function foo() { return ""; } +var STRING1 = [ + "", + "" +]; +function foo() { + return ""; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -88,11 +95,27 @@ var ResultIsNumber3 = STRING--; var ResultIsNumber4 = STRING1--; // string type literal var ResultIsNumber5 = --""; -var ResultIsNumber6 = --{ x: "", y: "" }; -var ResultIsNumber7 = --{ x: "", y: function (s) { return s; } }; +var ResultIsNumber6 = --{ + x: "", + y: "" +}; +var ResultIsNumber7 = --{ + x: "", + y: function (s) { + return s; + } +}; var ResultIsNumber8 = ""--; -var ResultIsNumber9 = { x: "", y: "" }--; -var ResultIsNumber10 = { x: "", y: function (s) { return s; } }--; +var ResultIsNumber9 = { + x: "", + y: "" +}--; +var ResultIsNumber10 = { + x: "", + y: function (s) { + return s; + } +}--; // string type expressions var ResultIsNumber11 = --objA.a; var ResultIsNumber12 = --M.n; diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.js b/tests/baselines/reference/defaultArgsInFunctionExpressions.js index 3f77c4430e8..a58905dd816 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.js +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.js @@ -50,7 +50,9 @@ s = f2(); n = f2(); // Contextually type the default arg with the type annotation var f3 = function (a) { - if (a === void 0) { a = function (s) { return s; }; } + if (a === void 0) { a = function (s) { + return s; + }; } }; // Type check using the function's contextual type var f4 = function (a) { @@ -58,7 +60,9 @@ var f4 = function (a) { }; // Contextually type the default arg using the function's contextual type var f5 = function (a) { - if (a === void 0) { a = function (s) { return s; }; } + if (a === void 0) { a = function (s) { + return s; + }; } }; var U; (function (U) { diff --git a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.js b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.js index ad6181ba7c5..98e135cc712 100644 --- a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.js +++ b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.js @@ -20,9 +20,13 @@ var obj1; obj1.length; var obj2; obj2.length; -function concat(x, y) { return null; } +function concat(x, y) { + return null; +} var result = concat(1, ""); // error var elementCount = result.length; -function concat2(x, y) { return null; } +function concat2(x, y) { + return null; +} var result2 = concat2(1, ""); // result2 will be number|string var elementCount2 = result.length; diff --git a/tests/baselines/reference/defaultIndexProps1.js b/tests/baselines/reference/defaultIndexProps1.js index fc8fe52b9fc..63d8c70c9d0 100644 --- a/tests/baselines/reference/defaultIndexProps1.js +++ b/tests/baselines/reference/defaultIndexProps1.js @@ -21,5 +21,7 @@ var Foo = (function () { })(); var f = new Foo(); var q = f["v"]; -var o = { v: "Yo2" }; +var o = { + v: "Yo2" +}; var q2 = o["v"]; diff --git a/tests/baselines/reference/defaultIndexProps2.js b/tests/baselines/reference/defaultIndexProps2.js index 7652e591cc9..6a175f0f560 100644 --- a/tests/baselines/reference/defaultIndexProps2.js +++ b/tests/baselines/reference/defaultIndexProps2.js @@ -24,7 +24,9 @@ var Foo = (function () { })(); var f = new Foo(); // WScript.Echo(f[0]); -var o = { v: "Yo2" }; +var o = { + v: "Yo2" +}; // WScript.Echo(o[0]); 1[0]; var q = "s"[0]; diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js index e2a2be4d9aa..b4f9870c7e3 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js @@ -65,9 +65,16 @@ delete M.n; // delete operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js index b0a60a23744..2c913251c79 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.js +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js @@ -41,11 +41,15 @@ delete M.n; //// [deleteOperatorWithBooleanType.js] // delete operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -57,7 +61,10 @@ var objA = new A(); var ResultIsBoolean1 = delete BOOLEAN; // boolean type literal var ResultIsBoolean2 = delete true; -var ResultIsBoolean3 = delete { x: true, y: false }; +var ResultIsBoolean3 = delete { + x: true, + y: false +}; // boolean type expressions var ResultIsBoolean4 = delete objA.a; var ResultIsBoolean5 = delete M.n; diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js index bb70c55024d..50513247f64 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.js +++ b/tests/baselines/reference/deleteOperatorWithNumberType.js @@ -48,12 +48,19 @@ delete objA.a, M.n; //// [deleteOperatorWithNumberType.js] // delete operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -66,8 +73,16 @@ var ResultIsBoolean1 = delete NUMBER; var ResultIsBoolean2 = delete NUMBER1; // number type literal var ResultIsBoolean3 = delete 1; -var ResultIsBoolean4 = delete { x: 1, y: 2 }; -var ResultIsBoolean5 = delete { x: 1, y: function (n) { return n; } }; +var ResultIsBoolean4 = delete { + x: 1, + y: 2 +}; +var ResultIsBoolean5 = delete { + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsBoolean6 = delete objA.a; var ResultIsBoolean7 = delete M.n; diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js index 79246e27725..ddf4b827779 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.js +++ b/tests/baselines/reference/deleteOperatorWithStringType.js @@ -47,12 +47,19 @@ delete objA.a,M.n; //// [deleteOperatorWithStringType.js] // delete operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -65,8 +72,16 @@ var ResultIsBoolean1 = delete STRING; var ResultIsBoolean2 = delete STRING1; // string type literal var ResultIsBoolean3 = delete ""; -var ResultIsBoolean4 = delete { x: "", y: "" }; -var ResultIsBoolean5 = delete { x: "", y: function (s) { return s; } }; +var ResultIsBoolean4 = delete { + x: "", + y: "" +}; +var ResultIsBoolean5 = delete { + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsBoolean6 = delete objA.a; var ResultIsBoolean7 = delete M.n; diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js index 32e8cf4199e..e4ff8dd9775 100644 --- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js +++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js @@ -59,14 +59,18 @@ var Base2 = (function () { var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { - var r2 = function () { return _super.call(this); }; // error for misplaced super call (nested function) + var r2 = function () { + return _super.call(this); + }; // error for misplaced super call (nested function) } return Derived2; })(Base2); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { - var r = function () { _super.call(this); }; // error + var r = function () { + _super.call(this); + }; // error } return Derived3; })(Base2); diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js index f2e816604d2..db54affa6d9 100644 --- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js +++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js @@ -50,17 +50,25 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base(x) { } - Base.prototype.b = function () { }; + Base.prototype.b = function () { + }; Object.defineProperty(Base.prototype, "c", { - get: function () { return ''; }, - set: function (v) { }, + get: function () { + return ''; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Base.s = function () { }; + Base.s = function () { + }; Object.defineProperty(Base, "t", { - get: function () { return ''; }, - set: function (v) { }, + get: function () { + return ''; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js index b66d356a73e..8c8b6a13c7e 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js @@ -48,17 +48,25 @@ var y; var Base = (function () { function Base(a) { } - Base.prototype.b = function (a) { }; + Base.prototype.b = function (a) { + }; Object.defineProperty(Base.prototype, "c", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Base.s = function (a) { }; + Base.s = function (a) { + }; Object.defineProperty(Base, "t", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -69,17 +77,25 @@ var Derived = (function (_super) { function Derived(a) { _super.call(this, x); } - Derived.prototype.b = function (a) { }; + Derived.prototype.b = function (a) { + }; Object.defineProperty(Derived.prototype, "c", { - get: function () { return y; }, - set: function (v) { }, + get: function () { + return y; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Derived.s = function (a) { }; + Derived.s = function (a) { + }; Object.defineProperty(Derived, "t", { - get: function () { return y; }, - set: function (a) { }, + get: function () { + return y; + }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js index 80f7456ab9a..55bfd0e924d 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js @@ -75,17 +75,25 @@ var y; var Base = (function () { function Base(a) { } - Base.prototype.b = function (a) { }; + Base.prototype.b = function (a) { + }; Object.defineProperty(Base.prototype, "c", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Base.s = function (a) { }; + Base.s = function (a) { + }; Object.defineProperty(Base, "t", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -97,17 +105,25 @@ var Derived = (function (_super) { function Derived(a) { _super.call(this, a); } - Derived.prototype.b = function (a) { }; + Derived.prototype.b = function (a) { + }; Object.defineProperty(Derived.prototype, "c", { - get: function () { return y; }, - set: function (v) { }, + get: function () { + return y; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Derived.s = function (a) { }; + Derived.s = function (a) { + }; Object.defineProperty(Derived, "t", { - get: function () { return y; }, - set: function (a) { }, + get: function () { + return y; + }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js index cfb6116ee85..0a228a04f71 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js @@ -83,17 +83,25 @@ var y; var Base = (function () { function Base(a) { } - Base.prototype.b = function (a) { }; + Base.prototype.b = function (a) { + }; Object.defineProperty(Base.prototype, "c", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Base.s = function (a) { }; + Base.s = function (a) { + }; Object.defineProperty(Base, "t", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -113,7 +121,8 @@ var Derived2 = (function (_super) { function Derived2(a) { _super.call(this, a); } - Derived2.prototype.b = function (a) { }; + Derived2.prototype.b = function (a) { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -122,7 +131,9 @@ var Derived3 = (function (_super) { _super.call(this, a); } Object.defineProperty(Derived3.prototype, "c", { - get: function () { return x; }, + get: function () { + return x; + }, enumerable: true, configurable: true }); @@ -134,7 +145,8 @@ var Derived4 = (function (_super) { _super.call(this, a); } Object.defineProperty(Derived4.prototype, "c", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -159,7 +171,8 @@ var Derived7 = (function (_super) { function Derived7(a) { _super.call(this, a); } - Derived7.s = function (a) { }; + Derived7.s = function (a) { + }; return Derived7; })(Base); var Derived8 = (function (_super) { @@ -168,7 +181,9 @@ var Derived8 = (function (_super) { _super.call(this, a); } Object.defineProperty(Derived8, "t", { - get: function () { return x; }, + get: function () { + return x; + }, enumerable: true, configurable: true }); @@ -180,7 +195,8 @@ var Derived9 = (function (_super) { _super.call(this, a); } Object.defineProperty(Derived9, "t", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.js b/tests/baselines/reference/derivedClassOverridesPublicMembers.js index 9d7df0eee40..f673d9ab856 100644 --- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js +++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js @@ -74,17 +74,25 @@ var y; var Base = (function () { function Base(a) { } - Base.prototype.b = function (a) { }; + Base.prototype.b = function (a) { + }; Object.defineProperty(Base.prototype, "c", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Base.s = function (a) { }; + Base.s = function (a) { + }; Object.defineProperty(Base, "t", { - get: function () { return x; }, - set: function (v) { }, + get: function () { + return x; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -95,17 +103,25 @@ var Derived = (function (_super) { function Derived(a) { _super.call(this, x); } - Derived.prototype.b = function (a) { }; + Derived.prototype.b = function (a) { + }; Object.defineProperty(Derived.prototype, "c", { - get: function () { return y; }, - set: function (v) { }, + get: function () { + return y; + }, + set: function (v) { + }, enumerable: true, configurable: true }); - Derived.s = function (a) { }; + Derived.s = function (a) { + }; Object.defineProperty(Derived, "t", { - get: function () { return y; }, - set: function (a) { }, + get: function () { + return y; + }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js index 1902b6f4068..fb979ba6032 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js @@ -59,7 +59,9 @@ var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3(a) { var _this = this; - _super.call(this, function () { return _this; }); // error + _super.call(this, function () { + return _this; + }); // error this.a = a; } return Derived3; @@ -67,7 +69,9 @@ var Derived3 = (function (_super) { var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4(a) { - _super.call(this, function () { return this; }); // ok + _super.call(this, function () { + return this; + }); // ok this.a = a; } return Derived4; diff --git a/tests/baselines/reference/derivedClassTransitivity.js b/tests/baselines/reference/derivedClassTransitivity.js index 2088fc1122b..53749861549 100644 --- a/tests/baselines/reference/derivedClassTransitivity.js +++ b/tests/baselines/reference/derivedClassTransitivity.js @@ -31,7 +31,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var D = (function (_super) { @@ -39,7 +40,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.foo = function () { }; // ok to drop parameters + D.prototype.foo = function () { + }; // ok to drop parameters return D; })(C); var E = (function (_super) { @@ -47,7 +49,8 @@ var E = (function (_super) { function E() { _super.apply(this, arguments); } - E.prototype.foo = function (x) { }; // ok to add optional parameters + E.prototype.foo = function (x) { + }; // ok to add optional parameters return E; })(D); var c; diff --git a/tests/baselines/reference/derivedClassTransitivity2.js b/tests/baselines/reference/derivedClassTransitivity2.js index 458aede164c..1b4bd58923c 100644 --- a/tests/baselines/reference/derivedClassTransitivity2.js +++ b/tests/baselines/reference/derivedClassTransitivity2.js @@ -31,7 +31,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; return C; })(); var D = (function (_super) { @@ -39,7 +40,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.foo = function (x) { }; // ok to drop parameters + D.prototype.foo = function (x) { + }; // ok to drop parameters return D; })(C); var E = (function (_super) { @@ -47,7 +49,8 @@ var E = (function (_super) { function E() { _super.apply(this, arguments); } - E.prototype.foo = function (x, y) { }; // ok to add optional parameters + E.prototype.foo = function (x, y) { + }; // ok to add optional parameters return E; })(D); var c; diff --git a/tests/baselines/reference/derivedClassTransitivity3.js b/tests/baselines/reference/derivedClassTransitivity3.js index 9768a8f5fa3..3e548f5276e 100644 --- a/tests/baselines/reference/derivedClassTransitivity3.js +++ b/tests/baselines/reference/derivedClassTransitivity3.js @@ -31,7 +31,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; return C; })(); var D = (function (_super) { @@ -39,7 +40,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.foo = function (x) { }; // ok to drop parameters + D.prototype.foo = function (x) { + }; // ok to drop parameters return D; })(C); var E = (function (_super) { @@ -47,7 +49,8 @@ var E = (function (_super) { function E() { _super.apply(this, arguments); } - E.prototype.foo = function (x, y) { }; // ok to add optional parameters + E.prototype.foo = function (x, y) { + }; // ok to add optional parameters return E; })(D); var c; diff --git a/tests/baselines/reference/derivedClassTransitivity4.js b/tests/baselines/reference/derivedClassTransitivity4.js index abf1a3b5bd0..5249c6aad2e 100644 --- a/tests/baselines/reference/derivedClassTransitivity4.js +++ b/tests/baselines/reference/derivedClassTransitivity4.js @@ -31,7 +31,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var D = (function (_super) { @@ -39,7 +40,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.foo = function () { }; // ok to drop parameters + D.prototype.foo = function () { + }; // ok to drop parameters return D; })(C); var E = (function (_super) { @@ -47,7 +49,8 @@ var E = (function (_super) { function E() { _super.apply(this, arguments); } - E.prototype.foo = function (x) { }; // ok to add optional parameters + E.prototype.foo = function (x) { + }; // ok to add optional parameters return E; })(D); var c; diff --git a/tests/baselines/reference/derivedClassWithAny.js b/tests/baselines/reference/derivedClassWithAny.js index 8070e689bd0..0b568eaec9b 100644 --- a/tests/baselines/reference/derivedClassWithAny.js +++ b/tests/baselines/reference/derivedClassWithAny.js @@ -70,7 +70,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "X", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); @@ -123,7 +125,9 @@ var E = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(E.prototype, "X", { - get: function () { return ''; }, + get: function () { + return ''; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js index 8b00c632058..f802a225088 100644 --- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js +++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js @@ -36,8 +36,11 @@ var Base = (function () { return ''; }; Object.defineProperty(Base.prototype, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -53,8 +56,11 @@ var Derived = (function (_super) { return ''; }; Object.defineProperty(Derived.prototype, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js index 4ac57d159e6..fb0dee3e57b 100644 --- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js +++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js @@ -46,8 +46,11 @@ var Base = (function () { return ''; }; Object.defineProperty(Base.prototype, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -63,8 +66,11 @@ var Derived = (function (_super) { return ''; }; Object.defineProperty(Derived.prototype, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js index 1037d3faaae..558e2309757 100644 --- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js +++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js @@ -35,8 +35,11 @@ var Base = (function () { return ''; }; Object.defineProperty(Base, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -52,8 +55,11 @@ var Derived = (function (_super) { return ''; }; Object.defineProperty(Derived, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js index c5bfea288bd..b2468f62d81 100644 --- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js +++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js @@ -47,8 +47,11 @@ var Base = (function () { return ''; }; Object.defineProperty(Base, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -65,8 +68,11 @@ var Derived = (function (_super) { return ''; }; Object.defineProperty(Derived, "a", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/derivedClasses.js b/tests/baselines/reference/derivedClasses.js index e256313d27b..a0d6de6a819 100644 --- a/tests/baselines/reference/derivedClasses.js +++ b/tests/baselines/reference/derivedClasses.js @@ -44,7 +44,9 @@ var Red = (function (_super) { } Red.prototype.shade = function () { var _this = this; - var getHue = function () { return _this.hue(); }; + var getHue = function () { + return _this.hue(); + }; return getHue() + " red"; }; return Red; @@ -52,8 +54,12 @@ var Red = (function (_super) { var Color = (function () { function Color() { } - Color.prototype.shade = function () { return "some shade"; }; - Color.prototype.hue = function () { return "some hue"; }; + Color.prototype.shade = function () { + return "some shade"; + }; + Color.prototype.hue = function () { + return "some hue"; + }; return Color; })(); var Blue = (function (_super) { @@ -63,7 +69,9 @@ var Blue = (function (_super) { } Blue.prototype.shade = function () { var _this = this; - var getHue = function () { return _this.hue(); }; + var getHue = function () { + return _this.hue(); + }; return getHue() + " blue"; }; return Blue; diff --git a/tests/baselines/reference/derivedGenericClassWithAny.js b/tests/baselines/reference/derivedGenericClassWithAny.js index 4d1f0452be4..677fadf3876 100644 --- a/tests/baselines/reference/derivedGenericClassWithAny.js +++ b/tests/baselines/reference/derivedGenericClassWithAny.js @@ -53,7 +53,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "X", { - get: function () { return null; }, + get: function () { + return null; + }, enumerable: true, configurable: true }); @@ -96,7 +98,9 @@ var E = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(E.prototype, "X", { - get: function () { return ''; } // error + get: function () { + return ''; + } // error , enumerable: true, configurable: true diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js index 39e87b620d6..1ca6ce59450 100644 --- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js +++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js @@ -41,9 +41,17 @@ var Derived = (function (_super) { return null; }; Derived.prototype.bar = function () { - var r = _super.prototype.foo.call(this, { a: 1 }); // { a: number } - var r2 = _super.prototype.foo.call(this, { a: 1, b: 2 }); // { a: number } - var r3 = this.foo({ a: 1, b: 2 }); // { a: number; b: number; } + var r = _super.prototype.foo.call(this, { + a: 1 + }); // { a: number } + var r2 = _super.prototype.foo.call(this, { + a: 1, + b: 2 + }); // { a: number } + var r3 = this.foo({ + a: 1, + b: 2 + }); // { a: number; b: number; } }; return Derived; })(Base); diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js index 50c8aba1ef8..c70e3ff2aee 100644 --- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js +++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js @@ -49,4 +49,7 @@ var d1; var d2; b = d1; b = d2; -var r = [d1, d2]; +var r = [ + d1, + d2 +]; diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js index cc16cc78de5..6d39d41cc1b 100644 --- a/tests/baselines/reference/destructuringParameterProperties1.js +++ b/tests/baselines/reference/destructuringParameterProperties1.js @@ -52,10 +52,34 @@ var C3 = (function () { return C3; })(); var c1 = new C1([]); -c1 = new C1(["larry", "{curly}", "moe"]); +c1 = new C1([ + "larry", + "{curly}", + "moe" +]); var useC1Properties = c1.x === c1.y && c1.y === c1.z; -var c2 = new C2(["10", 10, !!10]); -var _a = [c2.x, c2.y, c2.z], c2_x = _a[0], c2_y = _a[1], c2_z = _a[2]; -var c3 = new C3({ x: 0, y: "", z: false }); -c3 = new C3({ x: 0, "y": "y", z: true }); -var _b = [c3.x, c3.y, c3.z], c3_x = _b[0], c3_y = _b[1], c3_z = _b[2]; +var c2 = new C2([ + "10", + 10, + !!10 +]); +var _a = [ + c2.x, + c2.y, + c2.z +], c2_x = _a[0], c2_y = _a[1], c2_z = _a[2]; +var c3 = new C3({ + x: 0, + y: "", + z: false +}); +c3 = new C3({ + x: 0, + "y": "y", + z: true +}); +var _b = [ + c3.x, + c3.y, + c3.z +], c3_x = _b[0], c3_y = _b[1], c3_z = _b[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js index 27e190af62f..7d7a89380a7 100644 --- a/tests/baselines/reference/destructuringParameterProperties2.js +++ b/tests/baselines/reference/destructuringParameterProperties2.js @@ -50,9 +50,33 @@ var C1 = (function () { }; 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]); -var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; -var z = new C1(10, [undefined, "", null]); -var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; +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 +]); +var _b = [ + y.getA(), + y.getB(), + y.getC() +], y_a = _b[0], y_b = _b[1], y_c = _b[2]; +var z = new C1(10, [ + undefined, + "", + null +]); +var _c = [ + z.getA(), + z.getB(), + z.getC() +], z_a = _c[0], z_b = _c[1], z_c = _c[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js index fe9e69d7e5b..f9b89046ae1 100644 --- a/tests/baselines/reference/destructuringParameterProperties3.js +++ b/tests/baselines/reference/destructuringParameterProperties3.js @@ -53,11 +53,43 @@ var C1 = (function () { }; 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]); -var _b = [y.getA(), y.getB(), y.getC()], y_a = _b[0], y_b = _b[1], y_c = _b[2]; -var z = new C1(10, [undefined, "", ""]); -var _c = [z.getA(), z.getB(), z.getC()], z_a = _c[0], z_b = _c[1], z_c = _c[2]; -var w = new C1(10, [undefined, undefined, undefined]); -var _d = [z.getA(), z.getB(), z.getC()], z_a = _d[0], z_b = _d[1], z_c = _d[2]; +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 +]); +var _b = [ + y.getA(), + y.getB(), + y.getC() +], y_a = _b[0], y_b = _b[1], y_c = _b[2]; +var z = new C1(10, [ + undefined, + "", + "" +]); +var _c = [ + z.getA(), + z.getB(), + z.getC() +], z_a = _c[0], z_b = _c[1], z_c = _c[2]; +var w = new C1(10, [ + undefined, + undefined, + undefined +]); +var _d = [ + z.getA(), + z.getB(), + z.getC() +], z_a = _d[0], z_b = _d[1], z_c = _d[2]; diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js index d9b1710ae89..7575ebb3af7 100644 --- a/tests/baselines/reference/destructuringParameterProperties5.js +++ b/tests/baselines/reference/destructuringParameterProperties5.js @@ -22,5 +22,19 @@ var C1 = (function () { } 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]; +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/detachedCommentAtStartOfConstructor1.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js index 13312aea362..c0fe33d086e 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js +++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js @@ -16,7 +16,9 @@ var TestFile = (function () { var _this = this; /// Test summary /// - var getMessage = function () { return message + _this.name; }; + var getMessage = function () { + return message + _this.name; + }; this.message = getMessage(); } return TestFile; diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js index 754b432c7c5..97d8e2f3a3d 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js +++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js @@ -17,7 +17,9 @@ var TestFile = (function () { /// Test summary /// var _this = this; - var getMessage = function () { return message + _this.name; }; + var getMessage = function () { + return message + _this.name; + }; this.message = getMessage(); } return TestFile; diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js index 3bbea65541f..a37fdefe816 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js +++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js @@ -17,7 +17,9 @@ var TestFile = (function () { /// Test summary /// /// - return function () { return message + _this.name; }; + return function () { + return message + _this.name; + }; }; return TestFile; })(); diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js index 2a0ac0a4f0a..e96bfa93471 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js +++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js @@ -18,7 +18,9 @@ var TestFile = (function () { /// /// var _this = this; - return function () { return message + _this.name; }; + return function () { + return message + _this.name; + }; }; return TestFile; })(); diff --git a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.js b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.js index b259f321f14..b424436b99a 100644 --- a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.js +++ b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.js @@ -12,4 +12,11 @@ var test: IIntervalTreeNode[] = [{ interval: { begin: 0 }, children: null }]; // //// [doNotWidenAtObjectLiteralPropertyAssignment.js] -var test = [{ interval: { begin: 0 }, children: null }]; // was error here because best common type is {} +var test = [ + { + interval: { + begin: 0 + }, + children: null + } +]; // was error here because best common type is {} diff --git a/tests/baselines/reference/doWhileBreakStatements.js b/tests/baselines/reference/doWhileBreakStatements.js index a2bc0d3c549..9162c629898 100644 --- a/tests/baselines/reference/doWhileBreakStatements.js +++ b/tests/baselines/reference/doWhileBreakStatements.js @@ -66,6 +66,7 @@ SEVEN: do while (true); while (true); EIGHT: do { - var fn = function () { }; + var fn = function () { + }; break EIGHT; } while (true); diff --git a/tests/baselines/reference/doWhileContinueStatements.js b/tests/baselines/reference/doWhileContinueStatements.js index 7f73157fd99..a39495e162e 100644 --- a/tests/baselines/reference/doWhileContinueStatements.js +++ b/tests/baselines/reference/doWhileContinueStatements.js @@ -66,6 +66,7 @@ SEVEN: do while (true); while (true); EIGHT: do { - var fn = function () { }; + var fn = function () { + }; continue EIGHT; } while (true); diff --git a/tests/baselines/reference/doWhileLoop.js b/tests/baselines/reference/doWhileLoop.js index 6581bba09e1..0c1abd7aed9 100644 --- a/tests/baselines/reference/doWhileLoop.js +++ b/tests/baselines/reference/doWhileLoop.js @@ -3,5 +3,6 @@ do { } while (false); var n; //// [doWhileLoop.js] -do { } while (false); +do { +} while (false); var n; diff --git a/tests/baselines/reference/dottedSymbolResolution1.js b/tests/baselines/reference/dottedSymbolResolution1.js index a0ac7a38b88..d5bdb6006d5 100644 --- a/tests/baselines/reference/dottedSymbolResolution1.js +++ b/tests/baselines/reference/dottedSymbolResolution1.js @@ -29,7 +29,8 @@ function _setBarAndText(): void { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); function each(collection, callback) { diff --git a/tests/baselines/reference/downlevelLetConst12.js b/tests/baselines/reference/downlevelLetConst12.js index 6437d17accb..9dc69826256 100644 --- a/tests/baselines/reference/downlevelLetConst12.js +++ b/tests/baselines/reference/downlevelLetConst12.js @@ -17,6 +17,10 @@ const {a: baz4} = { a: 1 }; var foo; var bar = 1; var baz = ([])[0]; -var baz2 = ({ a: 1 }).a; +var baz2 = ({ + a: 1 +}).a; var baz3 = ([])[0]; -var baz4 = ({ a: 1 }).a; +var baz4 = ({ + a: 1 +}).a; diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index 8324d697e95..95e89d5245c 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -24,16 +24,32 @@ export module M { // exported let\const bindings should not be renamed exports.foo = 10; exports.bar = "123"; -exports.bar1 = ([1])[0]; -exports.bar2 = ([2])[0]; -exports.bar3 = ({ a: 1 }).a; -exports.bar4 = ({ a: 1 }).a; +exports.bar1 = ([ + 1 +])[0]; +exports.bar2 = ([ + 2 +])[0]; +exports.bar3 = ({ + a: 1 +}).a; +exports.bar4 = ({ + a: 1 +}).a; var M; (function (M) { M.baz = 100; M.baz2 = true; - M.bar5 = ([1])[0]; - M.bar6 = ([2])[0]; - M.bar7 = ({ a: 1 }).a; - M.bar8 = ({ a: 1 }).a; + M.bar5 = ([ + 1 + ])[0]; + M.bar6 = ([ + 2 + ])[0]; + M.bar7 = ({ + a: 1 + }).a; + M.bar8 = ({ + a: 1 + }).a; })(M = exports.M || (exports.M = {})); diff --git a/tests/baselines/reference/downlevelLetConst14.js b/tests/baselines/reference/downlevelLetConst14.js index 212262dc43a..ffe667eda3f 100644 --- a/tests/baselines/reference/downlevelLetConst14.js +++ b/tests/baselines/reference/downlevelLetConst14.js @@ -61,13 +61,21 @@ var z0, z1, z2, z3; { var _x = 20; use(_x); - var _z0 = ([1])[0]; + var _z0 = ([ + 1 + ])[0]; use(_z0); - var _z1 = ([1])[0]; + var _z1 = ([ + 1 + ])[0]; use(_z1); - var _z2 = ({ a: 1 }).a; + var _z2 = ({ + a: 1 + }).a; use(_z2); - var _z3 = ({ a: 1 }).a; + var _z3 = ({ + a: 1 + }).a; use(_z3); } use(x); @@ -79,10 +87,14 @@ var z6; var y = true; { var _y = ""; - var _z6 = ([true])[0]; + var _z6 = ([ + true + ])[0]; { var _y_1 = 1; - var _z6_1 = ({ a: 1 }).a; + var _z6_1 = ({ + a: 1 + }).a; use(_y_1); use(_z6_1); } @@ -95,10 +107,14 @@ var z = false; var z5 = 1; { var _z = ""; - var _z5 = ([5])[0]; + var _z5 = ([ + 5 + ])[0]; { var _z_1 = 1; - var _z5_1 = ({ a: 1 }).a; + var _z5_1 = ({ + a: 1 + }).a; // try to step on generated name use(_z_1); } diff --git a/tests/baselines/reference/downlevelLetConst15.js b/tests/baselines/reference/downlevelLetConst15.js index c9b67719197..94fcb1b03a0 100644 --- a/tests/baselines/reference/downlevelLetConst15.js +++ b/tests/baselines/reference/downlevelLetConst15.js @@ -61,13 +61,25 @@ var z0, z1, z2, z3; { var _x = 20; use(_x); - var _z0 = ([1])[0]; + var _z0 = ([ + 1 + ])[0]; use(_z0); - var _z1 = ([{ a: 1 }])[0].a; + var _z1 = ([ + { + a: 1 + } + ])[0].a; use(_z1); - var _z2 = ({ a: 1 }).a; + var _z2 = ({ + a: 1 + }).a; use(_z2); - var _z3 = ({ a: { b: 1 } }).a.b; + var _z3 = ({ + a: { + b: 1 + } + }).a.b; use(_z3); } use(x); @@ -79,10 +91,14 @@ var z6; var y = true; { var _y = ""; - var _z6 = ([true])[0]; + var _z6 = ([ + true + ])[0]; { var _y_1 = 1; - var _z6_1 = ({ a: 1 }).a; + var _z6_1 = ({ + a: 1 + }).a; use(_y_1); use(_z6_1); } @@ -95,10 +111,14 @@ var z = false; var z5 = 1; { var _z = ""; - var _z5 = ([5])[0]; + var _z5 = ([ + 5 + ])[0]; { var _z_1 = 1; - var _z5_1 = ({ a: 1 }).a; + var _z5_1 = ({ + a: 1 + }).a; // try to step on generated name use(_z_1); } diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index 36da8ac36fe..2f25ee4e897 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -239,18 +239,26 @@ use(z); function foo1() { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } function foo2() { { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -261,18 +269,26 @@ var A = (function () { A.prototype.m1 = function () { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); }; A.prototype.m2 = function () { { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -285,18 +301,26 @@ var B = (function () { B.prototype.m1 = function () { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); }; B.prototype.m2 = function () { { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -306,18 +330,26 @@ var B = (function () { function bar1() { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } function bar2() { { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -326,9 +358,13 @@ var M1; (function (M1) { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); })(M1 || (M1 = {})); var M2; @@ -336,9 +372,13 @@ var M2; { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -347,9 +387,13 @@ var M3; (function (M3) { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); })(M3 || (M3 = {})); var M4; @@ -357,9 +401,13 @@ var M4; { var _x = 1; use(_x); - var _y = ([1])[0]; + var _y = ([ + 1 + ])[0]; use(_y); - var _z = ({ a: 1 }).a; + var _z = ({ + a: 1 + }).a; use(_z); } use(x); @@ -373,7 +421,9 @@ function foo3() { for (var _y = ([])[0];;) { use(_y); } - for (var _z = ({ a: 1 }).a;;) { + for (var _z = ({ + a: 1 + }).a;;) { use(_z); } use(x); @@ -385,7 +435,9 @@ function foo4() { for (var _y = ([])[0];;) { use(_y); } - for (var _z = ({ a: 1 }).a;;) { + for (var _z = ({ + a: 1 + }).a;;) { use(_z); } use(x); diff --git a/tests/baselines/reference/downlevelLetConst18.js b/tests/baselines/reference/downlevelLetConst18.js index e9993a90bce..0c025573e20 100644 --- a/tests/baselines/reference/downlevelLetConst18.js +++ b/tests/baselines/reference/downlevelLetConst18.js @@ -33,25 +33,45 @@ for (let x; ;) { //// [downlevelLetConst18.js] 'use strict'; for (var x = void 0;;) { - function foo() { x; } + function foo() { + x; + } ; } for (var _x = void 0;;) { - function foo() { _x; } + function foo() { + _x; + } ; } for (var _x_1 = void 0;;) { - (function () { _x_1; })(); + (function () { + _x_1; + })(); } for (var _x_2 = 1;;) { - (function () { _x_2; })(); + (function () { + _x_2; + })(); } for (var _x_3 = void 0;;) { - ({ foo: function () { _x_3; } }); + ({ + foo: function () { + _x_3; + } + }); } for (var _x_4 = void 0;;) { - ({ get foo() { return _x_4; } }); + ({ + get foo() { + return _x_4; + } + }); } for (var _x_5 = void 0;;) { - ({ set foo(v) { _x_5; } }); + ({ + set foo(v) { + _x_5; + } + }); } diff --git a/tests/baselines/reference/duplicateIdentifierInCatchBlock.js b/tests/baselines/reference/duplicateIdentifierInCatchBlock.js index e440c06073a..6d43b888f48 100644 --- a/tests/baselines/reference/duplicateIdentifierInCatchBlock.js +++ b/tests/baselines/reference/duplicateIdentifierInCatchBlock.js @@ -19,20 +19,27 @@ try { } catch (e) { //// [duplicateIdentifierInCatchBlock.js] var v; -try { } +try { +} catch (e) { - function v() { } + function v() { + } +} +function w() { +} +try { } -function w() { } -try { } catch (e) { var w; } -try { } +try { +} catch (e) { var x; - function x() { } // error - function e() { } // error + function x() { + } // error + function e() { + } // error var p; var p; // error } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js index 6a567018d1f..018d148f9c3 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js @@ -64,7 +64,8 @@ var M; })(M || (M = {})); var M; (function (M) { - function f() { } + function f() { + } M.f = f; })(M || (M = {})); var M; @@ -78,7 +79,8 @@ var M; })(M || (M = {})); var M; (function (M) { - function g() { } + function g() { + } })(M || (M = {})); var M; (function (M) { @@ -100,7 +102,8 @@ var M; })(M || (M = {})); var M; (function (M) { - function C() { } // no error + function C() { + } // no error })(M || (M = {})); var M; (function (M) { diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index 62e291f28c0..d9ba04ae39a 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -361,7 +361,9 @@ var TestRunner = (function () { this.tests = []; } TestRunner.arrayCompare = function (arg1, arg2) { - return (arg1.every(function (val, index) { return val === arg2[index]; })); + return (arg1.every(function (val, index) { + return val === arg2[index]; + })); }; TestRunner.prototype.addTest = function (test) { this.tests.push(test); @@ -408,11 +410,39 @@ exports.TestRunner = TestRunner; exports.tests = (function () { var testRunner = new TestRunner(); // First 3 are for simple harness validation - testRunner.addTest(new TestCase("Basic test", function () { return true; })); - testRunner.addTest(new TestCase("Test for any error", function () { throw new Error(); return false; }, "")); - testRunner.addTest(new TestCase("Test RegEx error message match", function () { throw new Error("Should also pass"); return false; }, "Should [also]+ pass")); - testRunner.addTest(new TestCase("Test array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); })); - testRunner.addTest(new TestCase("Test array compare false", function () { return !TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]); })); + testRunner.addTest(new TestCase("Basic test", function () { + return true; + })); + testRunner.addTest(new TestCase("Test for any error", function () { + throw new Error(); + return false; + }, "")); + testRunner.addTest(new TestCase("Test RegEx error message match", function () { + throw new Error("Should also pass"); + return false; + }, "Should [also]+ pass")); + testRunner.addTest(new TestCase("Test array compare true", function () { + return TestRunner.arrayCompare([ + 1, + 2, + 3 + ], [ + 1, + 2, + 3 + ]); + })); + testRunner.addTest(new TestCase("Test array compare false", function () { + return !TestRunner.arrayCompare([ + 3, + 2, + 3 + ], [ + 1, + 2, + 3 + ]); + })); // File detection tests testRunner.addTest(new TestCase("Check file exists", function () { return FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test.txt"); @@ -422,38 +452,28 @@ exports.tests = (function () { })); // File pattern matching tests testRunner.addTest(new TestCase("Check text file match", function () { - return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") && - FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") && - FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js")); + return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") && FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") && FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js")); })); testRunner.addTest(new TestCase("Check makefile match", function () { return FileManager.FileBuffer.isTextFile("C:\\some dir\\makefile"); })); testRunner.addTest(new TestCase("Check binary file doesn't match", function () { - return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") && - !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll")); + return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") && !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll")); })); // Command-line parameter tests testRunner.addTest(new TestCase("Check App defaults", function () { var app = new App.App([]); - return (app.fixLines === false && - app.recurse === true && - app.lineEndings === "CRLF" && - app.matchPattern === undefined && - app.rootDirectory === ".\\" && - app.encodings[0] === "ascii" && - app.encodings[1] === "utf8nobom"); + return (app.fixLines === false && app.recurse === true && app.lineEndings === "CRLF" && app.matchPattern === undefined && app.rootDirectory === ".\\" && app.encodings[0] === "ascii" && app.encodings[1] === "utf8nobom"); })); testRunner.addTest(new TestCase("Check App params", function () { - var app = new App.App(["-dir=C:\\test dir", "-lineEndings=LF", "-encodings=utf16be,ascii", "-recurse=false", "-fixlines"]); - return (app.fixLines === true && - app.lineEndings === "LF" && - app.recurse === false && - app.matchPattern === undefined && - app.rootDirectory === "C:\\test dir" && - app.encodings[0] === "utf16be" && - app.encodings[1] === "ascii" && - app.encodings.length === 2); + var app = new App.App([ + "-dir=C:\\test dir", + "-lineEndings=LF", + "-encodings=utf16be,ascii", + "-recurse=false", + "-fixlines" + ]); + return (app.fixLines === true && app.lineEndings === "LF" && app.recurse === false && app.matchPattern === undefined && app.rootDirectory === "C:\\test dir" && app.encodings[0] === "utf16be" && app.encodings[1] === "ascii" && app.encodings.length === 2); })); // File BOM detection tests testRunner.addTest(new TestCase("Check encoding detection no BOM", function () { @@ -487,7 +507,19 @@ exports.tests = (function () { for (var i = 0; i < 11; i++) { chars.push(fb.readByte()); } - return TestRunner.arrayCompare(chars, [0x54, 0xC3, 0xA8, 0xE1, 0xB4, 0xA3, 0xE2, 0x80, 0xA0, 0x0D, 0x0A]); + return TestRunner.arrayCompare(chars, [ + 0x54, + 0xC3, + 0xA8, + 0xE1, + 0xB4, + 0xA3, + 0xE2, + 0x80, + 0xA0, + 0x0D, + 0x0A + ]); })); testRunner.addTest(new TestCase("Check UTF8 decoding", function () { var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt"); @@ -495,12 +527,26 @@ exports.tests = (function () { for (var i = 0; i < 6; i++) { chars.push(fb.readUtf8CodePoint()); } - return TestRunner.arrayCompare(chars, [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A]); + return TestRunner.arrayCompare(chars, [ + 0x0054, + 0x00E8, + 0x1D23, + 0x2020, + 0x000D, + 0x000A + ]); })); testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb = new FileManager.FileBuffer(20); fb.writeUtf8Bom(); - var chars = [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A]; + var chars = [ + 0x0054, + 0x00E8, + 0x1D23, + 0x2020, + 0x000D, + 0x000A + ]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } @@ -509,7 +555,22 @@ exports.tests = (function () { for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } - var expected = [0xEF, 0xBB, 0xBF, 0x54, 0xC3, 0xA8, 0xE1, 0xB4, 0xA3, 0xE2, 0x80, 0xA0, 0x0D, 0x0A]; + var expected = [ + 0xEF, + 0xBB, + 0xBF, + 0x54, + 0xC3, + 0xA8, + 0xE1, + 0xB4, + 0xA3, + 0xE2, + 0x80, + 0xA0, + 0x0D, + 0x0A + ]; return TestRunner.arrayCompare(bytes, expected); })); // Test reading and writing files @@ -517,14 +578,38 @@ exports.tests = (function () { var filename = TestFileDir + "\\tmpUTF16LE.txt"; var fb = new FileManager.FileBuffer(14); fb.writeUtf16leBom(); - var chars = [0x0054, 0x00E8, 0x1D23, 0x2020, 0x000D, 0x000A]; - chars.forEach(function (val) { fb.writeUtf16CodePoint(val, false); }); + var chars = [ + 0x0054, + 0x00E8, + 0x1D23, + 0x2020, + 0x000D, + 0x000A + ]; + chars.forEach(function (val) { + fb.writeUtf16CodePoint(val, false); + }); fb.save(filename); var savedFile = new FileManager.FileBuffer(filename); if (savedFile.encoding !== 'utf16le') { throw Error("Incorrect encoding"); } - var expectedBytes = [0xFF, 0xFE, 0x54, 0x00, 0xE8, 0x00, 0x23, 0x1D, 0x20, 0x20, 0x0D, 0x00, 0x0A, 0x00]; + var expectedBytes = [ + 0xFF, + 0xFE, + 0x54, + 0x00, + 0xE8, + 0x00, + 0x23, + 0x1D, + 0x20, + 0x20, + 0x0D, + 0x00, + 0x0A, + 0x00 + ]; savedFile.index = 0; expectedBytes.forEach(function (val) { var byteVal = savedFile.readByte(); @@ -554,7 +639,14 @@ exports.tests = (function () { for (var i = 0; i < 6; i++) { codePoints.push(savedFile.readUtf16CodePoint(false)); } - var expectedCodePoints = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69]; + var expectedCodePoints = [ + 0x10480, + 0x10481, + 0x10482, + 0x54, + 0x68, + 0x69 + ]; return TestRunner.arrayCompare(codePoints, expectedCodePoints); })); testRunner.addTest(new TestCase("Read non-BMP utf8 chars", function () { @@ -566,20 +658,52 @@ exports.tests = (function () { for (var i = 0; i < 6; i++) { codePoints.push(savedFile.readUtf8CodePoint()); } - var expectedCodePoints = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69]; + var expectedCodePoints = [ + 0x10480, + 0x10481, + 0x10482, + 0x54, + 0x68, + 0x69 + ]; return TestRunner.arrayCompare(codePoints, expectedCodePoints); })); testRunner.addTest(new TestCase("Write non-BMP utf8 chars", function () { var filename = TestFileDir + "\\tmpUTF8nonBmp.txt"; var fb = new FileManager.FileBuffer(15); - var chars = [0x10480, 0x10481, 0x10482, 0x54, 0x68, 0x69]; - chars.forEach(function (val) { fb.writeUtf8CodePoint(val); }); + var chars = [ + 0x10480, + 0x10481, + 0x10482, + 0x54, + 0x68, + 0x69 + ]; + chars.forEach(function (val) { + fb.writeUtf8CodePoint(val); + }); fb.save(filename); var savedFile = new FileManager.FileBuffer(filename); if (savedFile.encoding !== 'utf8') { throw Error("Incorrect encoding"); } - var expectedBytes = [0xF0, 0x90, 0x92, 0x80, 0xF0, 0x90, 0x92, 0x81, 0xF0, 0x90, 0x92, 0x82, 0x54, 0x68, 0x69]; + var expectedBytes = [ + 0xF0, + 0x90, + 0x92, + 0x80, + 0xF0, + 0x90, + 0x92, + 0x81, + 0xF0, + 0x90, + 0x92, + 0x82, + 0x54, + 0x68, + 0x69 + ]; expectedBytes.forEach(function (val) { var byteVal = savedFile.readByte(); if (byteVal !== val) { diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index a8370f31709..fdb6f5463cd 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -62,7 +62,9 @@ define(["require", "exports"], function (require, exports) { testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb; fb.writeUtf8Bom(); - var chars = [0x0054]; + var chars = [ + 0x0054 + ]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } @@ -71,7 +73,9 @@ define(["require", "exports"], function (require, exports) { for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } - var expected = [0xEF]; + var expected = [ + 0xEF + ]; return TestRunner.arrayCompare(bytes, expected); })); return testRunner; diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.js b/tests/baselines/reference/duplicateObjectLiteralProperty.js index 9c629b211cf..5bbeb433a0c 100644 --- a/tests/baselines/reference/duplicateObjectLiteralProperty.js +++ b/tests/baselines/reference/duplicateObjectLiteralProperty.js @@ -30,7 +30,12 @@ var x = { } }; var y = { - get a() { return 0; }, - set a(v) { }, - get a() { return 0; } + get a() { + return 0; + }, + set a(v) { + }, + get a() { + return 0; + } }; diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.js b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.js index 5f55a8b1d22..ceaeac0d025 100644 --- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.js +++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.js @@ -10,4 +10,6 @@ var r5 = a.reduce((x, y) => x + y); //// [duplicateOverloadInTypeAugmentation1.js] var a; -var r5 = a.reduce(function (x, y) { return x + y; }); +var r5 = a.reduce(function (x, y) { + return x + y; +}); diff --git a/tests/baselines/reference/duplicatePropertyNames.js b/tests/baselines/reference/duplicatePropertyNames.js index c3cde82e2cc..c5da2a1f39f 100644 --- a/tests/baselines/reference/duplicatePropertyNames.js +++ b/tests/baselines/reference/duplicatePropertyNames.js @@ -52,17 +52,23 @@ var b = { // duplicate property names are an error in all types var C = (function () { function C() { - this.baz = function () { }; - this.baz = function () { }; + this.baz = function () { + }; + this.baz = function () { + }; } - C.prototype.bar = function (x) { }; - C.prototype.bar = function (x) { }; + C.prototype.bar = function (x) { + }; + C.prototype.bar = function (x) { + }; return C; })(); var a; var b = { foo: '', foo: '', - bar: function () { }, - bar: function () { } + bar: function () { + }, + bar: function () { + } }; diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 89b5a210ec4..e34ed7c8d02 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -93,7 +93,8 @@ define(["require", "exports"], function (require, exports) { (function (F) { var t; })(F || (F = {})); - function F() { } + function F() { + } M.F = F; // Only one error for duplicate identifier (don't consider visibility) })(M || (M = {})); var M; diff --git a/tests/baselines/reference/duplicateTypeParameters1.js b/tests/baselines/reference/duplicateTypeParameters1.js index 990048a25d7..167688719ab 100644 --- a/tests/baselines/reference/duplicateTypeParameters1.js +++ b/tests/baselines/reference/duplicateTypeParameters1.js @@ -3,4 +3,5 @@ function A() { } //// [duplicateTypeParameters1.js] -function A() { } +function A() { +} diff --git a/tests/baselines/reference/duplicateTypeParameters2.js b/tests/baselines/reference/duplicateTypeParameters2.js index 65dce28ad3f..c89f0d15fe3 100644 --- a/tests/baselines/reference/duplicateTypeParameters2.js +++ b/tests/baselines/reference/duplicateTypeParameters2.js @@ -8,12 +8,14 @@ interface I {} var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); diff --git a/tests/baselines/reference/elaboratedErrors.js b/tests/baselines/reference/elaboratedErrors.js index ae5877b2dd6..c245c1a8562 100644 --- a/tests/baselines/reference/elaboratedErrors.js +++ b/tests/baselines/reference/elaboratedErrors.js @@ -27,7 +27,8 @@ y = x; //// [elaboratedErrors.js] -function fn(s) { } +function fn(s) { +} // This should issue a large error, not a small one var WorkerFS = (function () { function WorkerFS() { diff --git a/tests/baselines/reference/emitArrowFunction.js b/tests/baselines/reference/emitArrowFunction.js index 7e2617045a8..074febfa096 100644 --- a/tests/baselines/reference/emitArrowFunction.js +++ b/tests/baselines/reference/emitArrowFunction.js @@ -8,8 +8,10 @@ foo(() => true); foo(() => { return false; }); //// [emitArrowFunction.js] -var f1 = function () { }; -var f2 = function (x, y) { }; +var f1 = function () { +}; +var f2 = function (x, y) { +}; var f3 = function (x, y) { var rest = []; for (var _i = 2; _i < arguments.length; _i++) { @@ -19,6 +21,11 @@ var f3 = function (x, y) { var f4 = function (x, y, z) { if (z === void 0) { z = 10; } }; -function foo(func) { } -foo(function () { return true; }); -foo(function () { return false; }); +function foo(func) { +} +foo(function () { + return true; +}); +foo(function () { + return false; +}); diff --git a/tests/baselines/reference/emitArrowFunctionAsIs.js b/tests/baselines/reference/emitArrowFunctionAsIs.js index c6586ee95a1..11df7903ad8 100644 --- a/tests/baselines/reference/emitArrowFunctionAsIs.js +++ b/tests/baselines/reference/emitArrowFunctionAsIs.js @@ -5,6 +5,9 @@ var arrow2 = (a) => { }; var arrow3 = (a, b) => { }; //// [emitArrowFunctionAsIs.js] -var arrow1 = function (a) { }; -var arrow2 = function (a) { }; -var arrow3 = function (a, b) { }; +var arrow1 = function (a) { +}; +var arrow2 = function (a) { +}; +var arrow3 = function (a, b) { +}; diff --git a/tests/baselines/reference/emitArrowFunctionAsIsES6.js b/tests/baselines/reference/emitArrowFunctionAsIsES6.js index 9876abdafcd..9941434ae10 100644 --- a/tests/baselines/reference/emitArrowFunctionAsIsES6.js +++ b/tests/baselines/reference/emitArrowFunctionAsIsES6.js @@ -5,6 +5,9 @@ var arrow2 = (a) => { }; var arrow3 = (a, b) => { }; //// [emitArrowFunctionAsIsES6.js] -var arrow1 = a => { }; -var arrow2 = (a) => { }; -var arrow3 = (a, b) => { }; +var arrow1 = a => { +}; +var arrow2 = (a) => { +}; +var arrow3 = (a, b) => { +}; diff --git a/tests/baselines/reference/emitArrowFunctionES6.js b/tests/baselines/reference/emitArrowFunctionES6.js index 603b2737fc5..6409fc9464c 100644 --- a/tests/baselines/reference/emitArrowFunctionES6.js +++ b/tests/baselines/reference/emitArrowFunctionES6.js @@ -9,10 +9,17 @@ foo(() => { return false; }); //// [emitArrowFunctionES6.js] -var f1 = () => { }; -var f2 = (x, y) => { }; -var f3 = (x, y, ...rest) => { }; -var f4 = (x, y, z = 10) => { }; -function foo(func) { } +var f1 = () => { +}; +var f2 = (x, y) => { +}; +var f3 = (x, y, ...rest) => { +}; +var f4 = (x, y, z = 10) => { +}; +function foo(func) { +} foo(() => true); -foo(() => { return false; }); +foo(() => { + return false; +}); diff --git a/tests/baselines/reference/emitArrowFunctionThisCapturing.js b/tests/baselines/reference/emitArrowFunctionThisCapturing.js index ac4326ea508..25d9f7f100b 100644 --- a/tests/baselines/reference/emitArrowFunctionThisCapturing.js +++ b/tests/baselines/reference/emitArrowFunctionThisCapturing.js @@ -22,7 +22,8 @@ var f1 = function () { var f2 = function (x) { _this.name = x; }; -function foo(func) { } +function foo(func) { +} foo(function () { _this.age = 100; return true; diff --git a/tests/baselines/reference/emitArrowFunctionThisCapturingES6.js b/tests/baselines/reference/emitArrowFunctionThisCapturingES6.js index 2a82ef9c800..bf235bc0eef 100644 --- a/tests/baselines/reference/emitArrowFunctionThisCapturingES6.js +++ b/tests/baselines/reference/emitArrowFunctionThisCapturingES6.js @@ -21,7 +21,8 @@ var f1 = () => { var f2 = (x) => { this.name = x; }; -function foo(func) { } +function foo(func) { +} foo(() => { this.age = 100; return true; diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments.js index 589449fad62..00a4c7aa051 100644 --- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments.js +++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments.js @@ -45,7 +45,8 @@ function baz() { var arg = arguments[0]; }); } -function foo(inputFunc) { } +function foo(inputFunc) { +} foo(() => { var arg = arguments[0]; // error }); diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArgumentsES6.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArgumentsES6.js index 2f84d0843de..0deacd409df 100644 --- a/tests/baselines/reference/emitArrowFunctionWhenUsingArgumentsES6.js +++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArgumentsES6.js @@ -45,7 +45,8 @@ function baz() { var arg = arguments[0]; }); } -function foo(inputFunc) { } +function foo(inputFunc) { +} foo(() => { var arg = arguments[0]; // error }); diff --git a/tests/baselines/reference/emitArrowFunctionsAsIs.js b/tests/baselines/reference/emitArrowFunctionsAsIs.js index cf773efb8b7..ee8347dda3e 100644 --- a/tests/baselines/reference/emitArrowFunctionsAsIs.js +++ b/tests/baselines/reference/emitArrowFunctionsAsIs.js @@ -5,6 +5,9 @@ var arrow2 = (a) => { }; var arrow3 = (a, b) => { }; //// [emitArrowFunctionsAsIs.js] -var arrow1 = function (a) { }; -var arrow2 = function (a) { }; -var arrow3 = function (a, b) { }; +var arrow1 = function (a) { +}; +var arrow2 = function (a) { +}; +var arrow3 = function (a, b) { +}; diff --git a/tests/baselines/reference/emitArrowFunctionsAsIsES6.js b/tests/baselines/reference/emitArrowFunctionsAsIsES6.js index 32323a6597b..021e048ed88 100644 --- a/tests/baselines/reference/emitArrowFunctionsAsIsES6.js +++ b/tests/baselines/reference/emitArrowFunctionsAsIsES6.js @@ -5,6 +5,9 @@ var arrow2 = (a) => { }; var arrow3 = (a, b) => { }; //// [emitArrowFunctionsAsIsES6.js] -var arrow1 = a => { }; -var arrow2 = (a) => { }; -var arrow3 = (a, b) => { }; +var arrow1 = a => { +}; +var arrow2 = (a) => { +}; +var arrow3 = (a, b) => { +}; diff --git a/tests/baselines/reference/emitDefaultParametersFunctionES6.js b/tests/baselines/reference/emitDefaultParametersFunctionES6.js index 0d1c9460fed..f4084a16f6f 100644 --- a/tests/baselines/reference/emitDefaultParametersFunctionES6.js +++ b/tests/baselines/reference/emitDefaultParametersFunctionES6.js @@ -5,7 +5,11 @@ function bar(y = 10) { } function bar1(y = 10, ...rest) { } //// [emitDefaultParametersFunctionES6.js] -function foo(x, y = 10) { } -function baz(x, y = 5, ...rest) { } -function bar(y = 10) { } -function bar1(y = 10, ...rest) { } +function foo(x, y = 10) { +} +function baz(x, y = 5, ...rest) { +} +function bar(y = 10) { +} +function bar1(y = 10, ...rest) { +} diff --git a/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.js b/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.js index f72c245b175..5a49a200c6b 100644 --- a/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.js +++ b/tests/baselines/reference/emitDefaultParametersFunctionExpressionES6.js @@ -9,10 +9,17 @@ var y = (function (num = 10, boo = false, ...rest) { })() var z = (function (num: number, boo = false, ...rest) { })(10) //// [emitDefaultParametersFunctionExpressionES6.js] -var lambda1 = (y = "hello") => { }; -var lambda2 = (x, y = "hello") => { }; -var lambda3 = (x, y = "hello", ...rest) => { }; -var lambda4 = (y = "hello", ...rest) => { }; -var x = function (str = "hello", ...rest) { }; -var y = (function (num = 10, boo = false, ...rest) { })(); -var z = (function (num, boo = false, ...rest) { })(10); +var lambda1 = (y = "hello") => { +}; +var lambda2 = (x, y = "hello") => { +}; +var lambda3 = (x, y = "hello", ...rest) => { +}; +var lambda4 = (y = "hello", ...rest) => { +}; +var x = function (str = "hello", ...rest) { +}; +var y = (function (num = 10, boo = false, ...rest) { +})(); +var z = (function (num, boo = false, ...rest) { +})(10); diff --git a/tests/baselines/reference/emitDefaultParametersFunctionPropertyES6.js b/tests/baselines/reference/emitDefaultParametersFunctionPropertyES6.js index 4a85f4a34b0..fce694a453a 100644 --- a/tests/baselines/reference/emitDefaultParametersFunctionPropertyES6.js +++ b/tests/baselines/reference/emitDefaultParametersFunctionPropertyES6.js @@ -8,8 +8,12 @@ var obj2 = { //// [emitDefaultParametersFunctionPropertyES6.js] var obj2 = { - func1(y = 10, ...rest) { }, - func2(x = "hello") { }, - func3(x, z, y = "hello") { }, - func4(x, z, y = "hello", ...rest) { }, + func1(y = 10, ...rest) { + }, + func2(x = "hello") { + }, + func3(x, z, y = "hello") { + }, + func4(x, z, y = "hello", ...rest) { + }, }; diff --git a/tests/baselines/reference/emitDefaultParametersMethodES6.js b/tests/baselines/reference/emitDefaultParametersMethodES6.js index 8489b5708f1..bf96e00e375 100644 --- a/tests/baselines/reference/emitDefaultParametersMethodES6.js +++ b/tests/baselines/reference/emitDefaultParametersMethodES6.js @@ -20,10 +20,14 @@ class E { var C = (function () { function C(t, z, x, y = "hello") { } - C.prototype.foo = function (x, t = false) { }; - C.prototype.foo1 = function (x, t = false, ...rest) { }; - C.prototype.bar = function (t = false) { }; - C.prototype.boo = function (t = false, ...rest) { }; + C.prototype.foo = function (x, t = false) { + }; + C.prototype.foo1 = function (x, t = false, ...rest) { + }; + C.prototype.bar = function (t = false) { + }; + C.prototype.boo = function (t = false, ...rest) { + }; return C; })(); var D = (function () { diff --git a/tests/baselines/reference/emitRestParametersFunctionES6.js b/tests/baselines/reference/emitRestParametersFunctionES6.js index a07b3a13174..242c40f252d 100644 --- a/tests/baselines/reference/emitRestParametersFunctionES6.js +++ b/tests/baselines/reference/emitRestParametersFunctionES6.js @@ -3,5 +3,7 @@ function bar(...rest) { } function foo(x: number, y: string, ...rest) { } //// [emitRestParametersFunctionES6.js] -function bar(...rest) { } -function foo(x, y, ...rest) { } +function bar(...rest) { +} +function foo(x, y, ...rest) { +} diff --git a/tests/baselines/reference/emitRestParametersFunctionExpressionES6.js b/tests/baselines/reference/emitRestParametersFunctionExpressionES6.js index aa52a29b138..c7851db5e78 100644 --- a/tests/baselines/reference/emitRestParametersFunctionExpressionES6.js +++ b/tests/baselines/reference/emitRestParametersFunctionExpressionES6.js @@ -5,7 +5,11 @@ var funcExp2 = function (...rest) { } var funcExp3 = (function (...rest) { })() //// [emitRestParametersFunctionExpressionES6.js] -var funcExp = (...rest) => { }; -var funcExp1 = (X, ...rest) => { }; -var funcExp2 = function (...rest) { }; -var funcExp3 = (function (...rest) { })(); +var funcExp = (...rest) => { +}; +var funcExp1 = (X, ...rest) => { +}; +var funcExp2 = function (...rest) { +}; +var funcExp3 = (function (...rest) { +})(); diff --git a/tests/baselines/reference/emitRestParametersFunctionPropertyES6.js b/tests/baselines/reference/emitRestParametersFunctionPropertyES6.js index 122a1f6ed52..87aa489ecf3 100644 --- a/tests/baselines/reference/emitRestParametersFunctionPropertyES6.js +++ b/tests/baselines/reference/emitRestParametersFunctionPropertyES6.js @@ -10,5 +10,6 @@ var obj2 = { //// [emitRestParametersFunctionPropertyES6.js] var obj; var obj2 = { - func(...rest) { } + func(...rest) { + } }; diff --git a/tests/baselines/reference/emitRestParametersMethodES6.js b/tests/baselines/reference/emitRestParametersMethodES6.js index ff8e040be9c..d0a0e2a120c 100644 --- a/tests/baselines/reference/emitRestParametersMethodES6.js +++ b/tests/baselines/reference/emitRestParametersMethodES6.js @@ -18,14 +18,18 @@ class D { var C = (function () { function C(name, ...rest) { } - C.prototype.bar = function (...rest) { }; - C.prototype.foo = function (x, ...rest) { }; + C.prototype.bar = function (...rest) { + }; + C.prototype.foo = function (x, ...rest) { + }; return C; })(); var D = (function () { function D(...rest) { } - D.prototype.bar = function (...rest) { }; - D.prototype.foo = function (x, ...rest) { }; + D.prototype.bar = function (...rest) { + }; + D.prototype.foo = function (x, ...rest) { + }; return D; })(); diff --git a/tests/baselines/reference/emptyExpr.js b/tests/baselines/reference/emptyExpr.js index de3bddeba1e..4bda58e3244 100644 --- a/tests/baselines/reference/emptyExpr.js +++ b/tests/baselines/reference/emptyExpr.js @@ -2,4 +2,6 @@ [{},] //// [emptyExpr.js] -[{},]; +[ + {}, +]; diff --git a/tests/baselines/reference/emptyTypeArgumentList.js b/tests/baselines/reference/emptyTypeArgumentList.js index 30093113be4..91fce396289 100644 --- a/tests/baselines/reference/emptyTypeArgumentList.js +++ b/tests/baselines/reference/emptyTypeArgumentList.js @@ -3,5 +3,6 @@ function foo() { } foo<>(); //// [emptyTypeArgumentList.js] -function foo() { } +function foo() { +} foo(); diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.js b/tests/baselines/reference/enumAssignabilityInInheritance.js index a26bd0670f8..bec59a3d0de 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.js +++ b/tests/baselines/reference/enumAssignabilityInInheritance.js @@ -144,7 +144,8 @@ var E2; E2[E2["A"] = 0] = "A"; })(E2 || (E2 = {})); var r4 = foo13(0 /* A */); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/enumBasics.js b/tests/baselines/reference/enumBasics.js index eca92215fb6..6f1a039ca6e 100644 --- a/tests/baselines/reference/enumBasics.js +++ b/tests/baselines/reference/enumBasics.js @@ -150,9 +150,21 @@ var E9; // (refer to .js to validate) // Enum constant members are propagated var doNotPropagate = [ - E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z + E8.B, + E7.A, + E4.Z, + E3.X, + E3.Y, + E3.Z ]; // Enum computed members are not propagated var doPropagate = [ - 0 /* A */, E9.B, 0 /* B */, 1 /* C */, 0 /* A */, 0 /* A */, 3 /* B */, 4 /* C */ + 0 /* A */, + E9.B, + 0 /* B */, + 1 /* C */, + 0 /* A */, + 0 /* A */, + 3 /* B */, + 4 /* C */ ]; diff --git a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js index a0a6afb172f..67d9a020bb6 100644 --- a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js +++ b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js @@ -11,6 +11,5 @@ var Position; (function (Position) { Position[Position["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; })(Position || (Position = {})); -var x = IgnoreRulesSpecific. -; +var x = IgnoreRulesSpecific.; var y = 0 /* IgnoreRulesSpecific */; diff --git a/tests/baselines/reference/enumIndexer.js b/tests/baselines/reference/enumIndexer.js index f9f71a3ff98..77c2708dab3 100644 --- a/tests/baselines/reference/enumIndexer.js +++ b/tests/baselines/reference/enumIndexer.js @@ -13,6 +13,15 @@ var MyEnumType; MyEnumType[MyEnumType["foo"] = 0] = "foo"; MyEnumType[MyEnumType["bar"] = 1] = "bar"; })(MyEnumType || (MyEnumType = {})); -var _arr = [{ key: 'foo' }, { key: 'bar' }]; +var _arr = [ + { + key: 'foo' + }, + { + key: 'bar' + } +]; var enumValue = 0 /* foo */; -var x = _arr.map(function (o) { return MyEnumType[o.key] === enumValue; }); // these are not same type +var x = _arr.map(function (o) { + return MyEnumType[o.key] === enumValue; +}); // these are not same type diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js index d932985ad7d..f9ac7661e3d 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js @@ -150,7 +150,8 @@ var E2; (function (E2) { E2[E2["A"] = 0] = "A"; })(E2 || (E2 = {})); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/enumMemberResolution.js b/tests/baselines/reference/enumMemberResolution.js index ebfcac3a59e..e1d79ebeb92 100644 --- a/tests/baselines/reference/enumMemberResolution.js +++ b/tests/baselines/reference/enumMemberResolution.js @@ -12,7 +12,6 @@ var Position2; (function (Position2) { Position2[Position2["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; })(Position2 || (Position2 = {})); -var x = IgnoreRulesSpecific. -; // error +var x = IgnoreRulesSpecific.; // error var y = 1; var z = 0 /* IgnoreRulesSpecific */; // no error diff --git a/tests/baselines/reference/enumMerging.js b/tests/baselines/reference/enumMerging.js index b0da96c4b6e..b76f789da1d 100644 --- a/tests/baselines/reference/enumMerging.js +++ b/tests/baselines/reference/enumMerging.js @@ -95,7 +95,14 @@ var M1; EConst1[EConst1["F"] = 8] = "F"; })(M1.EConst1 || (M1.EConst1 = {})); var EConst1 = M1.EConst1; - var x = [3 /* A */, 2 /* B */, 1 /* C */, 7 /* D */, 9 /* E */, 8 /* F */]; + var x = [ + 3 /* A */, + 2 /* B */, + 1 /* C */, + 7 /* D */, + 9 /* E */, + 8 /* F */ + ]; })(M1 || (M1 = {})); // Enum with only computed members across 2 declarations with the same root module var M2; @@ -112,7 +119,14 @@ var M2; EComp2[EComp2["F"] = 'foo'.length] = "F"; })(M2.EComp2 || (M2.EComp2 = {})); var EComp2 = M2.EComp2; - var x = [EComp2.A, EComp2.B, EComp2.C, EComp2.D, EComp2.E, EComp2.F]; + var x = [ + EComp2.A, + EComp2.B, + EComp2.C, + EComp2.D, + EComp2.E, + EComp2.F + ]; })(M2 || (M2 = {})); // Enum with initializer in only one of two declarations with constant members with the same root module var M3; diff --git a/tests/baselines/reference/errorOnContextuallyTypedReturnType.js b/tests/baselines/reference/errorOnContextuallyTypedReturnType.js index 9e0c26b6be7..2a49ccd2b67 100644 --- a/tests/baselines/reference/errorOnContextuallyTypedReturnType.js +++ b/tests/baselines/reference/errorOnContextuallyTypedReturnType.js @@ -4,5 +4,7 @@ var n2: () => boolean = function ():boolean { }; // expect an error here //// [errorOnContextuallyTypedReturnType.js] -var n1 = function () { }; // expect an error here -var n2 = function () { }; // expect an error here +var n1 = function () { +}; // expect an error here +var n2 = function () { +}; // expect an error here diff --git a/tests/baselines/reference/errorSuperPropertyAccess.js b/tests/baselines/reference/errorSuperPropertyAccess.js index 79ba631afed..17cd2c265ed 100644 --- a/tests/baselines/reference/errorSuperPropertyAccess.js +++ b/tests/baselines/reference/errorSuperPropertyAccess.js @@ -172,10 +172,14 @@ var SomeBase = (function () { this.privateMember = 0; this.publicMember = 0; } - SomeBase.prototype.privateFunc = function () { }; - SomeBase.prototype.publicFunc = function () { }; - SomeBase.privateStaticFunc = function () { }; - SomeBase.publicStaticFunc = function () { }; + SomeBase.prototype.privateFunc = function () { + }; + SomeBase.prototype.publicFunc = function () { + }; + SomeBase.privateStaticFunc = function () { + }; + SomeBase.publicStaticFunc = function () { + }; SomeBase.privateStaticMember = 0; SomeBase.publicStaticMember = 0; return SomeBase; @@ -209,7 +213,9 @@ var SomeDerived1 = (function (_super) { super.publicFunc.call(this); } var x = { - test: function () { return super.publicFunc.call(this); } + test: function () { + return super.publicFunc.call(this); + } }; }; return SomeDerived1; @@ -271,4 +277,7 @@ var SomeDerived3 = (function (_super) { return SomeDerived3; })(SomeBase); // In object literal -var obj = { n: super.wat, p: super.foo.call(this) }; +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..059530be452 100644 --- a/tests/baselines/reference/errorSupression1.js +++ b/tests/baselines/reference/errorSupression1.js @@ -12,7 +12,9 @@ baz.concat("y"); var Foo = (function () { function Foo() { } - Foo.bar = function () { return "x"; }; + Foo.bar = function () { + return "x"; + }; return Foo; })(); var baz = Foo.b; diff --git a/tests/baselines/reference/errorsInGenericTypeReference.js b/tests/baselines/reference/errorsInGenericTypeReference.js index 03bf31a6a6b..6a9f62c5e49 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.js +++ b/tests/baselines/reference/errorsInGenericTypeReference.js @@ -88,7 +88,8 @@ var Foo = (function () { var testClass1 = (function () { function testClass1() { } - testClass1.prototype.method = function () { }; + testClass1.prototype.method = function () { + }; return testClass1; })(); var tc1 = new testClass1(); @@ -104,10 +105,15 @@ var tc2 = new testClass2(); // error: could not find symbol V var testClass3 = (function () { function testClass3() { } - testClass3.prototype.testMethod1 = function () { return null; }; // error: could not find symbol V - testClass3.testMethod2 = function () { return null; }; // error: could not find symbol V + testClass3.prototype.testMethod1 = function () { + return null; + }; // error: could not find symbol V + testClass3.testMethod2 = function () { + return null; + }; // error: could not find symbol V Object.defineProperty(testClass3.prototype, "a", { - set: function (value) { } // error: could not find symbol V + set: function (value) { + } // error: could not find symbol V , enumerable: true, configurable: true @@ -115,9 +121,12 @@ var testClass3 = (function () { return testClass3; })(); // in function return type annotation -function testFunction1() { return null; } // error: could not find symbol V +function testFunction1() { + return null; +} // error: could not find symbol V // in paramter types -function testFunction2(p) { } // error: could not find symbol V +function testFunction2(p) { +} // error: could not find symbol V // in var type annotation var f; // error: could not find symbol V // in constraints @@ -129,7 +138,8 @@ var testClass4 = (function () { var testClass6 = (function () { function testClass6() { } - testClass6.prototype.method = function () { }; // error: could not find symbol V + testClass6.prototype.method = function () { + }; // error: could not find symbol V return testClass6; })(); // in extends clause diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js index 08c184a0df2..5fd9f0e9b7f 100644 --- a/tests/baselines/reference/es6ClassTest.js +++ b/tests/baselines/reference/es6ClassTest.js @@ -112,8 +112,12 @@ var Foo = (function (_super) { this.x = x; this.gar = 5; } - Foo.prototype.bar = function () { return 0; }; - Foo.prototype.boo = function (x) { return x; }; + Foo.prototype.bar = function () { + return 0; + }; + Foo.prototype.boo = function (x) { + return x; + }; Foo.statVal = 0; return Foo; })(Bar); diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js index f23be04fd17..8ef7a2fa379 100644 --- a/tests/baselines/reference/es6ClassTest2.js +++ b/tests/baselines/reference/es6ClassTest2.js @@ -248,7 +248,9 @@ var SplatMonster = (function () { }; return SplatMonster; })(); -function foo() { return true; } +function foo() { + return true; +} var PrototypeMonster = (function () { function PrototypeMonster() { this.age = 1; @@ -300,8 +302,10 @@ var Visibility = (function () { this.x = 1; this.y = 2; } - Visibility.prototype.foo = function () { }; - Visibility.prototype.bar = function () { }; + Visibility.prototype.foo = function () { + }; + Visibility.prototype.bar = function () { + }; return Visibility; })(); var BaseClassWithConstructor = (function () { diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js index dc9f1c67154..371a983d152 100644 --- a/tests/baselines/reference/es6ClassTest3.js +++ b/tests/baselines/reference/es6ClassTest3.js @@ -22,8 +22,10 @@ var M; this.x = 1; this.y = 2; } - Visibility.prototype.foo = function () { }; - Visibility.prototype.bar = function () { }; + Visibility.prototype.foo = function () { + }; + Visibility.prototype.bar = function () { + }; return Visibility; })(); })(M || (M = {})); diff --git a/tests/baselines/reference/es6ClassTest8.js b/tests/baselines/reference/es6ClassTest8.js index f96bbd16b0b..3c616e5e893 100644 --- a/tests/baselines/reference/es6ClassTest8.js +++ b/tests/baselines/reference/es6ClassTest8.js @@ -41,7 +41,9 @@ class Camera { //// [es6ClassTest8.js] -function f1(x) { return x; } +function f1(x) { + return x; +} var C = (function () { function C() { var bar = (function () { @@ -57,11 +59,21 @@ var Vector = (function () { this.y = y; this.z = z; } - Vector.norm = function (v) { return null; }; - Vector.minus = function (v1, v2) { return null; }; - Vector.times = function (v1, v2) { return null; }; - Vector.cross = function (v1, v2) { return null; }; - Vector.dot = function (v1, v2) { return null; }; + Vector.norm = function (v) { + return null; + }; + Vector.minus = function (v1, v2) { + return null; + }; + Vector.times = function (v1, v2) { + return null; + }; + Vector.cross = function (v1, v2) { + return null; + }; + Vector.dot = function (v1, v2) { + return null; + }; return Vector; })(); var Camera = (function () { diff --git a/tests/baselines/reference/es6ClassTest9.js b/tests/baselines/reference/es6ClassTest9.js index 538fec5a2ab..d45c99d3b04 100644 --- a/tests/baselines/reference/es6ClassTest9.js +++ b/tests/baselines/reference/es6ClassTest9.js @@ -5,4 +5,5 @@ function foo() {} //// [es6ClassTest9.js] (); -function foo() { } +function foo() { +} diff --git a/tests/baselines/reference/es6MemberScoping.js b/tests/baselines/reference/es6MemberScoping.js index 7e70045ceb3..85f76a93934 100644 --- a/tests/baselines/reference/es6MemberScoping.js +++ b/tests/baselines/reference/es6MemberScoping.js @@ -30,6 +30,8 @@ var Foo = (function () { var Foo2 = (function () { function Foo2() { } - Foo2.Foo2 = function () { return 0; }; // should not be an error + 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 7051d8d2433..dd06f3bbc86 100644 --- a/tests/baselines/reference/escapedIdentifiers.js +++ b/tests/baselines/reference/escapedIdentifiers.js @@ -169,13 +169,21 @@ var classType2Object1 = new classType2(); classType2Object1.foo2 = 2; var classType2Object2 = new classType\u0032(); classType2Object2.foo2 = 2; -var interfaceType1Object1 = { bar1: 0 }; +var interfaceType1Object1 = { + bar1: 0 +}; interfaceType1Object1.bar1 = 2; -var interfaceType1Object2 = { bar1: 0 }; +var interfaceType1Object2 = { + bar1: 0 +}; interfaceType1Object2.bar1 = 2; -var interfaceType2Object1 = { bar2: 0 }; +var interfaceType2Object1 = { + bar2: 0 +}; interfaceType2Object1.bar2 = 2; -var interfaceType2Object2 = { bar2: 0 }; +var interfaceType2Object2 = { + bar2: 0 +}; interfaceType2Object2.bar2 = 2; // arguments var testClass = (function () { diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js index 707801dc4ee..ee447619bfe 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js @@ -59,7 +59,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -68,7 +70,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); var aNumber = 9.9; @@ -81,11 +85,17 @@ var aVoid = undefined; var anInterface = new C(); var aClass = new C(); var aGenericClass = new D(); -var anObjectLiteral = { id: 12 }; +var anObjectLiteral = { + id: 12 +}; var anOtherObjectLiteral = new C(); var aFunction = F; var anOtherFunction = F; -var aLambda = function (x) { return 2; }; +var aLambda = function (x) { + return 2; +}; var aModule = M; var aClassInModule = new M.A(); -var aFunctionInModule = function (x) { return 'this is a string'; }; +var aFunctionInModule = function (x) { + return 'this is a string'; +}; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js index 40e45bf7ec0..10f3fd9bf11 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js @@ -65,8 +65,12 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } -function F2(x) { return x < 42; } +function F(x) { + return 42; +} +function F2(x) { + return x < 42; +} var M; (function (M) { var A = (function () { @@ -75,7 +79,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); var N; @@ -86,7 +92,9 @@ var N; return A; })(); N.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } N.F2 = F2; })(N || (N = {})); var aNumber = 'this is a string'; @@ -96,11 +104,15 @@ var aVoid = 9.9; var anInterface = new D(); var aClass = new D(); var aGenericClass = new C(); -var anObjectLiteral = { id: 'a string' }; +var anObjectLiteral = { + id: 'a string' +}; var anOtherObjectLiteral = new C(); var aFunction = F2; var anOtherFunction = F2; -var aLambda = function (x) { return 'a string'; }; +var aLambda = function (x) { + return 'a string'; +}; var aModule = N; var aClassInModule = new N.A(); var aFunctionInModule = F2; diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js index aae0a9fe291..aafefcc5777 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.js +++ b/tests/baselines/reference/everyTypeWithInitializer.js @@ -60,7 +60,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -69,7 +71,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); var aNumber = 9.9; @@ -81,9 +85,13 @@ var anOtherAny = new C(); var anUndefined = undefined; var aClass = new C(); var aGenericClass = new D(); -var anObjectLiteral = { id: 12 }; +var anObjectLiteral = { + id: 12 +}; var aFunction = F; -var aLambda = function (x) { return 2; }; +var aLambda = function (x) { + return 2; +}; var aModule = M; var aClassInModule = new M.A(); var aFunctionInModule = M.F2; diff --git a/tests/baselines/reference/exportAlreadySeen.js b/tests/baselines/reference/exportAlreadySeen.js index 68d30a697fd..e18c0bbf7f6 100644 --- a/tests/baselines/reference/exportAlreadySeen.js +++ b/tests/baselines/reference/exportAlreadySeen.js @@ -23,7 +23,8 @@ declare module A { var M; (function (M) { M.x = 1; - function f() { } + function f() { + } M.f = f; var N; (function (N) { diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js index e898f798a7c..d4b74659dcc 100644 --- a/tests/baselines/reference/exportAssignTypes.js +++ b/tests/baselines/reference/exportAssignTypes.js @@ -63,10 +63,16 @@ module.exports = x; var x = true; module.exports = x; //// [expArray.js] -var x = [1, 2]; +var x = [ + 1, + 2 +]; module.exports = x; //// [expObject.js] -var x = { answer: 42, when: 1776 }; +var x = { + answer: 42, + when: 1776 +}; module.exports = x; //// [expAny.js] var x; diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index b62cc8251be..e9742812469 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -24,5 +24,8 @@ module.exports = Foo; //// [foo_1.js] var foo = require("./foo_0"); var x = new foo(true); // Should error -var y = new foo({ a: "test", b: 42 }); // Should be OK +var y = new foo({ + a: "test", + b: 42 +}); // Should be OK var z = y.test.b; diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js index 825d0f983ea..6d4336bd4bd 100644 --- a/tests/baselines/reference/exportAssignmentFunction.js +++ b/tests/baselines/reference/exportAssignmentFunction.js @@ -12,7 +12,9 @@ var n: number = fooFunc(); //// [exportAssignmentFunction_A.js] define(["require", "exports"], function (require, exports) { - function foo() { return 0; } + function foo() { + return 0; + } return foo; }); //// [exportAssignmentFunction_B.js] diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js index f99d7f3a465..fbcb99bc642 100644 --- a/tests/baselines/reference/exportAssignmentMergedInterface.js +++ b/tests/baselines/reference/exportAssignmentMergedInterface.js @@ -31,7 +31,11 @@ define(["require", "exports"], function (require, exports) { x("test"); x(42); var y = x.b; - if (!!x.c) { } - var z = { x: 1, y: 2 }; + if (!!x.c) { + } + var z = { + x: 1, + y: 2 + }; z = x.d; }); diff --git a/tests/baselines/reference/exportCodeGen.js b/tests/baselines/reference/exportCodeGen.js index 30ed0b07ae9..1b1f934b2f9 100644 --- a/tests/baselines/reference/exportCodeGen.js +++ b/tests/baselines/reference/exportCodeGen.js @@ -94,7 +94,8 @@ var E; Color[Color["Red"] = 0] = "Red"; })(E.Color || (E.Color = {})); var Color = E.Color; - function fn() { } + function fn() { + } E.fn = fn; var C = (function () { function C() { @@ -115,7 +116,8 @@ var F; (function (Color) { Color[Color["Red"] = 0] = "Red"; })(Color || (Color = {})); - function fn() { } + function fn() { + } var C = (function () { function C() { } diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index 10909808ffc..225b605f689 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -14,7 +14,9 @@ lib.math.add(3, 4); // Shouldnt be error //// [exportImportMultipleFiles_math.js] define(["require", "exports"], function (require, exports) { - function add(a, b) { return a + b; } + function add(a, b) { + return a + b; + } exports.add = add; }); //// [exportImportMultipleFiles_library.js] diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.js b/tests/baselines/reference/exportImportNonInstantiatedModule.js index d9081efcd36..720fbfafc61 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule.js @@ -14,4 +14,6 @@ var x: B.A1.I = { x: 1 }; var B; (function (B) { })(B || (B = {})); -var x = { x: 1 }; +var x = { + x: 1 +}; diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 2782a6f6f67..575271dba30 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -24,7 +24,9 @@ define(["require", "exports"], function (require, exports) { //// [consumer.js] define(["require", "exports"], function (require, exports) { function w() { - return { name: 'value' }; + return { + name: 'value' + }; } exports.w = w; }); diff --git a/tests/baselines/reference/exportNonVisibleType.js b/tests/baselines/reference/exportNonVisibleType.js index 101c356d582..edd0e6988d4 100644 --- a/tests/baselines/reference/exportNonVisibleType.js +++ b/tests/baselines/reference/exportNonVisibleType.js @@ -36,7 +36,10 @@ export = C1; // Should work, private type I1 of visible class C1 only used in pr //// [foo1.js] -var x = { a: "test", b: 42 }; +var x = { + a: "test", + b: 42 +}; module.exports = x; //// [foo2.js] var C1 = (function () { diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js index 11ccc037ef6..96acc83edb5 100644 --- a/tests/baselines/reference/exportPrivateType.js +++ b/tests/baselines/reference/exportPrivateType.js @@ -41,7 +41,9 @@ var foo; var C2 = (function () { function C2() { } - C2.prototype.test = function () { return true; }; + C2.prototype.test = function () { + return true; + }; return C2; })(); // None of the types are exported, so per section 10.3, should all be errors diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js index 39eea8d34b5..d1039e0db43 100644 --- a/tests/baselines/reference/exportedVariable1.js +++ b/tests/baselines/reference/exportedVariable1.js @@ -5,6 +5,8 @@ var upper = foo.name.toUpperCase(); //// [exportedVariable1.js] define(["require", "exports"], function (require, exports) { - exports.foo = { name: "Bill" }; + exports.foo = { + name: "Bill" + }; var upper = exports.foo.name.toUpperCase(); }); diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.js b/tests/baselines/reference/extendAndImplementTheSameBaseType.js index 23c9127175e..836db4dc362 100644 --- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js +++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js @@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); var D = (function (_super) { @@ -31,7 +32,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.baz = function () { }; + D.prototype.baz = function () { + }; return D; })(C); var c; diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js index 234cc59ff70..8311f4d6ce6 100644 --- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js +++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js @@ -36,7 +36,8 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.baz = function () { }; + D.prototype.baz = function () { + }; return D; })(C); var d = new D(); diff --git a/tests/baselines/reference/extendArray.js b/tests/baselines/reference/extendArray.js index 6d5c0262209..7809aa6bb25 100644 --- a/tests/baselines/reference/extendArray.js +++ b/tests/baselines/reference/extendArray.js @@ -24,8 +24,12 @@ arr.collect = function (fn) { //// [extendArray.js] -var a = [1, 2]; -a.forEach(function (v, i, a) { }); +var a = [ + 1, + 2 +]; +a.forEach(function (v, i, a) { +}); var arr = Array.prototype; arr.collect = function (fn) { var res = []; diff --git a/tests/baselines/reference/extendNonClassSymbol1.js b/tests/baselines/reference/extendNonClassSymbol1.js index 26f0c776dd8..47a602aefaf 100644 --- a/tests/baselines/reference/extendNonClassSymbol1.js +++ b/tests/baselines/reference/extendNonClassSymbol1.js @@ -13,7 +13,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var x = A; diff --git a/tests/baselines/reference/extendsClauseAlreadySeen.js b/tests/baselines/reference/extendsClauseAlreadySeen.js index 820a6910962..5c328e39131 100644 --- a/tests/baselines/reference/extendsClauseAlreadySeen.js +++ b/tests/baselines/reference/extendsClauseAlreadySeen.js @@ -23,6 +23,7 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.baz = function () { }; + D.prototype.baz = function () { + }; return D; })(C); diff --git a/tests/baselines/reference/extendsClauseAlreadySeen2.js b/tests/baselines/reference/extendsClauseAlreadySeen2.js index ad88446c4c4..3f3b7049311 100644 --- a/tests/baselines/reference/extendsClauseAlreadySeen2.js +++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js @@ -23,6 +23,7 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.baz = function () { }; + D.prototype.baz = function () { + }; return D; })(C); diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js index 719b68451ae..0dc3d8e84cd 100644 --- a/tests/baselines/reference/externModule.js +++ b/tests/baselines/reference/externModule.js @@ -42,7 +42,8 @@ n=XDate.UTC(1964,2,1); //// [externModule.js] declare; module; -{ } +{ +} var XDate = (function () { function XDate() { } diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index f9c83c83cf0..73ef9b6b296 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -10,7 +10,8 @@ file1.foo(); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js] define(["require", "exports"], function (require, exports) { - function foo() { } + function foo() { + } exports.foo = foo; ; }); diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index f1d1d9fb561..edbdf6b90a5 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -19,7 +19,8 @@ file1.bar(); //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js] //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js] -function foo() { } +function foo() { +} exports.foo = foo; ; //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js] diff --git a/tests/baselines/reference/fatArrowfunctionAsType.js b/tests/baselines/reference/fatArrowfunctionAsType.js index 894267580c6..bd2dc4310d9 100644 --- a/tests/baselines/reference/fatArrowfunctionAsType.js +++ b/tests/baselines/reference/fatArrowfunctionAsType.js @@ -7,5 +7,7 @@ b = c; //// [fatArrowfunctionAsType.js] -var c = function (x) { return 42; }; +var c = function (x) { + return 42; +}; b = c; diff --git a/tests/baselines/reference/fatarrowfunctions.js b/tests/baselines/reference/fatarrowfunctions.js index eb57d1a9817..1c74f39bed5 100644 --- a/tests/baselines/reference/fatarrowfunctions.js +++ b/tests/baselines/reference/fatarrowfunctions.js @@ -49,30 +49,70 @@ var messenger = { function foo(x) { return x(); } -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function () { return 0; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function (x, y, z) { return x + y + z; }); -foo(function () { return 0; }); -foo((function (x) { return x; })); -foo(function (x) { return x * x; }); -var y = function (x) { return x * x; }; -var z = function (x) { return x * x; }; -var w = function () { return 3; }; +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function () { + return 0; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function (x, y, z) { + return x + y + z; +}); +foo(function () { + return 0; +}); +foo((function (x) { + return x; +})); +foo(function (x) { + return x * x; +}); +var y = function (x) { + return x * x; +}; +var z = function (x) { + return x * x; +}; +var w = function () { + return 3; +}; function ternaryTest(isWhile) { - var f = isWhile ? function (n) { return n > 0; } : function (n) { return n === 0; }; + var f = isWhile ? function (n) { + return n > 0; + } : function (n) { + return n === 0; + }; } var messenger = { message: "Hello World", start: function () { var _this = this; - setTimeout(function () { _this.message.toString(); }, 3000); + setTimeout(function () { + _this.message.toString(); + }, 3000); } }; diff --git a/tests/baselines/reference/fatarrowfunctionsErrors.js b/tests/baselines/reference/fatarrowfunctionsErrors.js index 2ac20f1966a..56fd91f3d1c 100644 --- a/tests/baselines/reference/fatarrowfunctionsErrors.js +++ b/tests/baselines/reference/fatarrowfunctionsErrors.js @@ -20,19 +20,28 @@ foo(function () { } return 0; }); -foo((1), { return: 0 }); -foo(function (x) { return x; }); +foo((1), { + return: 0 +}); +foo(function (x) { + return x; +}); foo(function (x) { if (x === void 0) { x = 0; } return x; }); var y = x, number; x * x; -false ? (function () { return null; }) : null; +false ? (function () { + return null; +}) : null; // missing fatarrow -var x1 = function () { }; -var x2 = function (a) { }; -var x3 = function (a) { }; +var x1 = function () { +}; +var x2 = function (a) { +}; +var x3 = function (a) { +}; var x4 = function () { var a = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.js b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.js index d73eec12bcd..e5c8134a4bb 100644 --- a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.js +++ b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.js @@ -12,7 +12,9 @@ fn.call(4); // Should be 4 //// [fatarrowfunctionsInFunctionParameterDefaults.js] function fn(x, y) { var _this = this; - if (x === void 0) { x = function () { return _this; }; } + if (x === void 0) { x = function () { + return _this; + }; } if (y === void 0) { y = x(); } // should be 4 return y; diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js index e6e43f8bbf4..bdd80477162 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js @@ -134,27 +134,39 @@ foo( //// [fatarrowfunctionsOptionalArgs.js] // valid // no params -(function () { return 1; }); +(function () { + return 1; +}); // one param, no type -(function (arg) { return 2; }); +(function (arg) { + return 2; +}); // one param, no type -(function (arg) { return 2; }); +(function (arg) { + return 2; +}); // one param, no type with default value (function (arg) { if (arg === void 0) { arg = 1; } return 3; }); // one param, no type, optional -(function (arg) { return 4; }); +(function (arg) { + return 4; +}); // typed param -(function (arg) { return 5; }); +(function (arg) { + return 5; +}); // typed param with default value (function (arg) { if (arg === void 0) { arg = 0; } return 6; }); // optional param -(function (arg) { return 7; }); +(function (arg) { + return 7; +}); // var arg param (function () { var arg = []; @@ -164,20 +176,28 @@ foo( return 8; }); // multiple arguments -(function (arg1, arg2) { return 12; }); +(function (arg1, arg2) { + return 12; +}); (function (arg1, arg2) { if (arg1 === void 0) { arg1 = 1; } if (arg2 === void 0) { arg2 = 3; } return 13; }); -(function (arg1, arg2) { return 14; }); -(function (arg1, arg2) { return 15; }); +(function (arg1, arg2) { + return 14; +}); +(function (arg1, arg2) { + return 15; +}); (function (arg1, arg2) { if (arg1 === void 0) { arg1 = 0; } if (arg2 === void 0) { arg2 = 1; } return 16; }); -(function (arg1, arg2) { return 17; }); +(function (arg1, arg2) { + return 17; +}); (function (arg1) { var arg2 = []; for (var _i = 1; _i < arguments.length; _i++) { @@ -185,21 +205,33 @@ foo( } return 18; }); -(function (arg1, arg2) { return 19; }); +(function (arg1, arg2) { + return 19; +}); // in paren -(function () { return 21; }); -(function (arg) { return 22; }); +(function () { + return 21; +}); +(function (arg) { + return 22; +}); (function (arg) { if (arg === void 0) { arg = 1; } return 23; }); -(function (arg) { return 24; }); -(function (arg) { return 25; }); +(function (arg) { + return 24; +}); +(function (arg) { + return 25; +}); (function (arg) { if (arg === void 0) { arg = 0; } return 26; }); -(function (arg) { return 27; }); +(function (arg) { + return 27; +}); (function () { var arg = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -208,17 +240,29 @@ foo( return 28; }); // in multiple paren -((((function (arg) { return 32; })))); +((((function (arg) { + return 32; +})))); // in ternary exression -false ? function () { return 41; } : null; -false ? function (arg) { return 42; } : null; +false ? function () { + return 41; +} : null; +false ? function (arg) { + return 42; +} : null; false ? function (arg) { if (arg === void 0) { arg = 1; } return 43; } : null; -false ? function (arg) { return 44; } : null; -false ? function (arg) { return 45; } : null; -false ? function (arg) { return 46; } : null; +false ? function (arg) { + return 44; +} : null; +false ? function (arg) { + return 45; +} : null; +false ? function (arg) { + return 46; +} : null; false ? function (arg) { if (arg === void 0) { arg = 0; } return 47; @@ -231,15 +275,25 @@ false ? function () { return 48; } : null; // in ternary exression within paren -false ? (function () { return 51; }) : null; -false ? (function (arg) { return 52; }) : null; +false ? (function () { + return 51; +}) : null; +false ? (function (arg) { + return 52; +}) : null; false ? (function (arg) { if (arg === void 0) { arg = 1; } return 53; }) : null; -false ? (function (arg) { return 54; }) : null; -false ? (function (arg) { return 55; }) : null; -false ? (function (arg) { return 56; }) : null; +false ? (function (arg) { + return 54; +}) : null; +false ? (function (arg) { + return 55; +}) : null; +false ? (function (arg) { + return 56; +}) : null; false ? (function (arg) { if (arg === void 0) { arg = 0; } return 57; @@ -252,15 +306,25 @@ false ? (function () { return 58; }) : null; // ternary exression's else clause -false ? null : function () { return 61; }; -false ? null : function (arg) { return 62; }; +false ? null : function () { + return 61; +}; +false ? null : function (arg) { + return 62; +}; false ? null : function (arg) { if (arg === void 0) { arg = 1; } return 63; }; -false ? null : function (arg) { return 64; }; -false ? null : function (arg) { return 65; }; -false ? null : function (arg) { return 66; }; +false ? null : function (arg) { + return 64; +}; +false ? null : function (arg) { + return 65; +}; +false ? null : function (arg) { + return 66; +}; false ? null : function (arg) { if (arg === void 0) { arg = 0; } return 67; @@ -273,24 +337,48 @@ false ? null : function () { return 68; }; // nested ternary expressions -(function (a) { return a; }) ? function (b) { return b; } : function (c) { return c; }; +(function (a) { + return a; +}) ? function (b) { + return b; +} : function (c) { + return c; +}; //multiple levels -(function (a) { return a; }); -(function (b) { return function (c) { return 81; }; }); -(function (c) { return function (d) { return 82; }; }); +(function (a) { + return a; +}); +(function (b) { + return function (c) { + return 81; + }; +}); +(function (c) { + return function (d) { + return 82; + }; +}); // In Expressions -(function (arg) { return 90; }) instanceof Function; +(function (arg) { + return 90; +}) instanceof Function; (function (arg) { if (arg === void 0) { arg = 1; } return 91; }) instanceof Function; -(function (arg) { return 92; }) instanceof Function; -(function (arg) { return 93; }) instanceof Function; +(function (arg) { + return 92; +}) instanceof Function; +(function (arg) { + return 93; +}) instanceof Function; (function (arg) { if (arg === void 0) { arg = 1; } return 94; }) instanceof Function; -(function (arg) { return 95; }) instanceof Function; +(function (arg) { + return 95; +}) instanceof Function; (function () { var arg = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -298,8 +386,14 @@ false ? null : function () { } return 96; }) instanceof Function; -'' + (function (arg) { return 100; }); -(function (arg) { return 0; }) + '' + (function (arg) { return 101; }); +'' + (function (arg) { + return 100; +}); +(function (arg) { + return 0; +}) + '' + (function (arg) { + return 101; +}); (function (arg) { if (arg === void 0) { arg = 1; } return 0; @@ -307,8 +401,16 @@ false ? null : function () { if (arg === void 0) { arg = 2; } return 102; }); -(function (arg) { return 0; }) + '' + (function (arg) { return 103; }); -(function (arg) { return 0; }) + '' + (function (arg) { return 104; }); +(function (arg) { + return 0; +}) + '' + (function (arg) { + return 103; +}); +(function (arg) { + return 0; +}) + '' + (function (arg) { + return 104; +}); (function (arg) { if (arg === void 0) { arg = 1; } return 0; @@ -336,7 +438,11 @@ false ? null : function () { } return 107; }); -(function (arg1, arg2) { return 0; }) + '' + (function (arg1, arg2) { return 108; }); +(function (arg1, arg2) { + return 0; +}) + '' + (function (arg1, arg2) { + return 108; +}); (function (arg1) { var arg2 = []; for (var _i = 1; _i < arguments.length; _i++) { @@ -357,9 +463,19 @@ function foo() { arg[_i - 0] = arguments[_i]; } } -foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) { +foo(function (a) { + return 110; +}, (function (a) { + return 111; +}), function (a) { return 112; -}, function (a) { return 113; }, function (a, b) { return 114; }, function (a) { return 115; }, function (a) { +}, function (a) { + return 113; +}, function (a, b) { + return 114; +}, function (a) { + return 115; +}, function (a) { if (a === void 0) { a = 0; } return 116; }, function (a) { @@ -381,4 +497,14 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) { c[_i - 2] = arguments[_i]; } return 120; -}, function (a) { return function (b) { return function (c) { return 121; }; }; }, false ? function (a) { return 0; } : function (b) { return 122; }); +}, function (a) { + return function (b) { + return function (c) { + return 121; + }; + }; +}, false ? function (a) { + return 0; +} : function (b) { + return 122; +}); diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js index 428a085ca56..0ee54452a9b 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js @@ -8,7 +8,9 @@ (arg1 = 1, arg2) => 1; //// [fatarrowfunctionsOptionalArgsErrors1.js] -(function (arg1, arg2) { return 101; }); +(function (arg1, arg2) { + return 101; +}); (function () { var arg = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js index dfd7e9f74dc..e6628081064 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js @@ -42,9 +42,19 @@ false ? null : function (arg) { if (arg === void 0) { arg = 2; } return 106; }); -foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) { +foo(function (a) { + return 110; +}, (function (a) { + return 111; +}), function (a) { return 112; -}, function (a) { return 113; }, function (a, b) { return 114; }, function (a) { return 115; }, function (a) { +}, function (a) { + return 113; +}, function (a, b) { + return 114; +}, function (a) { + return 115; +}, function (a) { if (a === void 0) { a = 0; } return 116; }, function (a) { @@ -66,4 +76,14 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) { c[_i - 2] = arguments[_i]; } return 120; -}, function (a) { return function (b) { return function (c) { return 121; }; }; }, false ? function (a) { return 0; } : function (b) { return 122; }); +}, function (a) { + return function (b) { + return function (c) { + return 121; + }; + }; +}, false ? function (a) { + return 0; +} : function (b) { + return 122; +}); diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index ddd95b9e8f2..64129ff9365 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -10,7 +10,9 @@ define(["require", "exports"], function (require, exports) { function C() { } Object.defineProperty(C.prototype, "x", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.js b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.js index dea003057c4..d8521e56a14 100644 --- a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.js +++ b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.js @@ -3,5 +3,6 @@ function bar(item1: T, item2: T) { } bar(1, ""); // Should be ok //// [fixTypeParameterInSignatureWithRestParameters.js] -function bar(item1, item2) { } +function bar(item1, item2) { +} bar(1, ""); // Should be ok diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js index 32e1389232d..08ef1dbcccd 100644 --- a/tests/baselines/reference/for-inStatements.js +++ b/tests/baselines/reference/for-inStatements.js @@ -88,38 +88,71 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; var aString; -for (aString in {}) { } +for (aString in {}) { +} var anAny; -for (anAny in {}) { } -for (var x in {}) { } -for (var x in []) { } -for (var x in [1, 2, 3, 4, 5]) { } -function fn() { } -for (var x in fn()) { } -for (var x in /[a-z]/) { } -for (var x in new Date()) { } +for (anAny in {}) { +} +for (var x in {}) { +} +for (var x in []) { +} +for (var x in [ + 1, + 2, + 3, + 4, + 5 +]) { +} +function fn() { +} +for (var x in fn()) { +} +for (var x in /[a-z]/) { +} +for (var x in new Date()) { +} var c, d, e; -for (var x in c || d) { } -for (var x in e ? c : d) { } -for (var x in 42 ? c : d) { } -for (var x in '' ? c : d) { } -for (var x in 42 ? d[x] : c[x]) { } -for (var x in c[d]) { } -for (var x in (function (x) { return x; })) { } -for (var x in function (x, y) { return x + y; }) { } +for (var x in c || d) { +} +for (var x in e ? c : d) { +} +for (var x in 42 ? c : d) { +} +for (var x in '' ? c : d) { +} +for (var x in 42 ? d[x] : c[x]) { +} +for (var x in c[d]) { +} +for (var x in (function (x) { + return x; +})) { +} +for (var x in function (x, y) { + return x + y; +}) { +} var A = (function () { function A() { } A.prototype.biz = function () { - for (var x in this.biz()) { } - for (var x in this.biz) { } - for (var x in this) { } + for (var x in this.biz()) { + } + for (var x in this.biz) { + } + for (var x in this) { + } return null; }; A.baz = function () { - for (var x in this) { } - for (var x in this.baz) { } - for (var x in this.baz()) { } + for (var x in this) { + } + for (var x in this.baz) { + } + for (var x in this.baz()) { + } return null; }; return A; @@ -130,17 +163,23 @@ var B = (function (_super) { _super.apply(this, arguments); } B.prototype.boz = function () { - for (var x in this.biz()) { } - for (var x in this.biz) { } - for (var x in this) { } - for (var x in _super.prototype.biz) { } - for (var x in _super.prototype.biz.call(this)) { } + for (var x in this.biz()) { + } + for (var x in this.biz) { + } + for (var x in this) { + } + for (var x in _super.prototype.biz) { + } + for (var x in _super.prototype.biz.call(this)) { + } return null; }; return B; })(A); var i; -for (var x in i[42]) { } +for (var x in i[42]) { +} var M; (function (M) { var X = (function () { @@ -150,12 +189,16 @@ var M; })(); M.X = X; })(M || (M = {})); -for (var x in M) { } -for (var x in M.X) { } +for (var x in M) { +} +for (var x in M.X) { +} var Color; (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Blue"] = 1] = "Blue"; })(Color || (Color = {})); -for (var x in Color) { } -for (var x in 1 /* Blue */) { } +for (var x in Color) { +} +for (var x in 1 /* Blue */) { +} diff --git a/tests/baselines/reference/for-inStatementsDestructuring.js b/tests/baselines/reference/for-inStatementsDestructuring.js index e5e00d5b3ab..25a696f9fc5 100644 --- a/tests/baselines/reference/for-inStatementsDestructuring.js +++ b/tests/baselines/reference/for-inStatementsDestructuring.js @@ -2,4 +2,5 @@ for (var [a, b] in []) {} //// [for-inStatementsDestructuring.js] -for (var _a = void 0, a = _a[0], b = _a[1] in []) { } +for (var _a = void 0, a = _a[0], b = _a[1] in []) { +} diff --git a/tests/baselines/reference/for-inStatementsDestructuring2.js b/tests/baselines/reference/for-inStatementsDestructuring2.js index 41a6d30919f..7051a5a058a 100644 --- a/tests/baselines/reference/for-inStatementsDestructuring2.js +++ b/tests/baselines/reference/for-inStatementsDestructuring2.js @@ -2,4 +2,5 @@ for (var {a, b} in []) {} //// [for-inStatementsDestructuring2.js] -for (var _a = void 0, a = _a.a, b = _a.b in []) { } +for (var _a = void 0, a = _a.a, b = _a.b in []) { +} diff --git a/tests/baselines/reference/for-inStatementsDestructuring3.js b/tests/baselines/reference/for-inStatementsDestructuring3.js index 0970740acab..2784e48708b 100644 --- a/tests/baselines/reference/for-inStatementsDestructuring3.js +++ b/tests/baselines/reference/for-inStatementsDestructuring3.js @@ -4,4 +4,8 @@ for ([a, b] in []) { } //// [for-inStatementsDestructuring3.js] var a, b; -for ([a, b] in []) { } +for ([ + a, + b +] in []) { +} diff --git a/tests/baselines/reference/for-inStatementsDestructuring4.js b/tests/baselines/reference/for-inStatementsDestructuring4.js index 0cce61ac96d..6eb56960240 100644 --- a/tests/baselines/reference/for-inStatementsDestructuring4.js +++ b/tests/baselines/reference/for-inStatementsDestructuring4.js @@ -4,4 +4,8 @@ for ({a, b} in []) { } //// [for-inStatementsDestructuring4.js] var a, b; -for ({ a: a, b: b } in []) { } +for ({ + a: a, + b: b +} in []) { +} diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js index 6d42a550a01..a485c8ba7ce 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.js +++ b/tests/baselines/reference/for-inStatementsInvalid.js @@ -71,36 +71,60 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; var aNumber; -for (aNumber in {}) { } +for (aNumber in {}) { +} var aBoolean; -for (aBoolean in {}) { } +for (aBoolean in {}) { +} var aRegExp; -for (aRegExp in {}) { } -for (var idx in {}) { } -function fn() { } -for (var x in fn()) { } +for (aRegExp in {}) { +} +for (var idx in {}) { +} +function fn() { +} +for (var x in fn()) { +} var c, d, e; -for (var x in c || d) { } -for (var x in e ? c : d) { } -for (var x in 42 ? c : d) { } -for (var x in '' ? c : d) { } -for (var x in 42 ? d[x] : c[x]) { } -for (var x in c[23]) { } -for (var x in (function (x) { return x; })) { } -for (var x in function (x, y) { return x + y; }) { } +for (var x in c || d) { +} +for (var x in e ? c : d) { +} +for (var x in 42 ? c : d) { +} +for (var x in '' ? c : d) { +} +for (var x in 42 ? d[x] : c[x]) { +} +for (var x in c[23]) { +} +for (var x in (function (x) { + return x; +})) { +} +for (var x in function (x, y) { + return x + y; +}) { +} var A = (function () { function A() { } A.prototype.biz = function () { - for (var x in this.biz()) { } - for (var x in this.biz) { } - for (var x in this) { } + for (var x in this.biz()) { + } + for (var x in this.biz) { + } + for (var x in this) { + } return null; }; A.baz = function () { - for (var x in this) { } - for (var x in this.baz) { } - for (var x in this.baz()) { } + for (var x in this) { + } + for (var x in this.baz) { + } + for (var x in this.baz()) { + } return null; }; return A; @@ -111,14 +135,20 @@ var B = (function (_super) { _super.apply(this, arguments); } B.prototype.boz = function () { - for (var x in this.biz()) { } - for (var x in this.biz) { } - for (var x in this) { } - for (var x in _super.prototype.biz) { } - for (var x in _super.prototype.biz.call(this)) { } + for (var x in this.biz()) { + } + for (var x in this.biz) { + } + for (var x in this) { + } + for (var x in _super.prototype.biz) { + } + for (var x in _super.prototype.biz.call(this)) { + } return null; }; return B; })(A); var i; -for (var x in i[42]) { } +for (var x in i[42]) { +} diff --git a/tests/baselines/reference/for-of1.js b/tests/baselines/reference/for-of1.js index 9df6a96d78f..fb74d6ecede 100644 --- a/tests/baselines/reference/for-of1.js +++ b/tests/baselines/reference/for-of1.js @@ -4,4 +4,5 @@ for (v of []) { } //// [for-of1.js] var v; -for (v of []) { } +for (v of []) { +} diff --git a/tests/baselines/reference/for-of10.js b/tests/baselines/reference/for-of10.js index 7fd05f5479b..3b01719417f 100644 --- a/tests/baselines/reference/for-of10.js +++ b/tests/baselines/reference/for-of10.js @@ -4,4 +4,7 @@ for (v of [0]) { } //// [for-of10.js] var v; -for (v of [0]) { } +for (v of [ + 0 +]) { +} diff --git a/tests/baselines/reference/for-of11.js b/tests/baselines/reference/for-of11.js index 055ed0039dc..58486c477e7 100644 --- a/tests/baselines/reference/for-of11.js +++ b/tests/baselines/reference/for-of11.js @@ -4,4 +4,8 @@ for (v of [0, ""]) { } //// [for-of11.js] var v; -for (v of [0, ""]) { } +for (v of [ + 0, + "" +]) { +} diff --git a/tests/baselines/reference/for-of12.js b/tests/baselines/reference/for-of12.js index 6185ca8e331..f489eaa40f9 100644 --- a/tests/baselines/reference/for-of12.js +++ b/tests/baselines/reference/for-of12.js @@ -4,4 +4,8 @@ for (v of [0, ""].values()) { } //// [for-of12.js] var v; -for (v of [0, ""].values()) { } +for (v of [ + 0, + "" +].values()) { +} diff --git a/tests/baselines/reference/for-of13.js b/tests/baselines/reference/for-of13.js index e66668f1736..87d908b42b8 100644 --- a/tests/baselines/reference/for-of13.js +++ b/tests/baselines/reference/for-of13.js @@ -4,4 +4,7 @@ for (v of [""].values()) { } //// [for-of13.js] var v; -for (v of [""].values()) { } +for (v of [ + "" +].values()) { +} diff --git a/tests/baselines/reference/for-of14.js b/tests/baselines/reference/for-of14.js index d5f9e29b766..65ac7119fb6 100644 --- a/tests/baselines/reference/for-of14.js +++ b/tests/baselines/reference/for-of14.js @@ -10,7 +10,8 @@ class StringIterator { //// [for-of14.js] var v; -for (v of new StringIterator) { } // Should fail because the iterator is not iterable +for (v of new StringIterator) { +} // Should fail because the iterator is not iterable var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of15.js b/tests/baselines/reference/for-of15.js index 36955389756..74e34c2b2ae 100644 --- a/tests/baselines/reference/for-of15.js +++ b/tests/baselines/reference/for-of15.js @@ -13,7 +13,8 @@ class StringIterator { //// [for-of15.js] var v; -for (v of new StringIterator) { } // Should fail +for (v of new StringIterator) { +} // Should fail var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of16.js b/tests/baselines/reference/for-of16.js index 21ba2adb75c..526dc277be7 100644 --- a/tests/baselines/reference/for-of16.js +++ b/tests/baselines/reference/for-of16.js @@ -10,7 +10,8 @@ class StringIterator { //// [for-of16.js] var v; -for (v of new StringIterator) { } // Should fail +for (v of new StringIterator) { +} // Should fail var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of17.js b/tests/baselines/reference/for-of17.js index 5c56cdab445..268ead7ee18 100644 --- a/tests/baselines/reference/for-of17.js +++ b/tests/baselines/reference/for-of17.js @@ -16,7 +16,8 @@ class NumberIterator { //// [for-of17.js] var v; -for (v of new NumberIterator) { } // Should succeed +for (v of new NumberIterator) { +} // Should succeed var NumberIterator = (function () { function NumberIterator() { } diff --git a/tests/baselines/reference/for-of18.js b/tests/baselines/reference/for-of18.js index 57168d9bf07..3be876409dc 100644 --- a/tests/baselines/reference/for-of18.js +++ b/tests/baselines/reference/for-of18.js @@ -16,7 +16,8 @@ class StringIterator { //// [for-of18.js] var v; -for (v of new StringIterator) { } // Should succeed +for (v of new StringIterator) { +} // Should succeed var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of2.js b/tests/baselines/reference/for-of2.js index d7eceb7c49e..49d3f76746a 100644 --- a/tests/baselines/reference/for-of2.js +++ b/tests/baselines/reference/for-of2.js @@ -4,4 +4,5 @@ for (v of []) { } //// [for-of2.js] const v; -for (v of []) { } +for (v of []) { +} diff --git a/tests/baselines/reference/for-of24.js b/tests/baselines/reference/for-of24.js index b4918519603..bb605011ef6 100644 --- a/tests/baselines/reference/for-of24.js +++ b/tests/baselines/reference/for-of24.js @@ -5,4 +5,5 @@ for (var v of x) { } //// [for-of24.js] var x; -for (var v of x) { } +for (var v of x) { +} diff --git a/tests/baselines/reference/for-of25.js b/tests/baselines/reference/for-of25.js index 21b5ce1408b..86c175f861e 100644 --- a/tests/baselines/reference/for-of25.js +++ b/tests/baselines/reference/for-of25.js @@ -10,7 +10,8 @@ class StringIterator { //// [for-of25.js] var x; -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of26.js b/tests/baselines/reference/for-of26.js index a45492a81c0..edb6b4c38b2 100644 --- a/tests/baselines/reference/for-of26.js +++ b/tests/baselines/reference/for-of26.js @@ -13,7 +13,8 @@ class StringIterator { //// [for-of26.js] var x; -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of27.js b/tests/baselines/reference/for-of27.js index 91e1e7194c1..379b95c5b09 100644 --- a/tests/baselines/reference/for-of27.js +++ b/tests/baselines/reference/for-of27.js @@ -6,7 +6,8 @@ class StringIterator { } //// [for-of27.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of28.js b/tests/baselines/reference/for-of28.js index 06029e6bb08..79b1590e12f 100644 --- a/tests/baselines/reference/for-of28.js +++ b/tests/baselines/reference/for-of28.js @@ -9,7 +9,8 @@ class StringIterator { } //// [for-of28.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of29.js b/tests/baselines/reference/for-of29.js index 450cafbde85..c369731bee0 100644 --- a/tests/baselines/reference/for-of29.js +++ b/tests/baselines/reference/for-of29.js @@ -8,4 +8,5 @@ for (var v of iterableWithOptionalIterator) { } //// [for-of29.js] var iterableWithOptionalIterator; -for (var v of iterableWithOptionalIterator) { } +for (var v of iterableWithOptionalIterator) { +} diff --git a/tests/baselines/reference/for-of3.js b/tests/baselines/reference/for-of3.js index 7ef27187702..f47802dac6b 100644 --- a/tests/baselines/reference/for-of3.js +++ b/tests/baselines/reference/for-of3.js @@ -4,4 +4,5 @@ for (v++ of []) { } //// [for-of3.js] var v; -for (v++ of []) { } +for (v++ of []) { +} diff --git a/tests/baselines/reference/for-of30.js b/tests/baselines/reference/for-of30.js index 4618dae5ff6..759c7823e63 100644 --- a/tests/baselines/reference/for-of30.js +++ b/tests/baselines/reference/for-of30.js @@ -17,7 +17,8 @@ class StringIterator { } //// [for-of30.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { this.return = 0; diff --git a/tests/baselines/reference/for-of31.js b/tests/baselines/reference/for-of31.js index 588c75a1145..6773c8a3452 100644 --- a/tests/baselines/reference/for-of31.js +++ b/tests/baselines/reference/for-of31.js @@ -15,7 +15,8 @@ class StringIterator { } //// [for-of31.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of32.js b/tests/baselines/reference/for-of32.js index d25d16fbebe..bce2097e3ca 100644 --- a/tests/baselines/reference/for-of32.js +++ b/tests/baselines/reference/for-of32.js @@ -2,4 +2,5 @@ for (var v of v) { } //// [for-of32.js] -for (var v of v) { } +for (var v of v) { +} diff --git a/tests/baselines/reference/for-of33.js b/tests/baselines/reference/for-of33.js index 91d8de41c6a..f3a75eec137 100644 --- a/tests/baselines/reference/for-of33.js +++ b/tests/baselines/reference/for-of33.js @@ -8,7 +8,8 @@ class StringIterator { } //// [for-of33.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of34.js b/tests/baselines/reference/for-of34.js index ccb6006c63d..521b4f3c2a4 100644 --- a/tests/baselines/reference/for-of34.js +++ b/tests/baselines/reference/for-of34.js @@ -12,7 +12,8 @@ class StringIterator { } //// [for-of34.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of35.js b/tests/baselines/reference/for-of35.js index a4f1a37e3bf..cb6dc0e532f 100644 --- a/tests/baselines/reference/for-of35.js +++ b/tests/baselines/reference/for-of35.js @@ -15,7 +15,8 @@ class StringIterator { } //// [for-of35.js] -for (var v of new StringIterator) { } +for (var v of new StringIterator) { +} var StringIterator = (function () { function StringIterator() { } diff --git a/tests/baselines/reference/for-of36.js b/tests/baselines/reference/for-of36.js index 14523695151..fb70b1d60cc 100644 --- a/tests/baselines/reference/for-of36.js +++ b/tests/baselines/reference/for-of36.js @@ -5,7 +5,10 @@ for (var v of tuple) { } //// [for-of36.js] -var tuple = ["", true]; +var tuple = [ + "", + true +]; for (var v of tuple) { v; } diff --git a/tests/baselines/reference/for-of37.js b/tests/baselines/reference/for-of37.js index 472193e6cb5..cada43a6326 100644 --- a/tests/baselines/reference/for-of37.js +++ b/tests/baselines/reference/for-of37.js @@ -5,7 +5,12 @@ for (var v of map) { } //// [for-of37.js] -var map = new Map([["", true]]); +var map = new Map([ + [ + "", + true + ] +]); for (var v of map) { v; } diff --git a/tests/baselines/reference/for-of38.js b/tests/baselines/reference/for-of38.js index 1f0ac09682e..48b697f906e 100644 --- a/tests/baselines/reference/for-of38.js +++ b/tests/baselines/reference/for-of38.js @@ -6,7 +6,12 @@ for (var [k, v] of map) { } //// [for-of38.js] -var map = new Map([["", true]]); +var map = new Map([ + [ + "", + true + ] +]); for (var [k, v] of map) { k; v; diff --git a/tests/baselines/reference/for-of39.js b/tests/baselines/reference/for-of39.js index 91dbc56c0ab..3b7d8d9a56a 100644 --- a/tests/baselines/reference/for-of39.js +++ b/tests/baselines/reference/for-of39.js @@ -6,7 +6,16 @@ for (var [k, v] of map) { } //// [for-of39.js] -var map = new Map([["", true], ["", 0]]); +var map = new Map([ + [ + "", + true + ], + [ + "", + 0 + ] +]); for (var [k, v] of map) { k; v; diff --git a/tests/baselines/reference/for-of4.js b/tests/baselines/reference/for-of4.js index 147619d2fe2..03cef92c1f5 100644 --- a/tests/baselines/reference/for-of4.js +++ b/tests/baselines/reference/for-of4.js @@ -4,6 +4,8 @@ for (var v of [0]) { } //// [for-of4.js] -for (var v of [0]) { +for (var v of [ + 0 +]) { v; } diff --git a/tests/baselines/reference/for-of40.js b/tests/baselines/reference/for-of40.js index 243f81097db..06fc45adfa7 100644 --- a/tests/baselines/reference/for-of40.js +++ b/tests/baselines/reference/for-of40.js @@ -6,7 +6,12 @@ for (var [k = "", v = false] of map) { } //// [for-of40.js] -var map = new Map([["", true]]); +var map = new Map([ + [ + "", + true + ] +]); for (var [k = "", v = false] of map) { k; v; diff --git a/tests/baselines/reference/for-of41.js b/tests/baselines/reference/for-of41.js index 0fa380c53c4..f3ae215c5b8 100644 --- a/tests/baselines/reference/for-of41.js +++ b/tests/baselines/reference/for-of41.js @@ -6,7 +6,16 @@ for (var {x: [a], y: {p}} of array) { } //// [for-of41.js] -var array = [{ x: [0], y: { p: "" } }]; +var array = [ + { + x: [ + 0 + ], + y: { + p: "" + } + } +]; for (var { x: [a], y: { p } } of array) { a; p; diff --git a/tests/baselines/reference/for-of42.js b/tests/baselines/reference/for-of42.js index 1fa9219df47..774ce512e9f 100644 --- a/tests/baselines/reference/for-of42.js +++ b/tests/baselines/reference/for-of42.js @@ -6,7 +6,12 @@ for (var {x: a, y: b} of array) { } //// [for-of42.js] -var array = [{ x: "", y: 0 }]; +var array = [ + { + x: "", + y: 0 + } +]; for (var { x: a, y: b } of array) { a; b; diff --git a/tests/baselines/reference/for-of43.js b/tests/baselines/reference/for-of43.js index de3b4fcd9b0..dc8c9c885d8 100644 --- a/tests/baselines/reference/for-of43.js +++ b/tests/baselines/reference/for-of43.js @@ -6,7 +6,12 @@ for (var {x: a = "", y: b = true} of array) { } //// [for-of43.js] -var array = [{ x: "", y: 0 }]; +var array = [ + { + x: "", + y: 0 + } +]; for (var { x: a = "", y: b = true } of array) { a; b; diff --git a/tests/baselines/reference/for-of44.js b/tests/baselines/reference/for-of44.js index 087485ed73f..9d4745d1366 100644 --- a/tests/baselines/reference/for-of44.js +++ b/tests/baselines/reference/for-of44.js @@ -6,7 +6,20 @@ for (var [num, strBoolSym] of array) { } //// [for-of44.js] -var array = [[0, ""], [0, true], [1, Symbol()]]; +var array = [ + [ + 0, + "" + ], + [ + 0, + true + ], + [ + 1, + Symbol() + ] +]; for (var [num, strBoolSym] of array) { num; strBoolSym; diff --git a/tests/baselines/reference/for-of45.js b/tests/baselines/reference/for-of45.js index 1222b2dcdd5..3394c50c215 100644 --- a/tests/baselines/reference/for-of45.js +++ b/tests/baselines/reference/for-of45.js @@ -8,8 +8,16 @@ for ([k = "", v = false] of map) { //// [for-of45.js] var k, v; -var map = new Map([["", true]]); -for ([k = "", v = false] of map) { +var map = new Map([ + [ + "", + true + ] +]); +for ([ + k = "", + v = false +] of map) { k; v; } diff --git a/tests/baselines/reference/for-of46.js b/tests/baselines/reference/for-of46.js index 2ea15936c54..7146993513c 100644 --- a/tests/baselines/reference/for-of46.js +++ b/tests/baselines/reference/for-of46.js @@ -8,8 +8,16 @@ for ([k = false, v = ""] of map) { //// [for-of46.js] var k, v; -var map = new Map([["", true]]); -for ([k = false, v = ""] of map) { +var map = new Map([ + [ + "", + true + ] +]); +for ([ + k = false, + v = "" +] of map) { k; v; } diff --git a/tests/baselines/reference/for-of47.js b/tests/baselines/reference/for-of47.js index b2de46d677f..f5e03dce571 100644 --- a/tests/baselines/reference/for-of47.js +++ b/tests/baselines/reference/for-of47.js @@ -9,12 +9,20 @@ for ({x, y: y = E.x} of array) { //// [for-of47.js] var x, y; -var array = [{ x: "", y: true }]; +var array = [ + { + x: "", + y: true + } +]; var E; (function (E) { E[E["x"] = 0] = "x"; })(E || (E = {})); -for ({ x, y: y = 0 /* x */ } of array) { +for ({ + x, + y: y = 0 /* x */ +} of array) { x; y; } diff --git a/tests/baselines/reference/for-of48.js b/tests/baselines/reference/for-of48.js index 15b9f5f12f6..3b96f460e97 100644 --- a/tests/baselines/reference/for-of48.js +++ b/tests/baselines/reference/for-of48.js @@ -9,12 +9,20 @@ for ({x, y = E.x} of array) { //// [for-of48.js] var x, y; -var array = [{ x: "", y: true }]; +var array = [ + { + x: "", + y: true + } +]; var E; (function (E) { E[E["x"] = 0] = "x"; })(E || (E = {})); -for ({ x, y: = 0 /* x */ } of array) { +for ({ + x, + y: = 0 /* x */ +} of array) { x; y; } diff --git a/tests/baselines/reference/for-of49.js b/tests/baselines/reference/for-of49.js index ac7f99f3607..ad3bc415d1d 100644 --- a/tests/baselines/reference/for-of49.js +++ b/tests/baselines/reference/for-of49.js @@ -8,8 +8,18 @@ for ([k, ...[v]] of map) { //// [for-of49.js] var k, v; -var map = new Map([["", true]]); -for ([k, ...[v]] of map) { +var map = new Map([ + [ + "", + true + ] +]); +for ([ + k, + ...[ + v + ] +] of map) { k; v; } diff --git a/tests/baselines/reference/for-of5.js b/tests/baselines/reference/for-of5.js index 4d93b0bd483..374e1aa79a0 100644 --- a/tests/baselines/reference/for-of5.js +++ b/tests/baselines/reference/for-of5.js @@ -4,6 +4,8 @@ for (let v of [0]) { } //// [for-of5.js] -for (let v of [0]) { +for (let v of [ + 0 +]) { v; } diff --git a/tests/baselines/reference/for-of50.js b/tests/baselines/reference/for-of50.js index a300812e6a9..21e6f1e7325 100644 --- a/tests/baselines/reference/for-of50.js +++ b/tests/baselines/reference/for-of50.js @@ -6,7 +6,12 @@ for (const [k, v] of map) { } //// [for-of50.js] -var map = new Map([["", true]]); +var map = new Map([ + [ + "", + true + ] +]); for (const [k, v] of map) { k; v; diff --git a/tests/baselines/reference/for-of51.js b/tests/baselines/reference/for-of51.js index cae8c8b38fe..29b907b0f80 100644 --- a/tests/baselines/reference/for-of51.js +++ b/tests/baselines/reference/for-of51.js @@ -2,4 +2,5 @@ for (let let of []) {} //// [for-of51.js] -for (let let of []) { } +for (let let of []) { +} diff --git a/tests/baselines/reference/for-of52.js b/tests/baselines/reference/for-of52.js index 48e1dca936c..066dd4f81ac 100644 --- a/tests/baselines/reference/for-of52.js +++ b/tests/baselines/reference/for-of52.js @@ -2,4 +2,7 @@ for (let [v, v] of [[]]) {} //// [for-of52.js] -for (let [v, v] of [[]]) { } +for (let [v, v] of [ + [] +]) { +} diff --git a/tests/baselines/reference/for-of55.js b/tests/baselines/reference/for-of55.js index a0f949c6ce5..30baacc8b13 100644 --- a/tests/baselines/reference/for-of55.js +++ b/tests/baselines/reference/for-of55.js @@ -5,7 +5,9 @@ for (let v of v) { } //// [for-of55.js] -let v = [1]; +let v = [ + 1 +]; for (let v of v) { v; } diff --git a/tests/baselines/reference/for-of56.js b/tests/baselines/reference/for-of56.js index 0992b9c0bb9..5d540151c12 100644 --- a/tests/baselines/reference/for-of56.js +++ b/tests/baselines/reference/for-of56.js @@ -2,4 +2,5 @@ for (var let of []) {} //// [for-of56.js] -for (var let of []) { } +for (var let of []) { +} diff --git a/tests/baselines/reference/for-of6.js b/tests/baselines/reference/for-of6.js index 24e93e2a9fd..f176488595a 100644 --- a/tests/baselines/reference/for-of6.js +++ b/tests/baselines/reference/for-of6.js @@ -4,6 +4,8 @@ for (v of [0]) { } //// [for-of6.js] -for (v of [0]) { +for (v of [ + 0 +]) { let v; } diff --git a/tests/baselines/reference/for-of7.js b/tests/baselines/reference/for-of7.js index 04aadd9736a..9bc205676d7 100644 --- a/tests/baselines/reference/for-of7.js +++ b/tests/baselines/reference/for-of7.js @@ -4,4 +4,7 @@ for (let v of [0]) { } //// [for-of7.js] v; -for (let v of [0]) { } +for (let v of [ + 0 +]) { +} diff --git a/tests/baselines/reference/for-of8.js b/tests/baselines/reference/for-of8.js index f33d69166dc..d5219780446 100644 --- a/tests/baselines/reference/for-of8.js +++ b/tests/baselines/reference/for-of8.js @@ -4,4 +4,7 @@ for (var v of [0]) { } //// [for-of8.js] v; -for (var v of [0]) { } +for (var v of [ + 0 +]) { +} diff --git a/tests/baselines/reference/for-of9.js b/tests/baselines/reference/for-of9.js index f96d353bd7a..b53092414ad 100644 --- a/tests/baselines/reference/for-of9.js +++ b/tests/baselines/reference/for-of9.js @@ -5,5 +5,9 @@ for (v of "hello") { } //// [for-of9.js] var v; -for (v of ["hello"]) { } -for (v of "hello") { } +for (v of [ + "hello" +]) { +} +for (v of "hello") { +} diff --git a/tests/baselines/reference/forBreakStatements.js b/tests/baselines/reference/forBreakStatements.js index 9ed65627c9c..017837cded4 100644 --- a/tests/baselines/reference/forBreakStatements.js +++ b/tests/baselines/reference/forBreakStatements.js @@ -61,6 +61,7 @@ SEVEN: for (;;) for (;;) break SEVEN; EIGHT: for (;;) { - var fn = function () { }; + var fn = function () { + }; break EIGHT; } diff --git a/tests/baselines/reference/forContinueStatements.js b/tests/baselines/reference/forContinueStatements.js index 34f70bb1fc1..b1ace24f4b1 100644 --- a/tests/baselines/reference/forContinueStatements.js +++ b/tests/baselines/reference/forContinueStatements.js @@ -61,6 +61,7 @@ SEVEN: for (;;) for (;;) continue SEVEN; EIGHT: for (;;) { - var fn = function () { }; + var fn = function () { + }; continue EIGHT; } diff --git a/tests/baselines/reference/forInBreakStatements.js b/tests/baselines/reference/forInBreakStatements.js index 24b7cc57b8d..09f0071d4bf 100644 --- a/tests/baselines/reference/forInBreakStatements.js +++ b/tests/baselines/reference/forInBreakStatements.js @@ -61,6 +61,7 @@ SEVEN: for (var x in {}) for (var x in {}) break SEVEN; EIGHT: for (var x in {}) { - var fn = function () { }; + var fn = function () { + }; break EIGHT; } diff --git a/tests/baselines/reference/forInContinueStatements.js b/tests/baselines/reference/forInContinueStatements.js index 8b036c59721..68cac5221ae 100644 --- a/tests/baselines/reference/forInContinueStatements.js +++ b/tests/baselines/reference/forInContinueStatements.js @@ -61,6 +61,7 @@ SEVEN: for (var x in {}) for (var x in {}) continue SEVEN; EIGHT: for (var x in {}) { - var fn = function () { }; + var fn = function () { + }; continue EIGHT; } diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js index 39fdb6c8871..12f1c691cc5 100644 --- a/tests/baselines/reference/forStatements.js +++ b/tests/baselines/reference/forStatements.js @@ -57,7 +57,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -66,24 +68,50 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); -for (var aNumber = 9.9;;) { } -for (var aString = 'this is a string';;) { } -for (var aDate = new Date(12);;) { } -for (var anObject = new Object();;) { } -for (var anAny = null;;) { } -for (var aSecondAny = undefined;;) { } -for (var aVoid = undefined;;) { } -for (var anInterface = new C();;) { } -for (var aClass = new C();;) { } -for (var aGenericClass = new D();;) { } -for (var anObjectLiteral = { id: 12 };;) { } -for (var anOtherObjectLiteral = new C();;) { } -for (var aFunction = F;;) { } -for (var anOtherFunction = F;;) { } -for (var aLambda = function (x) { return 2; };;) { } -for (var aModule = M;;) { } -for (var aClassInModule = new M.A();;) { } -for (var aFunctionInModule = function (x) { return 'this is a string'; };;) { } +for (var aNumber = 9.9;;) { +} +for (var aString = 'this is a string';;) { +} +for (var aDate = new Date(12);;) { +} +for (var anObject = new Object();;) { +} +for (var anAny = null;;) { +} +for (var aSecondAny = undefined;;) { +} +for (var aVoid = undefined;;) { +} +for (var anInterface = new C();;) { +} +for (var aClass = new C();;) { +} +for (var aGenericClass = new D();;) { +} +for (var anObjectLiteral = { + id: 12 +};;) { +} +for (var anOtherObjectLiteral = new C();;) { +} +for (var aFunction = F;;) { +} +for (var anOtherFunction = F;;) { +} +for (var aLambda = function (x) { + return 2; +};;) { +} +for (var aModule = M;;) { +} +for (var aClassInModule = new M.A();;) { +} +for (var aFunctionInModule = function (x) { + return 'this is a string'; +};;) { +} diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js index 2282136be3a..40888c7ce8b 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js @@ -77,7 +77,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -86,25 +88,58 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); // all of these are errors -for (var a;;) { } -for (var a = 1;;) { } -for (var a = 'a string';;) { } -for (var a = new C();;) { } -for (var a = new D();;) { } -for (var a = M;;) { } -for (var b;;) { } -for (var b = new C();;) { } -for (var b = new C2();;) { } -for (var f = F;;) { } -for (var f = function (x) { return ''; };;) { } -for (var arr;;) { } -for (var arr = [1, 2, 3, 4];;) { } -for (var arr = [new C(), new C2(), new D()];;) { } -for (var arr2 = [new D()];;) { } -for (var arr2 = new Array();;) { } -for (var m;;) { } -for (var m = M.A;;) { } +for (var a;;) { +} +for (var a = 1;;) { +} +for (var a = 'a string';;) { +} +for (var a = new C();;) { +} +for (var a = new D();;) { +} +for (var a = M;;) { +} +for (var b;;) { +} +for (var b = new C();;) { +} +for (var b = new C2();;) { +} +for (var f = F;;) { +} +for (var f = function (x) { + return ''; +};;) { +} +for (var arr;;) { +} +for (var arr = [ + 1, + 2, + 3, + 4 +];;) { +} +for (var arr = [ + new C(), + new C2(), + new D() +];;) { +} +for (var arr2 = [ + new D() +];;) { +} +for (var arr2 = new Array();;) { +} +for (var m;;) { +} +for (var m = M.A;;) { +} diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.js b/tests/baselines/reference/forStatementsMultipleValidDecl.js index e95e37d63ac..aaf88edfe8b 100644 --- a/tests/baselines/reference/forStatementsMultipleValidDecl.js +++ b/tests/baselines/reference/forStatementsMultipleValidDecl.js @@ -35,29 +35,74 @@ for (var a: typeof a; ;) { } //// [forStatementsMultipleValidDecl.js] // all expected to be valid -for (var x;;) { } -for (var x = 2;;) { } -for (var x = undefined;;) { } +for (var x;;) { +} +for (var x = 2;;) { +} +for (var x = undefined;;) { +} // new declaration space, making redeclaring x as a string valid function declSpace() { - for (var x = 'this is a string';;) { } + for (var x = 'this is a string';;) { + } +} +for (var p;;) { +} +for (var p = { + x: 1, + y: 2 +};;) { +} +for (var p = { + x: 0, + y: undefined +};;) { +} +for (var p = { + x: 1, + y: undefined +};;) { +} +for (var p = { + x: 1, + y: 2 +};;) { +} +for (var p = { + x: 0, + y: undefined +};;) { +} +for (var p;;) { +} +for (var fn = function (s) { + return 42; +};;) { +} +for (var fn = function (s) { + return 3; +};;) { +} +for (var fn;;) { +} +for (var fn;;) { +} +for (var fn = null;;) { +} +for (var fn;;) { +} +for (var a;;) { +} +for (var a = [ + 'a', + 'b' +];;) { +} +for (var a = [];;) { +} +for (var a = [];;) { +} +for (var a = new Array();;) { +} +for (var a;;) { } -for (var p;;) { } -for (var p = { x: 1, y: 2 };;) { } -for (var p = { x: 0, y: undefined };;) { } -for (var p = { x: 1, y: undefined };;) { } -for (var p = { x: 1, y: 2 };;) { } -for (var p = { x: 0, y: undefined };;) { } -for (var p;;) { } -for (var fn = function (s) { return 42; };;) { } -for (var fn = function (s) { return 3; };;) { } -for (var fn;;) { } -for (var fn;;) { } -for (var fn = null;;) { } -for (var fn;;) { } -for (var a;;) { } -for (var a = ['a', 'b'];;) { } -for (var a = [];;) { } -for (var a = [];;) { } -for (var a = new Array();;) { } -for (var a;;) { } diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js index cc7dba7e476..8629ed63055 100644 --- a/tests/baselines/reference/funClodule.js +++ b/tests/baselines/reference/funClodule.js @@ -20,10 +20,12 @@ module foo3 { class foo3 { } // Should error //// [funClodule.js] -function foo3() { } +function foo3() { +} var foo3; (function (foo3) { - function x() { } + function x() { + } foo3.x = x; })(foo3 || (foo3 = {})); var foo3 = (function () { diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js index 348d25bd670..de080873b9f 100644 --- a/tests/baselines/reference/funcdecl.js +++ b/tests/baselines/reference/funcdecl.js @@ -115,7 +115,8 @@ function overload1(ns) { return ns.toString(); } var withOverloadSignature = overload1; -function f(n) { } +function f(n) { +} var m2; (function (m2) { function foo(n) { diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js index d59cff501ed..004e65d92af 100644 --- a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js +++ b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js @@ -8,4 +8,5 @@ interface Foo { } //// [functionAndInterfaceWithSeparateErrors.js] -function Foo(n) { } +function Foo(n) { +} diff --git a/tests/baselines/reference/functionAndPropertyNameConflict.js b/tests/baselines/reference/functionAndPropertyNameConflict.js index 28a2cd54c9e..1368f8241d5 100644 --- a/tests/baselines/reference/functionAndPropertyNameConflict.js +++ b/tests/baselines/reference/functionAndPropertyNameConflict.js @@ -10,7 +10,8 @@ class C65 { var C65 = (function () { function C65() { } - C65.prototype.aaaaa = function () { }; + C65.prototype.aaaaa = function () { + }; Object.defineProperty(C65.prototype, "aaaaa", { get: function () { return 1; diff --git a/tests/baselines/reference/functionArgShadowing.js b/tests/baselines/reference/functionArgShadowing.js index 451e46536e0..c74570902ed 100644 --- a/tests/baselines/reference/functionArgShadowing.js +++ b/tests/baselines/reference/functionArgShadowing.js @@ -18,13 +18,15 @@ class C { var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); function foo(x) { diff --git a/tests/baselines/reference/functionAssignment.js b/tests/baselines/reference/functionAssignment.js index 3237f53bf9a..52b66946500 100644 --- a/tests/baselines/reference/functionAssignment.js +++ b/tests/baselines/reference/functionAssignment.js @@ -38,19 +38,30 @@ callb((a) =>{ a.length; }); //// [functionAssignment.js] -function f(n) { } -f(function () { }); +function f(n) { +} +f(function () { +}); var barbaz; var test; test.get(function (param) { - var x = barbaz.get(function () { }); + var x = barbaz.get(function () { + }); }); -function f2(n) { } +function f2(n) { +} f2(function () { var n = ''; n = 4; }); -function f3(a) { } -f3({ a: 0, b: 0 }); -function callb(a) { } -callb(function (a) { a.length; }); +function f3(a) { +} +f3({ + a: 0, + b: 0 +}); +function callb(a) { +} +callb(function (a) { + a.length; +}); diff --git a/tests/baselines/reference/functionAssignmentError.js b/tests/baselines/reference/functionAssignmentError.js index dd35ccb271a..e19547096b8 100644 --- a/tests/baselines/reference/functionAssignmentError.js +++ b/tests/baselines/reference/functionAssignmentError.js @@ -3,5 +3,9 @@ var func = function (){return "ONE";}; func = function (){return "ONE";}; //// [functionAssignmentError.js] -var func = function () { return "ONE"; }; -func = function () { return "ONE"; }; +var func = function () { + return "ONE"; +}; +func = function () { + return "ONE"; +}; diff --git a/tests/baselines/reference/functionCall1.js b/tests/baselines/reference/functionCall1.js index cb8c1a46a23..8025ad5a6f5 100644 --- a/tests/baselines/reference/functionCall1.js +++ b/tests/baselines/reference/functionCall1.js @@ -3,6 +3,8 @@ function foo():any{return ""}; var x = foo(); //// [functionCall1.js] -function foo() { return ""; } +function foo() { + return ""; +} ; var x = foo(); diff --git a/tests/baselines/reference/functionCall11.js b/tests/baselines/reference/functionCall11.js index 019ea213dbc..9c36dedba36 100644 --- a/tests/baselines/reference/functionCall11.js +++ b/tests/baselines/reference/functionCall11.js @@ -8,7 +8,8 @@ foo('foo', 1, 'bar'); //// [functionCall11.js] -function foo(a, b) { } +function foo(a, b) { +} foo('foo', 1); foo('foo'); foo(); diff --git a/tests/baselines/reference/functionCall12.js b/tests/baselines/reference/functionCall12.js index 2c3396c209a..ca71c25a172 100644 --- a/tests/baselines/reference/functionCall12.js +++ b/tests/baselines/reference/functionCall12.js @@ -9,7 +9,8 @@ foo('foo', 1, 3); //// [functionCall12.js] -function foo(a, b, c) { } +function foo(a, b, c) { +} foo('foo', 1); foo('foo'); foo(); diff --git a/tests/baselines/reference/functionCall2.js b/tests/baselines/reference/functionCall2.js index 5351dc116ff..5b6da378103 100644 --- a/tests/baselines/reference/functionCall2.js +++ b/tests/baselines/reference/functionCall2.js @@ -3,6 +3,8 @@ function foo():number{return 1}; var x = foo(); //// [functionCall2.js] -function foo() { return 1; } +function foo() { + return 1; +} ; var x = foo(); diff --git a/tests/baselines/reference/functionCall3.js b/tests/baselines/reference/functionCall3.js index 74540c2ccf6..0e229ccddbf 100644 --- a/tests/baselines/reference/functionCall3.js +++ b/tests/baselines/reference/functionCall3.js @@ -3,5 +3,9 @@ function foo():any[]{return [1];} var x = foo(); //// [functionCall3.js] -function foo() { return [1]; } +function foo() { + return [ + 1 + ]; +} var x = foo(); diff --git a/tests/baselines/reference/functionCall4.js b/tests/baselines/reference/functionCall4.js index 0f937337d49..05021c33563 100644 --- a/tests/baselines/reference/functionCall4.js +++ b/tests/baselines/reference/functionCall4.js @@ -4,8 +4,12 @@ function bar():()=>any{return foo}; var x = bar(); //// [functionCall4.js] -function foo() { return ""; } +function foo() { + return ""; +} ; -function bar() { return foo; } +function bar() { + return foo; +} ; var x = bar(); diff --git a/tests/baselines/reference/functionCall5.js b/tests/baselines/reference/functionCall5.js index dc7db4a9959..e6b0e049ef6 100644 --- a/tests/baselines/reference/functionCall5.js +++ b/tests/baselines/reference/functionCall5.js @@ -13,6 +13,8 @@ var m1; })(); m1.c1 = c1; })(m1 || (m1 = {})); -function foo() { return new m1.c1(); } +function foo() { + return new m1.c1(); +} ; var x = foo(); diff --git a/tests/baselines/reference/functionCall6.js b/tests/baselines/reference/functionCall6.js index 01197a5fd8d..21582666b94 100644 --- a/tests/baselines/reference/functionCall6.js +++ b/tests/baselines/reference/functionCall6.js @@ -7,7 +7,8 @@ foo(); //// [functionCall6.js] -function foo(a) { } +function foo(a) { +} ; foo('bar'); foo(2); diff --git a/tests/baselines/reference/functionCall7.js b/tests/baselines/reference/functionCall7.js index cb30e5d8b24..b32c21b5892 100644 --- a/tests/baselines/reference/functionCall7.js +++ b/tests/baselines/reference/functionCall7.js @@ -18,7 +18,9 @@ var m1; })(); m1.c1 = c1; })(m1 || (m1 = {})); -function foo(a) { a.a = 1; } +function foo(a) { + a.a = 1; +} ; var myC = new m1.c1(); foo(myC); diff --git a/tests/baselines/reference/functionCall8.js b/tests/baselines/reference/functionCall8.js index 5859fdfb375..7eb5a9f60d9 100644 --- a/tests/baselines/reference/functionCall8.js +++ b/tests/baselines/reference/functionCall8.js @@ -7,7 +7,8 @@ foo(); //// [functionCall8.js] -function foo(a) { } +function foo(a) { +} foo('foo'); foo('foo', 'bar'); foo(4); diff --git a/tests/baselines/reference/functionCall9.js b/tests/baselines/reference/functionCall9.js index bc7e112f0c8..d2d81a3ca04 100644 --- a/tests/baselines/reference/functionCall9.js +++ b/tests/baselines/reference/functionCall9.js @@ -7,7 +7,8 @@ foo('foo', 1, 'bar'); foo(); //// [functionCall9.js] -function foo(a, b) { } +function foo(a, b) { +} ; foo('foo', 1); foo('foo'); diff --git a/tests/baselines/reference/functionConstraintSatisfaction.js b/tests/baselines/reference/functionConstraintSatisfaction.js index b8741456178..20c5df00987 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction.js +++ b/tests/baselines/reference/functionConstraintSatisfaction.js @@ -63,7 +63,9 @@ function foo2(x: T, y: U) { //// [functionConstraintSatisfaction.js] // satisfaction of a constraint to Function, no errors expected -function foo(x) { return x; } +function foo(x) { + return x; +} var i; var C = (function () { function C() { @@ -74,10 +76,18 @@ var a; var b; var c; var r = foo(new Function()); -var r1 = foo(function (x) { return x; }); -var r2 = foo(function (x) { return x; }); -var r3 = foo(function (x) { return x; }); -var r4 = foo(function (x) { return x; }); +var r1 = foo(function (x) { + return x; +}); +var r2 = foo(function (x) { + return x; +}); +var r3 = foo(function (x) { + return x; +}); +var r4 = foo(function (x) { + return x; +}); var r5 = foo(i); var r6 = foo(C); var r7 = foo(b); @@ -91,10 +101,18 @@ var C2 = (function () { var a2; var b2; var c2; -var r9 = foo(function (x) { return x; }); -var r10 = foo(function (x) { return x; }); -var r11 = foo(function (x) { return x; }); -var r12 = foo(function (x, y) { return x; }); +var r9 = foo(function (x) { + return x; +}); +var r10 = foo(function (x) { + return x; +}); +var r11 = foo(function (x) { + return x; +}); +var r12 = foo(function (x, y) { + return x; +}); var r13 = foo(i2); var r14 = foo(C2); var r15 = foo(b2); diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.js b/tests/baselines/reference/functionConstraintSatisfaction2.js index 9e70a508ccd..45757759536 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction2.js +++ b/tests/baselines/reference/functionConstraintSatisfaction2.js @@ -42,11 +42,17 @@ function fff(x: T, y: U) { //// [functionConstraintSatisfaction2.js] // satisfaction of a constraint to Function, all of these invocations are errors unless otherwise noted -function foo(x) { return x; } +function foo(x) { + return x; +} foo(1); -foo(function () { }, 1); -foo(1, function () { }); -function foo2(x) { return x; } +foo(function () { +}, 1); +foo(1, function () { +}); +function foo2(x) { + return x; +} var C = (function () { function C() { } @@ -60,11 +66,17 @@ var C2 = (function () { })(); var b2; var r = foo2(new Function()); -var r2 = foo2(function (x) { return x; }); +var r2 = foo2(function (x) { + return x; +}); var r6 = foo2(C); var r7 = foo2(b); -var r8 = foo2(function (x) { return x; }); // no error expected -var r11 = foo2(function (x, y) { return x; }); +var r8 = foo2(function (x) { + return x; +}); // no error expected +var r11 = foo2(function (x, y) { + return x; +}); var r13 = foo2(C2); var r14 = foo2(b2); var f2; diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.js b/tests/baselines/reference/functionConstraintSatisfaction3.js index 2c1bfa4d399..a33c2c6408d 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction3.js +++ b/tests/baselines/reference/functionConstraintSatisfaction3.js @@ -43,7 +43,9 @@ var r15 = foo(c2); //// [functionConstraintSatisfaction3.js] // satisfaction of a constraint to Function, no errors expected -function foo(x) { return x; } +function foo(x) { + return x; +} var i; var C = (function () { function C() { @@ -53,10 +55,18 @@ var C = (function () { var a; var b; var c; -var r1 = foo(function (x) { return x; }); -var r2 = foo(function (x) { return x; }); -var r3 = foo(function (x) { return x; }); -var r4 = foo(function (x) { return x; }); +var r1 = foo(function (x) { + return x; +}); +var r2 = foo(function (x) { + return x; +}); +var r3 = foo(function (x) { + return x; +}); +var r4 = foo(function (x) { + return x; +}); var r5 = foo(i); var r8 = foo(c); var i2; @@ -68,7 +78,11 @@ var C2 = (function () { var a2; var b2; var c2; -var r9 = foo(function (x) { return x; }); -var r10 = foo(function (x) { return x; }); +var r9 = foo(function (x) { + return x; +}); +var r10 = foo(function (x) { + return x; +}); var r12 = foo(i2); var r15 = foo(c2); diff --git a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js index fe10f96f7bb..2c882b82857 100644 --- a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js +++ b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js @@ -14,8 +14,11 @@ var CDoc = (function () { function CDoc() { function doSomething(a) { } - doSomething(function () { return undefined; }); - doSomething(function () { }); + doSomething(function () { + return undefined; + }); + doSomething(function () { + }); } return CDoc; })(); diff --git a/tests/baselines/reference/functionExpressionInWithBlock.js b/tests/baselines/reference/functionExpressionInWithBlock.js index f2353412d5c..5e06ad8169a 100644 --- a/tests/baselines/reference/functionExpressionInWithBlock.js +++ b/tests/baselines/reference/functionExpressionInWithBlock.js @@ -11,7 +11,9 @@ function x() { function x() { with ({}) { function f() { - (function () { return this; }); + (function () { + return this; + }); } } } diff --git a/tests/baselines/reference/functionExpressionReturningItself.js b/tests/baselines/reference/functionExpressionReturningItself.js index 9485100164e..8553d2da867 100644 --- a/tests/baselines/reference/functionExpressionReturningItself.js +++ b/tests/baselines/reference/functionExpressionReturningItself.js @@ -2,7 +2,9 @@ var x = function somefn() { return somefn; }; //// [functionExpressionReturningItself.js] -var x = function somefn() { return somefn; }; +var x = function somefn() { + return somefn; +}; //// [functionExpressionReturningItself.d.ts] diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js index 5eaf9027335..95b0d9e700b 100644 --- a/tests/baselines/reference/functionImplementationErrors.js +++ b/tests/baselines/reference/functionImplementationErrors.js @@ -96,10 +96,14 @@ var f3 = function () { // FunctionExpression with no return type annotation with return branch of number[] and other of string[] var f4 = function () { if (true) { - return ['']; + return [ + '' + ]; } else { - return [1]; + return [ + 1 + ]; } }; // Function implemetnation with non -void return type annotation with no return diff --git a/tests/baselines/reference/functionImplementations.js b/tests/baselines/reference/functionImplementations.js index c478f892fd5..e3a498dbeb2 100644 --- a/tests/baselines/reference/functionImplementations.js +++ b/tests/baselines/reference/functionImplementations.js @@ -164,7 +164,8 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; // FunctionExpression with no return type annotation and no return statement returns void -var v = function () { }(); +var v = function () { +}(); // FunctionExpression f with no return type annotation and directly references f in its body returns any var a = function f() { return f; @@ -268,7 +269,10 @@ function opt1(n) { } // Function signature with optional parameter, no type annotation and initializer has initializer's widened type function opt2(n) { - if (n === void 0) { n = { x: null, y: undefined }; } + if (n === void 0) { n = { + x: null, + y: undefined + }; } var m = n; var m; } diff --git a/tests/baselines/reference/functionLiteral.js b/tests/baselines/reference/functionLiteral.js index 8ee515e8f8c..bf42f9e859a 100644 --- a/tests/baselines/reference/functionLiteral.js +++ b/tests/baselines/reference/functionLiteral.js @@ -15,10 +15,14 @@ var z: new (x: number) => number; //// [functionLiteral.js] // basic valid forms of function literals -var x = function () { return 1; }; +var x = function () { + return 1; +}; var x; var y; var y; -var y2 = function (x) { return x; }; +var y2 = function (x) { + return x; +}; var z; var z; diff --git a/tests/baselines/reference/functionLiteralForOverloads.js b/tests/baselines/reference/functionLiteralForOverloads.js index 1a0bc874c48..06631101e0f 100644 --- a/tests/baselines/reference/functionLiteralForOverloads.js +++ b/tests/baselines/reference/functionLiteralForOverloads.js @@ -23,7 +23,15 @@ var f4: { //// [functionLiteralForOverloads.js] // basic uses of function literals with overloads -var f = function (x) { return x; }; -var f2 = function (x) { return x; }; -var f3 = function (x) { return x; }; -var f4 = function (x) { return x; }; +var f = function (x) { + return x; +}; +var f2 = function (x) { + return x; +}; +var f3 = function (x) { + return x; +}; +var f4 = function (x) { + return x; +}; diff --git a/tests/baselines/reference/functionNameConflicts.js b/tests/baselines/reference/functionNameConflicts.js index 87b61e3733d..99ede14dfde 100644 --- a/tests/baselines/reference/functionNameConflicts.js +++ b/tests/baselines/reference/functionNameConflicts.js @@ -32,17 +32,22 @@ function overrr() { //Function overload with different name from implementation signature var M; (function (M) { - function fn1() { } + function fn1() { + } var fn1; var fn2; - function fn2() { } + function fn2() { + } })(M || (M = {})); -function fn3() { } +function fn3() { +} var fn3; function func() { var fn4; - function fn4() { } - function fn5() { } + function fn4() { + } + function fn5() { + } var fn5; } function overrr() { diff --git a/tests/baselines/reference/functionOverloadAmbiguity1.js b/tests/baselines/reference/functionOverloadAmbiguity1.js index 2833ccbcdc3..d53ec68c9d9 100644 --- a/tests/baselines/reference/functionOverloadAmbiguity1.js +++ b/tests/baselines/reference/functionOverloadAmbiguity1.js @@ -11,7 +11,13 @@ callb2((a) => { a.length; } ); // ok, chose first overload //// [functionOverloadAmbiguity1.js] -function callb(a) { } -callb(function (a) { a.length; }); // error, chose first overload -function callb2(a) { } -callb2(function (a) { a.length; }); // ok, chose first overload +function callb(a) { +} +callb(function (a) { + a.length; +}); // error, chose first overload +function callb2(a) { +} +callb2(function (a) { + a.length; +}); // ok, chose first overload diff --git a/tests/baselines/reference/functionOverloadErrors.js b/tests/baselines/reference/functionOverloadErrors.js index b0c0f449456..623b0e6f4dc 100644 --- a/tests/baselines/reference/functionOverloadErrors.js +++ b/tests/baselines/reference/functionOverloadErrors.js @@ -119,7 +119,8 @@ function initExpr() { } //// [functionOverloadErrors.js] -function fn1() { } +function fn1() { +} function fn2a() { } function fn2b() { @@ -127,37 +128,52 @@ function fn2b() { function fn3() { return null; } -function fn6() { } -function fn7() { } -function fn8() { } -function fn9() { } -function fn10() { } -function fn11() { } -function fn12() { } +function fn6() { +} +function fn7() { +} +function fn8() { +} +function fn9() { +} +function fn10() { +} +function fn11() { +} +function fn12() { +} //Function overloads that differ by accessibility var cls = (function () { function cls() { } - cls.prototype.f = function () { }; - cls.prototype.g = function () { }; + cls.prototype.f = function () { + }; + cls.prototype.g = function () { + }; return cls; })(); //Function overloads with differing export var M; (function (M) { - function fn1() { } - function fn2() { } + function fn1() { + } + function fn2() { + } M.fn2 = fn2; })(M || (M = {})); -function dfn1() { } -function dfn2() { } +function dfn1() { +} +function dfn2() { +} function fewerParams(n) { } -function fn13(n) { } +function fn13(n) { +} function fn14() { return 3; } function fn15() { return undefined; } -function initExpr() { } +function initExpr() { +} diff --git a/tests/baselines/reference/functionOverloadErrorsSyntax.js b/tests/baselines/reference/functionOverloadErrorsSyntax.js index 1a5537d2de2..3706f4da744 100644 --- a/tests/baselines/reference/functionOverloadErrorsSyntax.js +++ b/tests/baselines/reference/functionOverloadErrorsSyntax.js @@ -12,6 +12,9 @@ function fn5() { } //// [functionOverloadErrorsSyntax.js] -function fn4a() { } -function fn4b() { } -function fn5() { } +function fn4a() { +} +function fn4b() { +} +function fn5() { +} diff --git a/tests/baselines/reference/functionOverloadImplementationOfWrongName.js b/tests/baselines/reference/functionOverloadImplementationOfWrongName.js index 465753f1040..6b66bc89ffa 100644 --- a/tests/baselines/reference/functionOverloadImplementationOfWrongName.js +++ b/tests/baselines/reference/functionOverloadImplementationOfWrongName.js @@ -4,4 +4,5 @@ function foo(x, y); function bar() { } //// [functionOverloadImplementationOfWrongName.js] -function bar() { } +function bar() { +} diff --git a/tests/baselines/reference/functionOverloadImplementationOfWrongName2.js b/tests/baselines/reference/functionOverloadImplementationOfWrongName2.js index 34cf73d3239..c3008e7a6c2 100644 --- a/tests/baselines/reference/functionOverloadImplementationOfWrongName2.js +++ b/tests/baselines/reference/functionOverloadImplementationOfWrongName2.js @@ -4,4 +4,5 @@ function bar() { } function foo(x, y); //// [functionOverloadImplementationOfWrongName2.js] -function bar() { } +function bar() { +} diff --git a/tests/baselines/reference/functionOverloads.js b/tests/baselines/reference/functionOverloads.js index 7e38b8fe993..5504b286628 100644 --- a/tests/baselines/reference/functionOverloads.js +++ b/tests/baselines/reference/functionOverloads.js @@ -5,6 +5,8 @@ function foo(bar?: string): any { return "" }; var x = foo(5); //// [functionOverloads.js] -function foo(bar) { return ""; } +function foo(bar) { + return ""; +} ; var x = foo(5); diff --git a/tests/baselines/reference/functionOverloads1.js b/tests/baselines/reference/functionOverloads1.js index 5b4acabd02c..695a9c37808 100644 --- a/tests/baselines/reference/functionOverloads1.js +++ b/tests/baselines/reference/functionOverloads1.js @@ -5,4 +5,6 @@ function foo():string { return "a" } //// [functionOverloads1.js] 1 + 1; -function foo() { return "a"; } +function foo() { + return "a"; +} diff --git a/tests/baselines/reference/functionOverloads10.js b/tests/baselines/reference/functionOverloads10.js index 08b71698dce..2cd24bcd1cb 100644 --- a/tests/baselines/reference/functionOverloads10.js +++ b/tests/baselines/reference/functionOverloads10.js @@ -5,4 +5,5 @@ function foo(foo:any){ } //// [functionOverloads10.js] -function foo(foo) { } +function foo(foo) { +} diff --git a/tests/baselines/reference/functionOverloads11.js b/tests/baselines/reference/functionOverloads11.js index 8d85b0ffb7b..efc9c793125 100644 --- a/tests/baselines/reference/functionOverloads11.js +++ b/tests/baselines/reference/functionOverloads11.js @@ -4,4 +4,6 @@ function foo():string { return "" } //// [functionOverloads11.js] -function foo() { return ""; } +function foo() { + return ""; +} diff --git a/tests/baselines/reference/functionOverloads12.js b/tests/baselines/reference/functionOverloads12.js index 4681e43ee5b..ff789083eeb 100644 --- a/tests/baselines/reference/functionOverloads12.js +++ b/tests/baselines/reference/functionOverloads12.js @@ -5,7 +5,9 @@ function foo():any { if (true) return ""; else return 0;} //// [functionOverloads12.js] -function foo() { if (true) - return ""; -else - return 0; } +function foo() { + if (true) + return ""; + else + return 0; +} diff --git a/tests/baselines/reference/functionOverloads13.js b/tests/baselines/reference/functionOverloads13.js index ff43c85e3df..f9eb4d59e47 100644 --- a/tests/baselines/reference/functionOverloads13.js +++ b/tests/baselines/reference/functionOverloads13.js @@ -5,4 +5,6 @@ function foo(bar?:number):any { return "" } //// [functionOverloads13.js] -function foo(bar) { return ""; } +function foo(bar) { + return ""; +} diff --git a/tests/baselines/reference/functionOverloads14.js b/tests/baselines/reference/functionOverloads14.js index 826b096290a..e580c4e2283 100644 --- a/tests/baselines/reference/functionOverloads14.js +++ b/tests/baselines/reference/functionOverloads14.js @@ -5,4 +5,8 @@ function foo():{a:any;} { return {a:1} } //// [functionOverloads14.js] -function foo() { return { a: 1 }; } +function foo() { + return { + a: 1 + }; +} diff --git a/tests/baselines/reference/functionOverloads15.js b/tests/baselines/reference/functionOverloads15.js index fe0c90f82af..2b80df6630c 100644 --- a/tests/baselines/reference/functionOverloads15.js +++ b/tests/baselines/reference/functionOverloads15.js @@ -5,4 +5,6 @@ function foo(foo:{a:string; b?:number;}):any { return "" } //// [functionOverloads15.js] -function foo(foo) { return ""; } +function foo(foo) { + return ""; +} diff --git a/tests/baselines/reference/functionOverloads16.js b/tests/baselines/reference/functionOverloads16.js index a0fdaa88894..ebf82febd16 100644 --- a/tests/baselines/reference/functionOverloads16.js +++ b/tests/baselines/reference/functionOverloads16.js @@ -5,4 +5,6 @@ function foo(foo:{a:string; b?:number;}):any { return "" } //// [functionOverloads16.js] -function foo(foo) { return ""; } +function foo(foo) { + return ""; +} diff --git a/tests/baselines/reference/functionOverloads17.js b/tests/baselines/reference/functionOverloads17.js index 3a5dcd81914..ef1a9e765fc 100644 --- a/tests/baselines/reference/functionOverloads17.js +++ b/tests/baselines/reference/functionOverloads17.js @@ -4,4 +4,8 @@ function foo():{a:string;} { return {a:""} } //// [functionOverloads17.js] -function foo() { return { a: "" }; } +function foo() { + return { + a: "" + }; +} diff --git a/tests/baselines/reference/functionOverloads18.js b/tests/baselines/reference/functionOverloads18.js index 8c196831e48..65a16c2896a 100644 --- a/tests/baselines/reference/functionOverloads18.js +++ b/tests/baselines/reference/functionOverloads18.js @@ -4,4 +4,8 @@ function foo(bar:{a:string;}) { return {a:""} } //// [functionOverloads18.js] -function foo(bar) { return { a: "" }; } +function foo(bar) { + return { + a: "" + }; +} diff --git a/tests/baselines/reference/functionOverloads19.js b/tests/baselines/reference/functionOverloads19.js index 4183f6a48b8..d5749d3eef2 100644 --- a/tests/baselines/reference/functionOverloads19.js +++ b/tests/baselines/reference/functionOverloads19.js @@ -5,4 +5,8 @@ function foo(bar:{a:any;}) { return {a:""} } //// [functionOverloads19.js] -function foo(bar) { return { a: "" }; } +function foo(bar) { + return { + a: "" + }; +} diff --git a/tests/baselines/reference/functionOverloads2.js b/tests/baselines/reference/functionOverloads2.js index 39a58663cf4..7e9eb45d236 100644 --- a/tests/baselines/reference/functionOverloads2.js +++ b/tests/baselines/reference/functionOverloads2.js @@ -5,6 +5,8 @@ function foo(bar: any): any { return bar }; var x = foo(true); //// [functionOverloads2.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} ; var x = foo(true); diff --git a/tests/baselines/reference/functionOverloads20.js b/tests/baselines/reference/functionOverloads20.js index 4f259a88538..012f2ce09cd 100644 --- a/tests/baselines/reference/functionOverloads20.js +++ b/tests/baselines/reference/functionOverloads20.js @@ -5,4 +5,6 @@ function foo(bar:{a:any;}): string {return ""} //// [functionOverloads20.js] -function foo(bar) { return ""; } +function foo(bar) { + return ""; +} diff --git a/tests/baselines/reference/functionOverloads21.js b/tests/baselines/reference/functionOverloads21.js index 6e69169efbf..78fb1fe011f 100644 --- a/tests/baselines/reference/functionOverloads21.js +++ b/tests/baselines/reference/functionOverloads21.js @@ -5,4 +5,6 @@ function foo(bar:{a:any; b?:string;}[]) { return 0 } //// [functionOverloads21.js] -function foo(bar) { return 0; } +function foo(bar) { + return 0; +} diff --git a/tests/baselines/reference/functionOverloads22.js b/tests/baselines/reference/functionOverloads22.js index 54b745d96dd..d682b441822 100644 --- a/tests/baselines/reference/functionOverloads22.js +++ b/tests/baselines/reference/functionOverloads22.js @@ -5,4 +5,10 @@ function foo(bar:any):{a:any;b?:any;}[] { return [{a:""}] } //// [functionOverloads22.js] -function foo(bar) { return [{ a: "" }]; } +function foo(bar) { + return [ + { + a: "" + } + ]; +} diff --git a/tests/baselines/reference/functionOverloads23.js b/tests/baselines/reference/functionOverloads23.js index aa3a7172ada..d8cac7eb8ee 100644 --- a/tests/baselines/reference/functionOverloads23.js +++ b/tests/baselines/reference/functionOverloads23.js @@ -5,4 +5,6 @@ function foo(bar:(a?)=>void) { return 0 } //// [functionOverloads23.js] -function foo(bar) { return 0; } +function foo(bar) { + return 0; +} diff --git a/tests/baselines/reference/functionOverloads24.js b/tests/baselines/reference/functionOverloads24.js index 8fcc3c81902..5ff4e248c0a 100644 --- a/tests/baselines/reference/functionOverloads24.js +++ b/tests/baselines/reference/functionOverloads24.js @@ -5,4 +5,7 @@ function foo(bar:any):(a)=>void { return function(){} } //// [functionOverloads24.js] -function foo(bar) { return function () { }; } +function foo(bar) { + return function () { + }; +} diff --git a/tests/baselines/reference/functionOverloads25.js b/tests/baselines/reference/functionOverloads25.js index d466aa82d21..bbaef498926 100644 --- a/tests/baselines/reference/functionOverloads25.js +++ b/tests/baselines/reference/functionOverloads25.js @@ -6,6 +6,8 @@ var x = foo(); //// [functionOverloads25.js] -function foo(bar) { return ''; } +function foo(bar) { + return ''; +} ; var x = foo(); diff --git a/tests/baselines/reference/functionOverloads26.js b/tests/baselines/reference/functionOverloads26.js index bc4d017b9bb..088c06147ba 100644 --- a/tests/baselines/reference/functionOverloads26.js +++ b/tests/baselines/reference/functionOverloads26.js @@ -6,5 +6,7 @@ var x = foo('baz'); //// [functionOverloads26.js] -function foo(bar) { return ''; } +function foo(bar) { + return ''; +} var x = foo('baz'); diff --git a/tests/baselines/reference/functionOverloads27.js b/tests/baselines/reference/functionOverloads27.js index 199905d8219..2b11b1f6c4e 100644 --- a/tests/baselines/reference/functionOverloads27.js +++ b/tests/baselines/reference/functionOverloads27.js @@ -6,5 +6,7 @@ var x = foo(5); //// [functionOverloads27.js] -function foo(bar) { return ''; } +function foo(bar) { + return ''; +} var x = foo(5); diff --git a/tests/baselines/reference/functionOverloads28.js b/tests/baselines/reference/functionOverloads28.js index d10ef52e2b2..566972ee25d 100644 --- a/tests/baselines/reference/functionOverloads28.js +++ b/tests/baselines/reference/functionOverloads28.js @@ -6,6 +6,8 @@ var t:any; var x = foo(t); //// [functionOverloads28.js] -function foo(bar) { return ''; } +function foo(bar) { + return ''; +} var t; var x = foo(t); diff --git a/tests/baselines/reference/functionOverloads29.js b/tests/baselines/reference/functionOverloads29.js index edc1ea178bc..c828bb95917 100644 --- a/tests/baselines/reference/functionOverloads29.js +++ b/tests/baselines/reference/functionOverloads29.js @@ -6,5 +6,7 @@ var x = foo(); //// [functionOverloads29.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo(); diff --git a/tests/baselines/reference/functionOverloads30.js b/tests/baselines/reference/functionOverloads30.js index bc7593a0771..27b1436b6fb 100644 --- a/tests/baselines/reference/functionOverloads30.js +++ b/tests/baselines/reference/functionOverloads30.js @@ -6,5 +6,7 @@ var x = foo('bar'); //// [functionOverloads30.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo('bar'); diff --git a/tests/baselines/reference/functionOverloads31.js b/tests/baselines/reference/functionOverloads31.js index 2c2a15821a7..01cee2c342b 100644 --- a/tests/baselines/reference/functionOverloads31.js +++ b/tests/baselines/reference/functionOverloads31.js @@ -6,5 +6,7 @@ var x = foo(5); //// [functionOverloads31.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo(5); diff --git a/tests/baselines/reference/functionOverloads32.js b/tests/baselines/reference/functionOverloads32.js index a5557042dfb..4e0efa98b09 100644 --- a/tests/baselines/reference/functionOverloads32.js +++ b/tests/baselines/reference/functionOverloads32.js @@ -6,6 +6,8 @@ var baz:number; var x = foo(baz); //// [functionOverloads32.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var baz; var x = foo(baz); diff --git a/tests/baselines/reference/functionOverloads33.js b/tests/baselines/reference/functionOverloads33.js index 98bcc09b8b4..0c01cd54d1e 100644 --- a/tests/baselines/reference/functionOverloads33.js +++ b/tests/baselines/reference/functionOverloads33.js @@ -6,5 +6,7 @@ var x = foo(5); //// [functionOverloads33.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo(5); diff --git a/tests/baselines/reference/functionOverloads34.js b/tests/baselines/reference/functionOverloads34.js index 3d4311e4193..48ac2b5fc59 100644 --- a/tests/baselines/reference/functionOverloads34.js +++ b/tests/baselines/reference/functionOverloads34.js @@ -6,5 +6,7 @@ var x = foo(); //// [functionOverloads34.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo(); diff --git a/tests/baselines/reference/functionOverloads35.js b/tests/baselines/reference/functionOverloads35.js index b25ac6c3c5f..64ff527dee9 100644 --- a/tests/baselines/reference/functionOverloads35.js +++ b/tests/baselines/reference/functionOverloads35.js @@ -6,5 +6,9 @@ var x = foo({a:1}); //// [functionOverloads35.js] -function foo(bar) { return bar; } -var x = foo({ a: 1 }); +function foo(bar) { + return bar; +} +var x = foo({ + a: 1 +}); diff --git a/tests/baselines/reference/functionOverloads36.js b/tests/baselines/reference/functionOverloads36.js index 4e790917d93..3872aa3191f 100644 --- a/tests/baselines/reference/functionOverloads36.js +++ b/tests/baselines/reference/functionOverloads36.js @@ -6,5 +6,9 @@ var x = foo({a:'foo'}); //// [functionOverloads36.js] -function foo(bar) { return bar; } -var x = foo({ a: 'foo' }); +function foo(bar) { + return bar; +} +var x = foo({ + a: 'foo' +}); diff --git a/tests/baselines/reference/functionOverloads37.js b/tests/baselines/reference/functionOverloads37.js index c4e0d4fd18b..f9e6130dbd9 100644 --- a/tests/baselines/reference/functionOverloads37.js +++ b/tests/baselines/reference/functionOverloads37.js @@ -6,5 +6,7 @@ var x = foo(); //// [functionOverloads37.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} var x = foo(); diff --git a/tests/baselines/reference/functionOverloads38.js b/tests/baselines/reference/functionOverloads38.js index c973cbe7b67..fa8aa4693b3 100644 --- a/tests/baselines/reference/functionOverloads38.js +++ b/tests/baselines/reference/functionOverloads38.js @@ -6,5 +6,11 @@ var x = foo([{a:1}]); //// [functionOverloads38.js] -function foo(bar) { return bar; } -var x = foo([{ a: 1 }]); +function foo(bar) { + return bar; +} +var x = foo([ + { + a: 1 + } +]); diff --git a/tests/baselines/reference/functionOverloads39.js b/tests/baselines/reference/functionOverloads39.js index ad4ded394d8..218c3e9f698 100644 --- a/tests/baselines/reference/functionOverloads39.js +++ b/tests/baselines/reference/functionOverloads39.js @@ -6,5 +6,11 @@ var x = foo([{a:true}]); //// [functionOverloads39.js] -function foo(bar) { return bar; } -var x = foo([{ a: true }]); +function foo(bar) { + return bar; +} +var x = foo([ + { + a: true + } +]); diff --git a/tests/baselines/reference/functionOverloads4.js b/tests/baselines/reference/functionOverloads4.js index 3a1ff2ced33..b428f6938b4 100644 --- a/tests/baselines/reference/functionOverloads4.js +++ b/tests/baselines/reference/functionOverloads4.js @@ -3,4 +3,6 @@ function foo():number; function foo():string { return "a" } //// [functionOverloads4.js] -function foo() { return "a"; } +function foo() { + return "a"; +} diff --git a/tests/baselines/reference/functionOverloads40.js b/tests/baselines/reference/functionOverloads40.js index 11edff26a4b..3ad42e1b91d 100644 --- a/tests/baselines/reference/functionOverloads40.js +++ b/tests/baselines/reference/functionOverloads40.js @@ -6,5 +6,11 @@ var x = foo([{a:'bar'}]); //// [functionOverloads40.js] -function foo(bar) { return bar; } -var x = foo([{ a: 'bar' }]); +function foo(bar) { + return bar; +} +var x = foo([ + { + a: 'bar' + } +]); diff --git a/tests/baselines/reference/functionOverloads41.js b/tests/baselines/reference/functionOverloads41.js index dd730e25b31..449250dd1cd 100644 --- a/tests/baselines/reference/functionOverloads41.js +++ b/tests/baselines/reference/functionOverloads41.js @@ -6,5 +6,9 @@ var x = foo([{}]); //// [functionOverloads41.js] -function foo(bar) { return bar; } -var x = foo([{}]); +function foo(bar) { + return bar; +} +var x = foo([ + {} +]); diff --git a/tests/baselines/reference/functionOverloads42.js b/tests/baselines/reference/functionOverloads42.js index 979bfa86d62..0f87b5139d2 100644 --- a/tests/baselines/reference/functionOverloads42.js +++ b/tests/baselines/reference/functionOverloads42.js @@ -6,5 +6,11 @@ var x = foo([{a:'s'}]); //// [functionOverloads42.js] -function foo(bar) { return bar; } -var x = foo([{ a: 's' }]); +function foo(bar) { + return bar; +} +var x = foo([ + { + a: 's' + } +]); diff --git a/tests/baselines/reference/functionOverloads5.js b/tests/baselines/reference/functionOverloads5.js index b59154d2417..15507a9fb61 100644 --- a/tests/baselines/reference/functionOverloads5.js +++ b/tests/baselines/reference/functionOverloads5.js @@ -9,6 +9,7 @@ class baz { var baz = (function () { function baz() { } - baz.prototype.foo = function (bar) { }; + baz.prototype.foo = function (bar) { + }; return baz; })(); diff --git a/tests/baselines/reference/functionOverloads6.js b/tests/baselines/reference/functionOverloads6.js index 2c19b376dc8..b7f9fd8c1f2 100644 --- a/tests/baselines/reference/functionOverloads6.js +++ b/tests/baselines/reference/functionOverloads6.js @@ -10,6 +10,7 @@ class foo { var foo = (function () { function foo() { } - foo.fnOverload = function (foo) { }; + foo.fnOverload = function (foo) { + }; return foo; })(); diff --git a/tests/baselines/reference/functionOverloads7.js b/tests/baselines/reference/functionOverloads7.js index 540abf9eb8c..52cac83af72 100644 --- a/tests/baselines/reference/functionOverloads7.js +++ b/tests/baselines/reference/functionOverloads7.js @@ -14,7 +14,9 @@ class foo { var foo = (function () { function foo() { } - foo.prototype.bar = function (foo) { return "foo"; }; + foo.prototype.bar = function (foo) { + return "foo"; + }; foo.prototype.n = function () { var foo = this.bar(); foo = this.bar("test"); diff --git a/tests/baselines/reference/functionOverloads8.js b/tests/baselines/reference/functionOverloads8.js index 55539a61659..08c2c0b65a1 100644 --- a/tests/baselines/reference/functionOverloads8.js +++ b/tests/baselines/reference/functionOverloads8.js @@ -5,4 +5,6 @@ function foo(foo?:any){ return '' } //// [functionOverloads8.js] -function foo(foo) { return ''; } +function foo(foo) { + return ''; +} diff --git a/tests/baselines/reference/functionOverloads9.js b/tests/baselines/reference/functionOverloads9.js index 9d2ae21f4fa..53cc0385a59 100644 --- a/tests/baselines/reference/functionOverloads9.js +++ b/tests/baselines/reference/functionOverloads9.js @@ -5,6 +5,8 @@ var x = foo('foo'); //// [functionOverloads9.js] -function foo(foo) { return ''; } +function foo(foo) { + return ''; +} ; var x = foo('foo'); diff --git a/tests/baselines/reference/functionReturn.js b/tests/baselines/reference/functionReturn.js index c433eec190d..bfcd12e2b95 100644 --- a/tests/baselines/reference/functionReturn.js +++ b/tests/baselines/reference/functionReturn.js @@ -15,12 +15,16 @@ function f5(): string { } //// [functionReturn.js] -function f0() { } +function f0() { +} function f1() { var n = f0(); } -function f2() { } -function f3() { return; } +function f2() { +} +function f3() { + return; +} function f4() { return ''; return; diff --git a/tests/baselines/reference/functionType.js b/tests/baselines/reference/functionType.js index 6e3edc7347e..c2d6eea784c 100644 --- a/tests/baselines/reference/functionType.js +++ b/tests/baselines/reference/functionType.js @@ -7,6 +7,7 @@ salt.apply("hello", []); //// [functionType.js] -function salt() { } +function salt() { +} salt.apply("hello", []); (new Function("return 5"))(); diff --git a/tests/baselines/reference/functionTypeArgumentAssignmentCompat.js b/tests/baselines/reference/functionTypeArgumentAssignmentCompat.js index 15080e99d73..b4ed20e9ed0 100644 --- a/tests/baselines/reference/functionTypeArgumentAssignmentCompat.js +++ b/tests/baselines/reference/functionTypeArgumentAssignmentCompat.js @@ -15,7 +15,9 @@ console.log(s); //// [functionTypeArgumentAssignmentCompat.js] var f; -var g = function () { return []; }; +var g = function () { + return []; +}; f = g; var s = f("str").toUpperCase(); console.log(s); diff --git a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.js b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.js index dae960bad68..6bca14b063b 100644 --- a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.js +++ b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.js @@ -6,6 +6,9 @@ var f3 = (): any => { }; //// [functionWithAnyReturnTypeAndNoReturnExpression.js] // All should be allowed -function f() { } -var f2 = function () { }; -var f3 = function () { }; +function f() { +} +var f2 = function () { +}; +var f3 = function () { +}; diff --git a/tests/baselines/reference/functionWithDefaultParameterWithNoStatements10.js b/tests/baselines/reference/functionWithDefaultParameterWithNoStatements10.js index f312966ea4f..a72b15a1b9c 100644 --- a/tests/baselines/reference/functionWithDefaultParameterWithNoStatements10.js +++ b/tests/baselines/reference/functionWithDefaultParameterWithNoStatements10.js @@ -6,8 +6,12 @@ function bar(a = [0]) { //// [functionWithDefaultParameterWithNoStatements10.js] function foo(a) { - if (a === void 0) { a = [0]; } + if (a === void 0) { a = [ + 0 + ]; } } function bar(a) { - if (a === void 0) { a = [0]; } + if (a === void 0) { a = [ + 0 + ]; } } diff --git a/tests/baselines/reference/functionWithDefaultParameterWithNoStatements13.js b/tests/baselines/reference/functionWithDefaultParameterWithNoStatements13.js index 7fcbae72541..db98c6353cc 100644 --- a/tests/baselines/reference/functionWithDefaultParameterWithNoStatements13.js +++ b/tests/baselines/reference/functionWithDefaultParameterWithNoStatements13.js @@ -9,8 +9,12 @@ function bar(a = [1 + 1]) { //// [functionWithDefaultParameterWithNoStatements13.js] var v; function foo(a) { - if (a === void 0) { a = [1 + 1]; } + if (a === void 0) { a = [ + 1 + 1 + ]; } } function bar(a) { - if (a === void 0) { a = [1 + 1]; } + if (a === void 0) { a = [ + 1 + 1 + ]; } } diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.js b/tests/baselines/reference/functionWithMultipleReturnStatements2.js index 4674c6db953..396c4a8d9c0 100644 --- a/tests/baselines/reference/functionWithMultipleReturnStatements2.js +++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.js @@ -166,18 +166,22 @@ function f10() { // returns number => void function f11() { if (true) { - return function (x) { }; + return function (x) { + }; } else { - return function (x) { }; + return function (x) { + }; } } // returns Object => void function f12() { if (true) { - return function (x) { }; + return function (x) { + }; } else { - return function (x) { }; + return function (x) { + }; } } diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js index 592a03d7158..ae8e7d9c918 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js @@ -228,8 +228,7 @@ var C = (function () { // Not fine, since we can *only* consist of a single throw statement // if no return statements are present but we are a get accessor. throw null; - throw undefined. - ; + throw undefined.; }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/functionsWithModifiersInBlocks1.js b/tests/baselines/reference/functionsWithModifiersInBlocks1.js index 757fe509747..1d381bccfe1 100644 --- a/tests/baselines/reference/functionsWithModifiersInBlocks1.js +++ b/tests/baselines/reference/functionsWithModifiersInBlocks1.js @@ -7,6 +7,7 @@ //// [functionsWithModifiersInBlocks1.js] { - function f() { } + function f() { + } exports.f = f; } diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.js b/tests/baselines/reference/funduleSplitAcrossFiles.js index bb59338a630..330fbcdec74 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.js +++ b/tests/baselines/reference/funduleSplitAcrossFiles.js @@ -10,7 +10,8 @@ module D { D.y; //// [funduleSplitAcrossFiles_function.js] -function D() { } +function D() { +} //// [funduleSplitAcrossFiles_module.js] var D; (function (D) { diff --git a/tests/baselines/reference/fuzzy.js b/tests/baselines/reference/fuzzy.js index b98a9ced107..4729b59e2c3 100644 --- a/tests/baselines/reference/fuzzy.js +++ b/tests/baselines/reference/fuzzy.js @@ -38,13 +38,20 @@ var M; this.x = x; } C.prototype.works = function () { - return ({ anything: 1 }); + return ({ + anything: 1 + }); }; C.prototype.doesntWork = function () { - return { anything: 1, oneI: this }; + return { + anything: 1, + oneI: this + }; }; C.prototype.worksToo = function () { - return ({ oneI: this }); + return ({ + oneI: this + }); }; return C; })(); diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js index a88929669fd..ec79d3a7522 100644 --- a/tests/baselines/reference/generatedContextualTyping.js +++ b/tests/baselines/reference/generatedContextualTyping.js @@ -381,1072 +381,2973 @@ var Derived2 = (function (_super) { return Derived2; })(Base); var b = new Base(), d1 = new Derived1(), d2 = new Derived2(); -var x1 = function () { return [d1, d2]; }; -var x2 = function () { return [d1, d2]; }; -var x3 = function named() { return [d1, d2]; }; -var x4 = function () { return [d1, d2]; }; -var x5 = function () { return [d1, d2]; }; -var x6 = function named() { return [d1, d2]; }; -var x7 = [d1, d2]; -var x8 = [d1, d2]; -var x9 = [d1, d2]; -var x10 = { n: [d1, d2] }; -var x11 = function (n) { var n; return null; }; -var x12 = { func: function (n) { return [d1, d2]; } }; +var x1 = function () { + return [ + d1, + d2 + ]; +}; +var x2 = function () { + return [ + d1, + d2 + ]; +}; +var x3 = function named() { + return [ + d1, + d2 + ]; +}; +var x4 = function () { + return [ + d1, + d2 + ]; +}; +var x5 = function () { + return [ + d1, + d2 + ]; +}; +var x6 = function named() { + return [ + d1, + d2 + ]; +}; +var x7 = [ + d1, + d2 +]; +var x8 = [ + d1, + d2 +]; +var x9 = [ + d1, + d2 +]; +var x10 = { + n: [ + d1, + d2 + ] +}; +var x11 = function (n) { + var n; + return null; +}; +var x12 = { + func: function (n) { + return [ + d1, + d2 + ]; + } +}; var x13 = (function () { function x13() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x13; })(); var x14 = (function () { function x14() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x14; })(); var x15 = (function () { function x15() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x15; })(); var x16 = (function () { function x16() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x16; })(); var x17 = (function () { function x17() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x17; })(); var x18 = (function () { function x18() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x18; })(); var x19 = (function () { function x19() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x19; })(); var x20 = (function () { function x20() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x20; })(); var x21 = (function () { function x21() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x21; })(); var x22 = (function () { function x22() { - this.member = { n: [d1, d2] }; + this.member = { + n: [ + d1, + d2 + ] + }; } return x22; })(); var x23 = (function () { function x23() { - this.member = function (n) { var n; return null; }; + this.member = function (n) { + var n; + return null; + }; } return x23; })(); var x24 = (function () { function x24() { - this.member = { func: function (n) { return [d1, d2]; } }; + this.member = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; } return x24; })(); var x25 = (function () { function x25() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x25; })(); var x26 = (function () { function x26() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x26; })(); var x27 = (function () { function x27() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x27; })(); var x28 = (function () { function x28() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x28; })(); var x29 = (function () { function x29() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x29; })(); var x30 = (function () { function x30() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x30; })(); var x31 = (function () { function x31() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x31; })(); var x32 = (function () { function x32() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x32; })(); var x33 = (function () { function x33() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x33; })(); var x34 = (function () { function x34() { - this.member = { n: [d1, d2] }; + this.member = { + n: [ + d1, + d2 + ] + }; } return x34; })(); var x35 = (function () { function x35() { - this.member = function (n) { var n; return null; }; + this.member = function (n) { + var n; + return null; + }; } return x35; })(); var x36 = (function () { function x36() { - this.member = { func: function (n) { return [d1, d2]; } }; + this.member = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; } return x36; })(); var x37 = (function () { function x37() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x37; })(); var x38 = (function () { function x38() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x38; })(); var x39 = (function () { function x39() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x39; })(); var x40 = (function () { function x40() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x40; })(); var x41 = (function () { function x41() { - this.member = function () { return [d1, d2]; }; + this.member = function () { + return [ + d1, + d2 + ]; + }; } return x41; })(); var x42 = (function () { function x42() { - this.member = function named() { return [d1, d2]; }; + this.member = function named() { + return [ + d1, + d2 + ]; + }; } return x42; })(); var x43 = (function () { function x43() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x43; })(); var x44 = (function () { function x44() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x44; })(); var x45 = (function () { function x45() { - this.member = [d1, d2]; + this.member = [ + d1, + d2 + ]; } return x45; })(); var x46 = (function () { function x46() { - this.member = { n: [d1, d2] }; + this.member = { + n: [ + d1, + d2 + ] + }; } return x46; })(); var x47 = (function () { function x47() { - this.member = function (n) { var n; return null; }; + this.member = function (n) { + var n; + return null; + }; } return x47; })(); var x48 = (function () { function x48() { - this.member = { func: function (n) { return [d1, d2]; } }; + this.member = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; } return x48; })(); var x49 = (function () { function x49() { } - x49.member = function () { return [d1, d2]; }; + x49.member = function () { + return [ + d1, + d2 + ]; + }; return x49; })(); var x50 = (function () { function x50() { } - x50.member = function () { return [d1, d2]; }; + x50.member = function () { + return [ + d1, + d2 + ]; + }; return x50; })(); var x51 = (function () { function x51() { } - x51.member = function named() { return [d1, d2]; }; + x51.member = function named() { + return [ + d1, + d2 + ]; + }; return x51; })(); var x52 = (function () { function x52() { } - x52.member = function () { return [d1, d2]; }; + x52.member = function () { + return [ + d1, + d2 + ]; + }; return x52; })(); var x53 = (function () { function x53() { } - x53.member = function () { return [d1, d2]; }; + x53.member = function () { + return [ + d1, + d2 + ]; + }; return x53; })(); var x54 = (function () { function x54() { } - x54.member = function named() { return [d1, d2]; }; + x54.member = function named() { + return [ + d1, + d2 + ]; + }; return x54; })(); var x55 = (function () { function x55() { } - x55.member = [d1, d2]; + x55.member = [ + d1, + d2 + ]; return x55; })(); var x56 = (function () { function x56() { } - x56.member = [d1, d2]; + x56.member = [ + d1, + d2 + ]; return x56; })(); var x57 = (function () { function x57() { } - x57.member = [d1, d2]; + x57.member = [ + d1, + d2 + ]; return x57; })(); var x58 = (function () { function x58() { } - x58.member = { n: [d1, d2] }; + x58.member = { + n: [ + d1, + d2 + ] + }; return x58; })(); var x59 = (function () { function x59() { } - x59.member = function (n) { var n; return null; }; + x59.member = function (n) { + var n; + return null; + }; return x59; })(); var x60 = (function () { function x60() { } - x60.member = { func: function (n) { return [d1, d2]; } }; + x60.member = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; return x60; })(); var x61 = (function () { function x61() { } - x61.member = function () { return [d1, d2]; }; + x61.member = function () { + return [ + d1, + d2 + ]; + }; return x61; })(); var x62 = (function () { function x62() { } - x62.member = function () { return [d1, d2]; }; + x62.member = function () { + return [ + d1, + d2 + ]; + }; return x62; })(); var x63 = (function () { function x63() { } - x63.member = function named() { return [d1, d2]; }; + x63.member = function named() { + return [ + d1, + d2 + ]; + }; return x63; })(); var x64 = (function () { function x64() { } - x64.member = function () { return [d1, d2]; }; + x64.member = function () { + return [ + d1, + d2 + ]; + }; return x64; })(); var x65 = (function () { function x65() { } - x65.member = function () { return [d1, d2]; }; + x65.member = function () { + return [ + d1, + d2 + ]; + }; return x65; })(); var x66 = (function () { function x66() { } - x66.member = function named() { return [d1, d2]; }; + x66.member = function named() { + return [ + d1, + d2 + ]; + }; return x66; })(); var x67 = (function () { function x67() { } - x67.member = [d1, d2]; + x67.member = [ + d1, + d2 + ]; return x67; })(); var x68 = (function () { function x68() { } - x68.member = [d1, d2]; + x68.member = [ + d1, + d2 + ]; return x68; })(); var x69 = (function () { function x69() { } - x69.member = [d1, d2]; + x69.member = [ + d1, + d2 + ]; return x69; })(); var x70 = (function () { function x70() { } - x70.member = { n: [d1, d2] }; + x70.member = { + n: [ + d1, + d2 + ] + }; return x70; })(); var x71 = (function () { function x71() { } - x71.member = function (n) { var n; return null; }; + x71.member = function (n) { + var n; + return null; + }; return x71; })(); var x72 = (function () { function x72() { } - x72.member = { func: function (n) { return [d1, d2]; } }; + x72.member = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; return x72; })(); var x73 = (function () { function x73() { } - x73.member = function () { return [d1, d2]; }; + x73.member = function () { + return [ + d1, + d2 + ]; + }; return x73; })(); var x74 = (function () { function x74() { } - x74.member = function () { return [d1, d2]; }; + x74.member = function () { + return [ + d1, + d2 + ]; + }; return x74; })(); var x75 = (function () { function x75() { } - x75.member = function named() { return [d1, d2]; }; + x75.member = function named() { + return [ + d1, + d2 + ]; + }; return x75; })(); var x76 = (function () { function x76() { } - x76.member = function () { return [d1, d2]; }; + x76.member = function () { + return [ + d1, + d2 + ]; + }; return x76; })(); var x77 = (function () { function x77() { } - x77.member = function () { return [d1, d2]; }; + x77.member = function () { + return [ + d1, + d2 + ]; + }; return x77; })(); var x78 = (function () { function x78() { } - x78.member = function named() { return [d1, d2]; }; + x78.member = function named() { + return [ + d1, + d2 + ]; + }; return x78; })(); var x79 = (function () { function x79() { } - x79.member = [d1, d2]; + x79.member = [ + d1, + d2 + ]; return x79; })(); var x80 = (function () { function x80() { } - x80.member = [d1, d2]; + x80.member = [ + d1, + d2 + ]; return x80; })(); var x81 = (function () { function x81() { } - x81.member = [d1, d2]; + x81.member = [ + d1, + d2 + ]; return x81; })(); var x82 = (function () { function x82() { } - x82.member = { n: [d1, d2] }; + x82.member = { + n: [ + d1, + d2 + ] + }; return x82; })(); var x83 = (function () { function x83() { } - x83.member = function (n) { var n; return null; }; + x83.member = function (n) { + var n; + return null; + }; return x83; })(); var x84 = (function () { function x84() { } - x84.member = { func: function (n) { return [d1, d2]; } }; + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } return x91; })(); var x92 = (function () { function x92(parm) { - if (parm === void 0) { parm = [d1, d2]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } return x92; })(); var x93 = (function () { function x93(parm) { - if (parm === void 0) { parm = [d1, d2]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } return x93; })(); var x94 = (function () { function x94(parm) { - if (parm === void 0) { parm = { n: [d1, d2] }; } + 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; }; } + 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]; } }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; } + 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]; } + 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]; } + 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] }; } + 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; }; } + 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]; } }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; }; } + 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]; } + 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]; } + 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]; } + 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] }; } + 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; }; } + 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]; } }; } + 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]; }; } + if (parm === void 0) { parm = function () { + return [ + d1, + d2 + ]; + }; } } function x122(parm) { - if (parm === void 0) { parm = function () { return [d1, d2]; }; } + if (parm === void 0) { parm = function () { + return [ + d1, + d2 + ]; + }; } } function x123(parm) { - if (parm === void 0) { parm = function named() { return [d1, d2]; }; } + if (parm === void 0) { parm = function named() { + return [ + d1, + d2 + ]; + }; } } function x124(parm) { - if (parm === void 0) { parm = function () { return [d1, d2]; }; } + if (parm === void 0) { parm = function () { + return [ + d1, + d2 + ]; + }; } } function x125(parm) { - if (parm === void 0) { parm = function () { return [d1, d2]; }; } + if (parm === void 0) { parm = function () { + return [ + d1, + d2 + ]; + }; } } function x126(parm) { - if (parm === void 0) { parm = function named() { return [d1, d2]; }; } + if (parm === void 0) { parm = function named() { + return [ + d1, + d2 + ]; + }; } } function x127(parm) { - if (parm === void 0) { parm = [d1, d2]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } function x128(parm) { - if (parm === void 0) { parm = [d1, d2]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } function x129(parm) { - if (parm === void 0) { parm = [d1, d2]; } + if (parm === void 0) { parm = [ + d1, + d2 + ]; } } function x130(parm) { - if (parm === void 0) { parm = { n: [d1, d2] }; } + if (parm === void 0) { parm = { + n: [ + d1, + d2 + ] + }; } } function x131(parm) { - if (parm === void 0) { parm = function (n) { var n; return null; }; } + if (parm === void 0) { parm = function (n) { + var n; + return null; + }; } } function x132(parm) { - if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; } + if (parm === void 0) { parm = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; } } -function x133() { return function () { return [d1, d2]; }; } -function x134() { return function () { return [d1, d2]; }; } -function x135() { return function named() { return [d1, d2]; }; } -function x136() { return function () { return [d1, d2]; }; } -function x137() { return function () { return [d1, d2]; }; } -function x138() { return function named() { return [d1, d2]; }; } -function x139() { return [d1, d2]; } -function x140() { return [d1, d2]; } -function x141() { return [d1, d2]; } -function x142() { return { n: [d1, d2] }; } -function x143() { return function (n) { var n; return null; }; } -function x144() { return { func: function (n) { return [d1, d2]; } }; } -function x145() { return function () { return [d1, d2]; }; return function () { return [d1, d2]; }; } -function x146() { return function () { return [d1, d2]; }; return function () { return [d1, d2]; }; } -function x147() { return function named() { return [d1, d2]; }; return function named() { return [d1, d2]; }; } -function x148() { return function () { return [d1, d2]; }; return function () { return [d1, d2]; }; } -function x149() { return function () { return [d1, d2]; }; return function () { return [d1, d2]; }; } -function x150() { return function named() { return [d1, d2]; }; return function named() { return [d1, d2]; }; } -function x151() { return [d1, d2]; return [d1, d2]; } -function x152() { return [d1, d2]; return [d1, d2]; } -function x153() { return [d1, d2]; return [d1, d2]; } -function x154() { return { n: [d1, d2] }; return { n: [d1, d2] }; } -function x155() { return function (n) { var n; return null; }; return function (n) { var n; return null; }; } -function x156() { return { func: function (n) { return [d1, d2]; } }; return { func: function (n) { return [d1, d2]; } }; } -var x157 = function () { return function () { return [d1, d2]; }; }; -var x158 = function () { return function () { return [d1, d2]; }; }; -var x159 = function () { return function named() { return [d1, d2]; }; }; -var x160 = function () { return function () { return [d1, d2]; }; }; -var x161 = function () { return function () { return [d1, d2]; }; }; -var x162 = function () { return function named() { return [d1, d2]; }; }; -var x163 = function () { return [d1, d2]; }; -var x164 = function () { return [d1, d2]; }; -var x165 = function () { return [d1, d2]; }; -var x166 = function () { return { n: [d1, d2] }; }; -var x167 = function () { return function (n) { var n; return null; }; }; -var x168 = function () { return { func: function (n) { return [d1, d2]; } }; }; -var x169 = function () { return function () { return [d1, d2]; }; }; -var x170 = function () { return function () { return [d1, d2]; }; }; -var x171 = function () { return function named() { return [d1, d2]; }; }; -var x172 = function () { return function () { return [d1, d2]; }; }; -var x173 = function () { return function () { return [d1, d2]; }; }; -var x174 = function () { return function named() { return [d1, d2]; }; }; -var x175 = function () { return [d1, d2]; }; -var x176 = function () { return [d1, d2]; }; -var x177 = function () { return [d1, d2]; }; -var x178 = function () { return { n: [d1, d2] }; }; -var x179 = function () { return function (n) { var n; return null; }; }; -var x180 = function () { return { func: function (n) { return [d1, d2]; } }; }; +function x133() { + return function () { + return [ + d1, + d2 + ]; + }; +} +function x134() { + return function () { + return [ + d1, + d2 + ]; + }; +} +function x135() { + return function named() { + return [ + d1, + d2 + ]; + }; +} +function x136() { + return function () { + return [ + d1, + d2 + ]; + }; +} +function x137() { + return function () { + return [ + d1, + d2 + ]; + }; +} +function x138() { + return function named() { + return [ + d1, + d2 + ]; + }; +} +function x139() { + return [ + d1, + d2 + ]; +} +function x140() { + return [ + d1, + d2 + ]; +} +function x141() { + return [ + d1, + d2 + ]; +} +function x142() { + return { + n: [ + d1, + d2 + ] + }; +} +function x143() { + return function (n) { + var n; + return null; + }; +} +function x144() { + return { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; +} +function x145() { + return function () { + return [ + d1, + d2 + ]; + }; + return function () { + return [ + d1, + d2 + ]; + }; +} +function x146() { + return function () { + return [ + d1, + d2 + ]; + }; + return function () { + return [ + d1, + d2 + ]; + }; +} +function x147() { + return function named() { + return [ + d1, + d2 + ]; + }; + return function named() { + return [ + d1, + d2 + ]; + }; +} +function x148() { + return function () { + return [ + d1, + d2 + ]; + }; + return function () { + return [ + d1, + d2 + ]; + }; +} +function x149() { + return function () { + return [ + d1, + d2 + ]; + }; + return function () { + return [ + d1, + d2 + ]; + }; +} +function x150() { + return function named() { + return [ + d1, + d2 + ]; + }; + return function named() { + return [ + d1, + d2 + ]; + }; +} +function x151() { + return [ + d1, + d2 + ]; + return [ + d1, + d2 + ]; +} +function x152() { + return [ + d1, + d2 + ]; + return [ + d1, + d2 + ]; +} +function x153() { + return [ + d1, + d2 + ]; + return [ + d1, + d2 + ]; +} +function x154() { + return { + n: [ + d1, + d2 + ] + }; + return { + n: [ + d1, + d2 + ] + }; +} +function x155() { + return function (n) { + var n; + return null; + }; + return function (n) { + var n; + return null; + }; +} +function x156() { + return { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; + return { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; +} +var x157 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x158 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x159 = function () { + return function named() { + return [ + d1, + d2 + ]; + }; +}; +var x160 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x161 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x162 = function () { + return function named() { + return [ + d1, + d2 + ]; + }; +}; +var x163 = function () { + return [ + d1, + d2 + ]; +}; +var x164 = function () { + return [ + d1, + d2 + ]; +}; +var x165 = function () { + return [ + d1, + d2 + ]; +}; +var x166 = function () { + return { + n: [ + d1, + d2 + ] + }; +}; +var x167 = function () { + return function (n) { + var n; + return null; + }; +}; +var x168 = function () { + return { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; +}; +var x169 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x170 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x171 = function () { + return function named() { + return [ + d1, + d2 + ]; + }; +}; +var x172 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x173 = function () { + return function () { + return [ + d1, + d2 + ]; + }; +}; +var x174 = function () { + return function named() { + return [ + d1, + d2 + ]; + }; +}; +var x175 = function () { + return [ + d1, + d2 + ]; +}; +var x176 = function () { + return [ + d1, + d2 + ]; +}; +var x177 = function () { + return [ + d1, + d2 + ]; +}; +var x178 = function () { + return { + n: [ + d1, + d2 + ] + }; +}; +var x179 = function () { + return function (n) { + var n; + return null; + }; +}; +var x180 = function () { + return { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; +}; var x181; (function (x181) { - var t = function () { return [d1, d2]; }; + var t = function () { + return [ + d1, + d2 + ]; + }; })(x181 || (x181 = {})); var x182; (function (x182) { - var t = function () { return [d1, d2]; }; + var t = function () { + return [ + d1, + d2 + ]; + }; })(x182 || (x182 = {})); var x183; (function (x183) { - var t = function named() { return [d1, d2]; }; + var t = function named() { + return [ + d1, + d2 + ]; + }; })(x183 || (x183 = {})); var x184; (function (x184) { - var t = function () { return [d1, d2]; }; + var t = function () { + return [ + d1, + d2 + ]; + }; })(x184 || (x184 = {})); var x185; (function (x185) { - var t = function () { return [d1, d2]; }; + var t = function () { + return [ + d1, + d2 + ]; + }; })(x185 || (x185 = {})); var x186; (function (x186) { - var t = function named() { return [d1, d2]; }; + var t = function named() { + return [ + d1, + d2 + ]; + }; })(x186 || (x186 = {})); var x187; (function (x187) { - var t = [d1, d2]; + var t = [ + d1, + d2 + ]; })(x187 || (x187 = {})); var x188; (function (x188) { - var t = [d1, d2]; + var t = [ + d1, + d2 + ]; })(x188 || (x188 = {})); var x189; (function (x189) { - var t = [d1, d2]; + var t = [ + d1, + d2 + ]; })(x189 || (x189 = {})); var x190; (function (x190) { - var t = { n: [d1, d2] }; + var t = { + n: [ + d1, + d2 + ] + }; })(x190 || (x190 = {})); var x191; (function (x191) { - var t = function (n) { var n; return null; }; + var t = function (n) { + var n; + return null; + }; })(x191 || (x191 = {})); var x192; (function (x192) { - var t = { func: function (n) { return [d1, d2]; } }; + var t = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; })(x192 || (x192 = {})); var x193; (function (x193) { - x193.t = function () { return [d1, d2]; }; + x193.t = function () { + return [ + d1, + d2 + ]; + }; })(x193 || (x193 = {})); var x194; (function (x194) { - x194.t = function () { return [d1, d2]; }; + x194.t = function () { + return [ + d1, + d2 + ]; + }; })(x194 || (x194 = {})); var x195; (function (x195) { - x195.t = function named() { return [d1, d2]; }; + x195.t = function named() { + return [ + d1, + d2 + ]; + }; })(x195 || (x195 = {})); var x196; (function (x196) { - x196.t = function () { return [d1, d2]; }; + x196.t = function () { + return [ + d1, + d2 + ]; + }; })(x196 || (x196 = {})); var x197; (function (x197) { - x197.t = function () { return [d1, d2]; }; + x197.t = function () { + return [ + d1, + d2 + ]; + }; })(x197 || (x197 = {})); var x198; (function (x198) { - x198.t = function named() { return [d1, d2]; }; + x198.t = function named() { + return [ + d1, + d2 + ]; + }; })(x198 || (x198 = {})); var x199; (function (x199) { - x199.t = [d1, d2]; + x199.t = [ + d1, + d2 + ]; })(x199 || (x199 = {})); var x200; (function (x200) { - x200.t = [d1, d2]; + x200.t = [ + d1, + d2 + ]; })(x200 || (x200 = {})); var x201; (function (x201) { - x201.t = [d1, d2]; + x201.t = [ + d1, + d2 + ]; })(x201 || (x201 = {})); var x202; (function (x202) { - x202.t = { n: [d1, d2] }; + x202.t = { + n: [ + d1, + d2 + ] + }; })(x202 || (x202 = {})); var x203; (function (x203) { - x203.t = function (n) { var n; return null; }; + x203.t = function (n) { + var n; + return null; + }; })(x203 || (x203 = {})); var x204; (function (x204) { - x204.t = { func: function (n) { return [d1, d2]; } }; + x204.t = { + func: function (n) { + return [ + d1, + d2 + ]; + } + }; })(x204 || (x204 = {})); -var x206 = function () { return [d1, d2]; }; -var x207 = function named() { return [d1, d2]; }; -var x209 = function () { return [d1, d2]; }; -var x210 = function named() { return [d1, d2]; }; -var x211 = [d1, d2]; -var x212 = [d1, d2]; -var x213 = [d1, d2]; -var x214 = { n: [d1, d2] }; -var x216 = { func: function (n) { return [d1, d2]; } }; -var x217 = undefined || function () { return [d1, d2]; }; -var x218 = undefined || function named() { return [d1, d2]; }; -var x219 = undefined || function () { return [d1, d2]; }; -var x220 = undefined || function named() { return [d1, d2]; }; -var x221 = undefined || [d1, d2]; -var x222 = undefined || [d1, d2]; -var x223 = undefined || [d1, d2]; -var x224 = undefined || { n: [d1, d2] }; +var x206 = function () { + return [ + d1, + d2 + ]; +}; +var x207 = function named() { + return [ + d1, + d2 + ]; +}; +var x209 = function () { + return [ + d1, + d2 + ]; +}; +var x210 = function named() { + return [ + d1, + d2 + ]; +}; +var x211 = [ + d1, + d2 +]; +var x212 = [ + d1, + d2 +]; +var x213 = [ + d1, + d2 +]; +var x214 = { + n: [ + d1, + d2 + ] +}; +var x216 = { + func: function (n) { + return [ + d1, + d2 + ]; + } +}; +var x217 = undefined || function () { + return [ + d1, + d2 + ]; +}; +var x218 = undefined || function named() { + return [ + d1, + d2 + ]; +}; +var x219 = undefined || function () { + return [ + d1, + d2 + ]; +}; +var x220 = undefined || function named() { + return [ + d1, + d2 + ]; +}; +var x221 = undefined || [ + d1, + d2 +]; +var x222 = undefined || [ + d1, + d2 +]; +var x223 = undefined || [ + d1, + d2 +]; +var x224 = undefined || { + n: [ + d1, + d2 + ] +}; var x225; -x225 = function () { return [d1, d2]; }; +x225 = function () { + return [ + d1, + d2 + ]; +}; var x226; -x226 = function () { return [d1, d2]; }; +x226 = function () { + return [ + d1, + d2 + ]; +}; var x227; -x227 = function named() { return [d1, d2]; }; +x227 = function named() { + return [ + d1, + d2 + ]; +}; var x228; -x228 = function () { return [d1, d2]; }; +x228 = function () { + return [ + d1, + d2 + ]; +}; var x229; -x229 = function () { return [d1, d2]; }; +x229 = function () { + return [ + d1, + d2 + ]; +}; var x230; -x230 = function named() { return [d1, d2]; }; +x230 = function named() { + return [ + d1, + d2 + ]; +}; var x231; -x231 = [d1, d2]; +x231 = [ + d1, + d2 +]; var x232; -x232 = [d1, d2]; +x232 = [ + d1, + d2 +]; var x233; -x233 = [d1, d2]; +x233 = [ + d1, + d2 +]; var x234; -x234 = { n: [d1, d2] }; +x234 = { + n: [ + d1, + d2 + ] +}; var x235; -x235 = function (n) { var n; return null; }; +x235 = function (n) { + var n; + return null; +}; var x236; -x236 = { func: function (n) { return [d1, d2]; } }; -var x237 = { n: function () { return [d1, d2]; } }; -var x238 = { n: function () { return [d1, d2]; } }; -var x239 = { n: function named() { return [d1, d2]; } }; -var x240 = { n: function () { return [d1, d2]; } }; -var x241 = { n: function () { return [d1, d2]; } }; -var x242 = { n: function named() { return [d1, d2]; } }; -var x243 = { n: [d1, d2] }; -var x244 = { n: [d1, d2] }; -var x245 = { n: [d1, d2] }; -var x246 = { n: { n: [d1, d2] } }; -var x247 = { n: function (n) { var n; return null; } }; -var x248 = { n: { func: function (n) { return [d1, d2]; } } }; -var x252 = [function () { return [d1, d2]; }]; -var x253 = [function () { return [d1, d2]; }]; -var x254 = [function named() { return [d1, d2]; }]; -var x255 = [[d1, d2]]; -var x256 = [[d1, d2]]; -var x257 = [[d1, d2]]; -var x258 = [{ n: [d1, d2] }]; -var x260 = [{ func: function (n) { return [d1, d2]; } }]; -var x261 = function () { return [d1, d2]; } || undefined; -var x262 = function named() { return [d1, d2]; } || undefined; -var x263 = function () { return [d1, d2]; } || undefined; -var x264 = function named() { return [d1, d2]; } || undefined; -var x265 = [d1, d2] || undefined; -var x266 = [d1, d2] || undefined; -var x267 = [d1, d2] || undefined; -var x268 = { n: [d1, d2] } || undefined; -var x269 = undefined || function () { return [d1, d2]; }; -var x270 = undefined || function named() { return [d1, d2]; }; -var x271 = undefined || function () { return [d1, d2]; }; -var x272 = undefined || function named() { return [d1, d2]; }; -var x273 = undefined || [d1, d2]; -var x274 = undefined || [d1, d2]; -var x275 = undefined || [d1, d2]; -var x276 = undefined || { n: [d1, d2] }; -var x277 = function () { return [d1, d2]; } || function () { return [d1, d2]; }; -var x278 = function named() { return [d1, d2]; } || function named() { return [d1, d2]; }; -var x279 = function () { return [d1, d2]; } || function () { return [d1, d2]; }; -var x280 = function named() { return [d1, d2]; } || function named() { return [d1, d2]; }; -var x281 = [d1, d2] || [d1, d2]; -var x282 = [d1, d2] || [d1, d2]; -var x283 = [d1, d2] || [d1, d2]; -var x284 = { n: [d1, d2] } || { n: [d1, d2] }; -var x285 = true ? function () { return [d1, d2]; } : function () { return [d1, d2]; }; -var x286 = true ? function () { return [d1, d2]; } : function () { return [d1, d2]; }; -var x287 = true ? function named() { return [d1, d2]; } : function named() { return [d1, d2]; }; -var x288 = true ? function () { return [d1, d2]; } : function () { return [d1, d2]; }; -var x289 = true ? function () { return [d1, d2]; } : function () { return [d1, d2]; }; -var x290 = true ? function named() { return [d1, d2]; } : function named() { return [d1, d2]; }; -var x291 = true ? [d1, d2] : [d1, d2]; -var x292 = true ? [d1, d2] : [d1, d2]; -var x293 = true ? [d1, d2] : [d1, d2]; -var x294 = true ? { n: [d1, d2] } : { n: [d1, d2] }; -var x295 = true ? function (n) { var n; return null; } : function (n) { var n; return null; }; -var x296 = true ? { func: function (n) { return [d1, d2]; } } : { func: function (n) { return [d1, d2]; } }; -var x297 = true ? undefined : function () { return [d1, d2]; }; -var x298 = true ? undefined : function () { return [d1, d2]; }; -var x299 = true ? undefined : function named() { return [d1, d2]; }; -var x300 = true ? undefined : function () { return [d1, d2]; }; -var x301 = true ? undefined : function () { return [d1, d2]; }; -var x302 = true ? undefined : function named() { return [d1, d2]; }; -var x303 = true ? undefined : [d1, d2]; -var x304 = true ? undefined : [d1, d2]; -var x305 = true ? undefined : [d1, d2]; -var x306 = true ? undefined : { n: [d1, d2] }; -var x307 = true ? undefined : function (n) { var n; return null; }; -var x308 = true ? undefined : { func: function (n) { return [d1, d2]; } }; -var x309 = true ? function () { return [d1, d2]; } : undefined; -var x310 = true ? function () { return [d1, d2]; } : undefined; -var x311 = true ? function named() { return [d1, d2]; } : undefined; -var x312 = true ? function () { return [d1, d2]; } : undefined; -var x313 = true ? function () { return [d1, d2]; } : undefined; -var x314 = true ? function named() { return [d1, d2]; } : undefined; -var x315 = true ? [d1, d2] : undefined; -var x316 = true ? [d1, d2] : undefined; -var x317 = true ? [d1, d2] : undefined; -var x318 = true ? { n: [d1, d2] } : undefined; -var x319 = true ? function (n) { var n; return null; } : undefined; -var x320 = true ? { func: function (n) { return [d1, d2]; } } : undefined; -function x321(n) { } +x236 = { + func: function (n) { + return [ + d1, + d2 + ]; + } +}; +var x237 = { + n: function () { + return [ + d1, + d2 + ]; + } +}; +var x238 = { + n: function () { + return [ + d1, + d2 + ]; + } +}; +var x239 = { + n: function named() { + return [ + d1, + d2 + ]; + } +}; +var x240 = { + n: function () { + return [ + d1, + d2 + ]; + } +}; +var x241 = { + n: function () { + return [ + d1, + d2 + ]; + } +}; +var x242 = { + n: function named() { + return [ + d1, + d2 + ]; + } +}; +var x243 = { + n: [ + d1, + d2 + ] +}; +var x244 = { + n: [ + d1, + d2 + ] +}; +var x245 = { + n: [ + d1, + d2 + ] +}; +var x246 = { + n: { + n: [ + d1, + d2 + ] + } +}; +var x247 = { + n: function (n) { + var n; + return null; + } +}; +var x248 = { + n: { + func: function (n) { + return [ + d1, + d2 + ]; + } + } +}; +var x252 = [ + function () { + return [ + d1, + d2 + ]; + } +]; +var x253 = [ + function () { + return [ + d1, + d2 + ]; + } +]; +var x254 = [ + function named() { + return [ + d1, + d2 + ]; + } +]; +var x255 = [ + [ + d1, + d2 + ] +]; +var x256 = [ + [ + d1, + d2 + ] +]; +var x257 = [ + [ + d1, + d2 + ] +]; +var x258 = [ + { + n: [ + d1, + d2 + ] + } +]; +var x260 = [ + { + func: function (n) { + return [ + d1, + d2 + ]; + } + } +]; +var x261 = function () { + return [ + d1, + d2 + ]; +} || undefined; +var x262 = function named() { + return [ + d1, + d2 + ]; +} || undefined; +var x263 = function () { + return [ + d1, + d2 + ]; +} || undefined; +var x264 = function named() { + return [ + d1, + d2 + ]; +} || undefined; +var x265 = [ + d1, + d2 +] || undefined; +var x266 = [ + d1, + d2 +] || undefined; +var x267 = [ + d1, + d2 +] || undefined; +var x268 = { + n: [ + d1, + d2 + ] +} || undefined; +var x269 = undefined || function () { + return [ + d1, + d2 + ]; +}; +var x270 = undefined || function named() { + return [ + d1, + d2 + ]; +}; +var x271 = undefined || function () { + return [ + d1, + d2 + ]; +}; +var x272 = undefined || function named() { + return [ + d1, + d2 + ]; +}; +var x273 = undefined || [ + d1, + d2 +]; +var x274 = undefined || [ + d1, + d2 +]; +var x275 = undefined || [ + d1, + d2 +]; +var x276 = undefined || { + n: [ + d1, + d2 + ] +}; +var x277 = function () { + return [ + d1, + d2 + ]; +} || function () { + return [ + d1, + d2 + ]; +}; +var x278 = function named() { + return [ + d1, + d2 + ]; +} || function named() { + return [ + d1, + d2 + ]; +}; +var x279 = function () { + return [ + d1, + d2 + ]; +} || function () { + return [ + d1, + d2 + ]; +}; +var x280 = function named() { + return [ + d1, + d2 + ]; +} || function named() { + return [ + d1, + d2 + ]; +}; +var x281 = [ + d1, + d2 +] || [ + d1, + d2 +]; +var x282 = [ + d1, + d2 +] || [ + d1, + d2 +]; +var x283 = [ + d1, + d2 +] || [ + d1, + d2 +]; +var x284 = { + n: [ + d1, + d2 + ] +} || { + n: [ + d1, + d2 + ] +}; +var x285 = true ? function () { + return [ + d1, + d2 + ]; +} : function () { + return [ + d1, + d2 + ]; +}; +var x286 = true ? function () { + return [ + d1, + d2 + ]; +} : function () { + return [ + d1, + d2 + ]; +}; +var x287 = true ? function named() { + return [ + d1, + d2 + ]; +} : function named() { + return [ + d1, + d2 + ]; +}; +var x288 = true ? function () { + return [ + d1, + d2 + ]; +} : function () { + return [ + d1, + d2 + ]; +}; +var x289 = true ? function () { + return [ + d1, + d2 + ]; +} : function () { + return [ + d1, + d2 + ]; +}; +var x290 = true ? function named() { + return [ + d1, + d2 + ]; +} : function named() { + return [ + d1, + d2 + ]; +}; +var x291 = true ? [ + d1, + d2 +] : [ + d1, + d2 +]; +var x292 = true ? [ + d1, + d2 +] : [ + d1, + d2 +]; +var x293 = true ? [ + d1, + d2 +] : [ + d1, + d2 +]; +var x294 = true ? { + n: [ + d1, + d2 + ] +} : { + n: [ + d1, + d2 + ] +}; +var x295 = true ? function (n) { + var n; + return null; +} : function (n) { + var n; + return null; +}; +var x296 = true ? { + func: function (n) { + return [ + d1, + d2 + ]; + } +} : { + func: function (n) { + return [ + d1, + d2 + ]; + } +}; +var x297 = true ? undefined : function () { + return [ + d1, + d2 + ]; +}; +var x298 = true ? undefined : function () { + return [ + d1, + d2 + ]; +}; +var x299 = true ? undefined : function named() { + return [ + d1, + d2 + ]; +}; +var x300 = true ? undefined : function () { + return [ + d1, + d2 + ]; +}; +var x301 = true ? undefined : function () { + return [ + d1, + d2 + ]; +}; +var x302 = true ? undefined : function named() { + return [ + d1, + d2 + ]; +}; +var x303 = true ? undefined : [ + d1, + d2 +]; +var x304 = true ? undefined : [ + d1, + d2 +]; +var x305 = true ? undefined : [ + d1, + d2 +]; +var x306 = true ? undefined : { + n: [ + d1, + d2 + ] +}; +var x307 = true ? undefined : function (n) { + var n; + return null; +}; +var x308 = true ? undefined : { + func: function (n) { + return [ + d1, + d2 + ]; + } +}; +var x309 = true ? function () { + return [ + d1, + d2 + ]; +} : undefined; +var x310 = true ? function () { + return [ + d1, + d2 + ]; +} : undefined; +var x311 = true ? function named() { + return [ + d1, + d2 + ]; +} : undefined; +var x312 = true ? function () { + return [ + d1, + d2 + ]; +} : undefined; +var x313 = true ? function () { + return [ + d1, + d2 + ]; +} : undefined; +var x314 = true ? function named() { + return [ + d1, + d2 + ]; +} : undefined; +var x315 = true ? [ + d1, + d2 +] : undefined; +var x316 = true ? [ + d1, + d2 +] : undefined; +var x317 = true ? [ + d1, + d2 +] : undefined; +var x318 = true ? { + n: [ + d1, + d2 + ] +} : undefined; +var x319 = true ? function (n) { + var n; + return null; +} : undefined; +var x320 = true ? { + func: function (n) { + return [ + d1, + d2 + ]; + } +} : undefined; +function x321(n) { +} ; -x321(function () { return [d1, d2]; }); -function x322(n) { } +x321(function () { + return [ + d1, + d2 + ]; +}); +function x322(n) { +} ; -x322(function () { return [d1, d2]; }); -function x323(n) { } +x322(function () { + return [ + d1, + d2 + ]; +}); +function x323(n) { +} ; -x323(function named() { return [d1, d2]; }); -function x324(n) { } +x323(function named() { + return [ + d1, + d2 + ]; +}); +function x324(n) { +} ; -x324(function () { return [d1, d2]; }); -function x325(n) { } +x324(function () { + return [ + d1, + d2 + ]; +}); +function x325(n) { +} ; -x325(function () { return [d1, d2]; }); -function x326(n) { } +x325(function () { + return [ + d1, + d2 + ]; +}); +function x326(n) { +} ; -x326(function named() { return [d1, d2]; }); -function x327(n) { } +x326(function named() { + return [ + d1, + d2 + ]; +}); +function x327(n) { +} ; -x327([d1, d2]); -function x328(n) { } +x327([ + d1, + d2 +]); +function x328(n) { +} ; -x328([d1, d2]); -function x329(n) { } +x328([ + d1, + d2 +]); +function x329(n) { +} ; -x329([d1, d2]); -function x330(n) { } +x329([ + d1, + d2 +]); +function x330(n) { +} ; -x330({ n: [d1, d2] }); -function x331(n) { } +x330({ + n: [ + d1, + d2 + ] +}); +function x331(n) { +} ; -x331(function (n) { var n; return null; }); -function x332(n) { } +x331(function (n) { + var n; + return null; +}); +function x332(n) { +} ; -x332({ func: function (n) { return [d1, d2]; } }); -var x333 = function (n) { return n; }; -x333(function () { return [d1, d2]; }); -var x334 = function (n) { return n; }; -x334(function () { return [d1, d2]; }); -var x335 = function (n) { return n; }; -x335(function named() { return [d1, d2]; }); -var x336 = function (n) { return n; }; -x336(function () { return [d1, d2]; }); -var x337 = function (n) { return n; }; -x337(function () { return [d1, d2]; }); -var x338 = function (n) { return n; }; -x338(function named() { return [d1, d2]; }); -var x339 = function (n) { return n; }; -x339([d1, d2]); -var x340 = function (n) { return n; }; -x340([d1, d2]); -var x341 = function (n) { return n; }; -x341([d1, d2]); -var x342 = function (n) { return n; }; -x342({ n: [d1, d2] }); -var x343 = function (n) { return n; }; -x343(function (n) { var n; return null; }); -var x344 = function (n) { return n; }; -x344({ func: function (n) { return [d1, d2]; } }); -var x345 = function (n) { }; -x345(function () { return [d1, d2]; }); -var x346 = function (n) { }; -x346(function () { return [d1, d2]; }); -var x347 = function (n) { }; -x347(function named() { return [d1, d2]; }); -var x348 = function (n) { }; -x348(function () { return [d1, d2]; }); -var x349 = function (n) { }; -x349(function () { return [d1, d2]; }); -var x350 = function (n) { }; -x350(function named() { return [d1, d2]; }); -var x351 = function (n) { }; -x351([d1, d2]); -var x352 = function (n) { }; -x352([d1, d2]); -var x353 = function (n) { }; -x353([d1, d2]); -var x354 = function (n) { }; -x354({ n: [d1, d2] }); -var x355 = function (n) { }; -x355(function (n) { var n; return null; }); -var x356 = function (n) { }; -x356({ func: function (n) { return [d1, d2]; } }); +x332({ + func: function (n) { + return [ + d1, + d2 + ]; + } +}); +var x333 = function (n) { + return n; +}; +x333(function () { + return [ + d1, + d2 + ]; +}); +var x334 = function (n) { + return n; +}; +x334(function () { + return [ + d1, + d2 + ]; +}); +var x335 = function (n) { + return n; +}; +x335(function named() { + return [ + d1, + d2 + ]; +}); +var x336 = function (n) { + return n; +}; +x336(function () { + return [ + d1, + d2 + ]; +}); +var x337 = function (n) { + return n; +}; +x337(function () { + return [ + d1, + d2 + ]; +}); +var x338 = function (n) { + return n; +}; +x338(function named() { + return [ + d1, + d2 + ]; +}); +var x339 = function (n) { + return n; +}; +x339([ + d1, + d2 +]); +var x340 = function (n) { + return n; +}; +x340([ + d1, + d2 +]); +var x341 = function (n) { + return n; +}; +x341([ + d1, + d2 +]); +var x342 = function (n) { + return n; +}; +x342({ + n: [ + d1, + d2 + ] +}); +var x343 = function (n) { + return n; +}; +x343(function (n) { + var n; + return null; +}); +var x344 = function (n) { + return n; +}; +x344({ + func: function (n) { + return [ + d1, + d2 + ]; + } +}); +var x345 = function (n) { +}; +x345(function () { + return [ + d1, + d2 + ]; +}); +var x346 = function (n) { +}; +x346(function () { + return [ + d1, + d2 + ]; +}); +var x347 = function (n) { +}; +x347(function named() { + return [ + d1, + d2 + ]; +}); +var x348 = function (n) { +}; +x348(function () { + return [ + d1, + d2 + ]; +}); +var x349 = function (n) { +}; +x349(function () { + return [ + d1, + d2 + ]; +}); +var x350 = function (n) { +}; +x350(function named() { + return [ + d1, + d2 + ]; +}); +var x351 = function (n) { +}; +x351([ + d1, + d2 +]); +var x352 = function (n) { +}; +x352([ + d1, + d2 +]); +var x353 = function (n) { +}; +x353([ + d1, + d2 +]); +var x354 = function (n) { +}; +x354({ + n: [ + d1, + d2 + ] +}); +var x355 = function (n) { +}; +x355(function (n) { + var n; + return null; +}); +var x356 = function (n) { +}; +x356({ + func: function (n) { + return [ + d1, + d2 + ]; + } +}); diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.js b/tests/baselines/reference/generativeRecursionWithTypeOf.js index 2b7eebfd11c..599751ebde7 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.js +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.js @@ -14,7 +14,8 @@ module M { var C = (function () { function C() { } - C.foo = function (x) { }; + C.foo = function (x) { + }; return C; })(); var M; diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js index dd06b855b68..321400fc24d 100644 --- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js +++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js @@ -23,6 +23,13 @@ _.all([true], _.identity); //// [genericArgumentCallSigAssignmentCompat.js] // No error, Call signatures of types '(value: T) => T' and 'Underscore.Iterator<{}, boolean>' are compatible when instantiated with any. // Ideally, we would not have a generic signature here, because it should be instantiated with {} during inferential typing -_.all([true, 1, null, 'yes'], _.identity); +_.all([ + true, + 1, + null, + 'yes' +], _.identity); // Ok, because fixing makes us infer boolean for T -_.all([true], _.identity); +_.all([ + true +], _.identity); diff --git a/tests/baselines/reference/genericArray1.js b/tests/baselines/reference/genericArray1.js index b0bfcd2201a..e698d339073 100644 --- a/tests/baselines/reference/genericArray1.js +++ b/tests/baselines/reference/genericArray1.js @@ -26,7 +26,13 @@ interface String{ length: number; } */ -var lengths = ["a", "b", "c"].map(function (x) { return x.length; }); +var lengths = [ + "a", + "b", + "c" +].map(function (x) { + return x.length; +}); //// [genericArray1.d.ts] diff --git a/tests/baselines/reference/genericArrayMethods1.js b/tests/baselines/reference/genericArrayMethods1.js index c7fca1ee6b7..e6cebcb220e 100644 --- a/tests/baselines/reference/genericArrayMethods1.js +++ b/tests/baselines/reference/genericArrayMethods1.js @@ -3,4 +3,7 @@ var x:string[] = [0,1].slice(0); // this should be an error //// [genericArrayMethods1.js] -var x = [0, 1].slice(0); // this should be an error +var x = [ + 0, + 1 +].slice(0); // this should be an error diff --git a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.js b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.js index 9b7d5b713e9..6f1928a2601 100644 --- a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.js +++ b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.js @@ -6,7 +6,9 @@ x1 = x2; x2 = x1; //// [genericAssignmentCompatOfFunctionSignatures1.js] -var x1 = function foo3(x, z) { }; -var x2 = function foo3(x, z) { }; +var x1 = function foo3(x, z) { +}; +var x2 = function foo3(x, z) { +}; x1 = x2; x2 = x1; diff --git a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js index 70f70ae07ba..7f82cc6afb3 100644 --- a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js +++ b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js @@ -23,13 +23,21 @@ var a4: I = >z; var A = (function () { function A() { } - A.prototype.compareTo = function (other) { return 1; }; + A.prototype.compareTo = function (other) { + return 1; + }; return A; })(); -var z = { x: new A() }; -var a1 = { x: new A() }; +var z = { + x: new A() +}; +var a1 = { + x: new A() +}; var a2 = function () { - var z = { x: new A() }; + var z = { + x: new A() + }; return z; }(); var a3 = z; diff --git a/tests/baselines/reference/genericCallWithArrayLiteralArgs.js b/tests/baselines/reference/genericCallWithArrayLiteralArgs.js index ba8c2884fff..ebc49f37c0d 100644 --- a/tests/baselines/reference/genericCallWithArrayLiteralArgs.js +++ b/tests/baselines/reference/genericCallWithArrayLiteralArgs.js @@ -17,11 +17,29 @@ var r6 = foo([1, '']); // Object[] function foo(t) { return t; } -var r = foo([1, 2]); // number[] -var r = foo([1, 2]); // number[] -var ra = foo([1, 2]); // any[] +var r = foo([ + 1, + 2 +]); // number[] +var r = foo([ + 1, + 2 +]); // number[] +var ra = foo([ + 1, + 2 +]); // any[] var r2 = foo([]); // any[] var r3 = foo([]); // number[] -var r4 = foo([1, '']); // {}[] -var r5 = foo([1, '']); // any[] -var r6 = foo([1, '']); // Object[] +var r4 = foo([ + 1, + '' +]); // {}[] +var r5 = foo([ + 1, + '' +]); // any[] +var r6 = foo([ + 1, + '' +]); // Object[] diff --git a/tests/baselines/reference/genericCallWithFixedArguments.js b/tests/baselines/reference/genericCallWithFixedArguments.js index e588c0d113d..10c0e2b496b 100644 --- a/tests/baselines/reference/genericCallWithFixedArguments.js +++ b/tests/baselines/reference/genericCallWithFixedArguments.js @@ -11,14 +11,17 @@ g(7) // the parameter list is fixed, so this should not error var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); -function g(x) { } +function g(x) { +} g(7); // the parameter list is fixed, so this should not error diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments.js index 30d4ed353ff..b6f2839bae1 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments.js @@ -42,25 +42,53 @@ function other(t: T, u: U) { function foo(x) { return x(null); } -var r = foo(function (x) { return ''; }); // {} -var r2 = foo(function (x) { return ''; }); // string -var r3 = foo(function (x) { return ''; }); // {} +var r = foo(function (x) { + return ''; +}); // {} +var r2 = foo(function (x) { + return ''; +}); // string +var r3 = foo(function (x) { + return ''; +}); // {} function foo2(x, cb) { return cb(x); } -var r4 = foo2(1, function (a) { return ''; }); // string, contextual signature instantiation is applied to generic functions -var r5 = foo2(1, function (a) { return ''; }); // string -var r6 = foo2('', function (a) { return 1; }); +var r4 = foo2(1, function (a) { + return ''; +}); // string, contextual signature instantiation is applied to generic functions +var r5 = foo2(1, function (a) { + return ''; +}); // string +var r6 = foo2('', function (a) { + return 1; +}); function foo3(x, cb, y) { return cb(x); } -var r7 = foo3(1, function (a) { return ''; }, ''); // string -var r8 = foo3(1, function (a) { return ''; }, 1); // error -var r9 = foo3(1, function (a) { return ''; }, ''); // string +var r7 = foo3(1, function (a) { + return ''; +}, ''); // string +var r8 = foo3(1, function (a) { + return ''; +}, 1); // error +var r9 = foo3(1, function (a) { + return ''; +}, ''); // string function other(t, u) { - var r10 = foo2(1, function (x) { return ''; }); // error - var r10 = foo2(1, function (x) { return ''; }); // string - var r11 = foo3(1, function (x) { return ''; }, ''); // error - var r11b = foo3(1, function (x) { return ''; }, 1); // error - var r12 = foo3(1, function (a) { return ''; }, 1); // error + var r10 = foo2(1, function (x) { + return ''; + }); // error + var r10 = foo2(1, function (x) { + return ''; + }); // string + var r11 = foo3(1, function (x) { + return ''; + }, ''); // error + var r11b = foo3(1, function (x) { + return ''; + }, 1); // error + var r12 = foo3(1, function (a) { + return ''; + }, 1); // error } diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.js index 4e3e20071b2..1675b582d49 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.js @@ -27,16 +27,40 @@ var r7 = foo({ cb: () => '' }); // string function foo(arg) { return arg.cb(null); } -var arg = { cb: function (x) { return ''; } }; +var arg = { + cb: function (x) { + return ''; + } +}; var r = foo(arg); // {} // more args not allowed -var r2 = foo({ cb: function (x, y) { return ''; } }); // error -var r3 = foo({ cb: function (x, y) { return ''; } }); // error +var r2 = foo({ + cb: function (x, y) { + return ''; + } +}); // error +var r3 = foo({ + cb: function (x, y) { + return ''; + } +}); // error function foo2(arg) { return arg.cb(null, null); } // fewer args ok var r4 = foo(arg); // {} -var r5 = foo({ cb: function (x) { return ''; } }); // {} -var r6 = foo({ cb: function (x) { return ''; } }); // string -var r7 = foo({ cb: function () { return ''; } }); // string +var r5 = foo({ + cb: function (x) { + return ''; + } +}); // {} +var r6 = foo({ + cb: function (x) { + return ''; + } +}); // string +var r7 = foo({ + cb: function () { + return ''; + } +}); // string diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments.js index 17094dae69c..0f39ae16dee 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments.js @@ -50,21 +50,61 @@ function foo(a, b) { return r; } //var r1 = foo((x: number) => 1, (x: string) => ''); // error -var r1b = foo(function (x) { return 1; }, function (x) { return ''; }); // {} => {} -var r2 = foo(function (x) { return null; }, function (x) { return ''; }); // Object => Object -var r3 = foo(function (x) { return 1; }, function (x) { return null; }); // number => number -var r3ii = foo(function (x) { return 1; }, function (x) { return 1; }); // number => number +var r1b = foo(function (x) { + return 1; +}, function (x) { + return ''; +}); // {} => {} +var r2 = foo(function (x) { + return null; +}, function (x) { + return ''; +}); // Object => Object +var r3 = foo(function (x) { + return 1; +}, function (x) { + return null; +}); // number => number +var r3ii = foo(function (x) { + return 1; +}, function (x) { + return 1; +}); // number => number var a; var b; -var r4 = foo(function (x) { return a; }, function (x) { return b; }); // typeof a => typeof a -var r5 = foo(function (x) { return b; }, function (x) { return a; }); // typeof b => typeof b +var r4 = foo(function (x) { + return a; +}, function (x) { + return b; +}); // typeof a => typeof a +var r5 = foo(function (x) { + return b; +}, function (x) { + return a; +}); // typeof b => typeof b function other(x) { - var r6 = foo(function (a) { return a; }, function (b) { return b; }); // T => T - var r6b = foo(function (a) { return a; }, function (b) { return b; }); // {} => {} + var r6 = foo(function (a) { + return a; + }, function (b) { + return b; + }); // T => T + var r6b = foo(function (a) { + return a; + }, function (b) { + return b; + }); // {} => {} } function other2(x) { - var r7 = foo(function (a) { return a; }, function (b) { return b; }); // T => T - var r7b = foo(function (a) { return a; }, function (b) { return b; }); // {} => {} + var r7 = foo(function (a) { + return a; + }, function (b) { + return b; + }); // T => T + var r7b = foo(function (a) { + return a; + }, function (b) { + return b; + }); // {} => {} var r8 = r7(null); // BUG 835518 //var r9 = r7(new Date()); @@ -74,5 +114,9 @@ function foo2(a, b) { return r; } function other3(x) { - var r8 = foo2(function (a) { return a; }, function (b) { return b; }); // Date => Date + var r8 = foo2(function (a) { + return a; + }, function (b) { + return b; + }); // Date => Date } diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js index 7acdcc32536..4c0d57b9acf 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js @@ -82,9 +82,17 @@ var onlyT; var r; return r; } - var r1 = foo(function (x) { return 1; }, function (x) { return ''; }); + var r1 = foo(function (x) { + return 1; + }, function (x) { + return ''; + }); function other2(x) { - var r7 = foo(function (a) { return a; }, function (b) { return b; }); // T => T + var r7 = foo(function (a) { + return a; + }, function (b) { + return b; + }); // T => T // BUG 835518 var r9 = r7(new Date()); // should be ok var r10 = r7(1); // error @@ -94,8 +102,16 @@ var onlyT; return r; } function other3(x) { - var r7 = foo2(function (a) { return a; }, function (b) { return b; }); // error - var r7b = foo2(function (a) { return a; }, function (b) { return b; }); // valid, T is inferred to be Date + var r7 = foo2(function (a) { + return a; + }, function (b) { + return b; + }); // error + var r7b = foo2(function (a) { + return a; + }, function (b) { + return b; + }); // valid, T is inferred to be Date } var E; (function (E) { @@ -109,7 +125,11 @@ var onlyT; var r; return r; } - var r7 = foo3(0 /* A */, function (x) { return 0 /* A */; }, function (x) { return 0 /* A */; }); // error + var r7 = foo3(0 /* A */, function (x) { + return 0 /* A */; + }, function (x) { + return 0 /* A */; + }); // error })(onlyT || (onlyT = {})); var TU; (function (TU) { @@ -117,9 +137,17 @@ var TU; var r; return r; } - var r1 = foo(function (x) { return 1; }, function (x) { return ''; }); + var r1 = foo(function (x) { + return 1; + }, function (x) { + return ''; + }); function other2(x) { - var r7 = foo(function (a) { return a; }, function (b) { return b; }); + var r7 = foo(function (a) { + return a; + }, function (b) { + return b; + }); var r9 = r7(new Date()); var r10 = r7(1); } @@ -128,8 +156,16 @@ var TU; return r; } function other3(x) { - var r7 = foo2(function (a) { return a; }, function (b) { return b; }); - var r7b = foo2(function (a) { return a; }, function (b) { return b; }); + var r7 = foo2(function (a) { + return a; + }, function (b) { + return b; + }); + var r7b = foo2(function (a) { + return a; + }, function (b) { + return b; + }); } var E; (function (E) { @@ -143,5 +179,9 @@ var TU; var r; return r; } - var r7 = foo3(0 /* A */, function (x) { return 0 /* A */; }, function (x) { return 0 /* A */; }); + var r7 = foo3(0 /* A */, function (x) { + return 0 /* A */; + }, function (x) { + return 0 /* A */; + }); })(TU || (TU = {})); diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js index ca28878daa3..8f691d936ec 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js @@ -40,12 +40,36 @@ function foo(x, a, b) { var r; return r; } -var r1 = foo('', function (x) { return ''; }, function (x) { return null; }); // any => any -var r1ii = foo('', function (x) { return ''; }, function (x) { return null; }); // string => string -var r2 = foo('', function (x) { return ''; }, function (x) { return ''; }); // string => string -var r3 = foo(null, function (x) { return ''; }, function (x) { return ''; }); // Object => Object -var r4 = foo(null, function (x) { return ''; }, function (x) { return ''; }); // any => any -var r5 = foo(new Object(), function (x) { return ''; }, function (x) { return ''; }); // Object => Object +var r1 = foo('', function (x) { + return ''; +}, function (x) { + return null; +}); // any => any +var r1ii = foo('', function (x) { + return ''; +}, function (x) { + return null; +}); // string => string +var r2 = foo('', function (x) { + return ''; +}, function (x) { + return ''; +}); // string => string +var r3 = foo(null, function (x) { + return ''; +}, function (x) { + return ''; +}); // Object => Object +var r4 = foo(null, function (x) { + return ''; +}, function (x) { + return ''; +}); // any => any +var r5 = foo(new Object(), function (x) { + return ''; +}, function (x) { + return ''; +}); // Object => Object var E; (function (E) { E[E["A"] = 0] = "A"; @@ -54,14 +78,42 @@ var F; (function (F) { F[F["A"] = 0] = "A"; })(F || (F = {})); -var r6 = foo(0 /* A */, function (x) { return 0 /* A */; }, function (x) { return 0 /* A */; }); // number => number +var r6 = foo(0 /* A */, function (x) { + return 0 /* A */; +}, function (x) { + return 0 /* A */; +}); // number => number function foo2(x, a, b) { var r; return r; } -var r8 = foo2('', function (x) { return ''; }, function (x) { return null; }); // string => string -var r9 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); // any => any -var r10 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); // Object => Object +var r8 = foo2('', function (x) { + return ''; +}, function (x) { + return null; +}); // string => string +var r9 = foo2(null, function (x) { + return ''; +}, function (x) { + return ''; +}); // any => any +var r10 = foo2(null, function (x) { + return ''; +}, function (x) { + return ''; +}); // Object => Object var x; -var r11 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // error -var r12 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // error +var r11 = foo2(x, function (a1) { + return function (n) { + return 1; + }; +}, function (a2) { + return 2; +}); // error +var r12 = foo2(x, function (a1) { + return function (n) { + return 1; + }; +}, function (a2) { + return 2; +}); // error diff --git a/tests/baselines/reference/genericCallWithNonGenericArgs1.js b/tests/baselines/reference/genericCallWithNonGenericArgs1.js index 4f5239630ae..2282c64e851 100644 --- a/tests/baselines/reference/genericCallWithNonGenericArgs1.js +++ b/tests/baselines/reference/genericCallWithNonGenericArgs1.js @@ -4,5 +4,6 @@ f(null) //// [genericCallWithNonGenericArgs1.js] -function f(x) { } +function f(x) { +} f(null); diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js index 2515bbef293..17ca4ad937c 100644 --- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js +++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js @@ -12,7 +12,19 @@ var r4 = foo({ bar: 1, baz: '' }); // T = Object function foo(x) { return x; } -var r = foo({ bar: 1, baz: '' }); // error -var r2 = foo({ bar: 1, baz: 1 }); // T = number -var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo -var r4 = foo({ bar: 1, baz: '' }); // T = Object +var r = foo({ + bar: 1, + baz: '' +}); // error +var r2 = foo({ + bar: 1, + baz: 1 +}); // T = number +var r3 = foo({ + bar: foo, + baz: foo +}); // T = typeof foo +var r4 = foo({ + bar: 1, + baz: '' +}); // T = Object diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.js b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.js index f140caaac61..92564c0a131 100644 --- a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.js +++ b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.js @@ -8,10 +8,27 @@ var x4 = foo({ x: "", y: 4 }, ""); var x5 = foo({ x: "", y: 4 }, ""); //// [genericCallWithObjectLiteralArguments1.js] -function foo(n, m) { return m; } +function foo(n, m) { + return m; +} // these are all errors -var x = foo({ x: 3, y: "" }, 4); -var x2 = foo({ x: 3, y: "" }, 4); -var x3 = foo({ x: 3, y: "" }, 4); -var x4 = foo({ x: "", y: 4 }, ""); -var x5 = foo({ x: "", y: 4 }, ""); +var x = foo({ + x: 3, + y: "" +}, 4); +var x2 = foo({ + x: 3, + y: "" +}, 4); +var x3 = foo({ + x: 3, + y: "" +}, 4); +var x4 = foo({ + x: "", + y: 4 +}, ""); +var x5 = foo({ + x: "", + y: 4 +}, ""); diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js index 3a72feff979..aa478a7fbed 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js @@ -60,13 +60,27 @@ var Derived2 = (function (_super) { })(Base); // returns {}[] function f(a) { - return [a.x, a.y]; + return [ + a.x, + a.y + ]; } -var r = f({ x: new Derived(), y: new Derived2() }); // {}[] -var r2 = f({ x: new Base(), y: new Derived2() }); // {}[] +var r = f({ + x: new Derived(), + y: new Derived2() +}); // {}[] +var r2 = f({ + x: new Base(), + y: new Derived2() +}); // {}[] function f2(a) { - return function (x) { return a.y; }; + return function (x) { + return a.y; + }; } -var r3 = f2({ x: new Derived(), y: new Derived2() }); // Derived => Derived2 +var r3 = f2({ + x: new Derived(), + y: new Derived2() +}); // Derived => Derived2 var i; var r4 = f2(i); // Base => Derived diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js index c1f0945ba10..e530187859f 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js @@ -63,8 +63,14 @@ function f(x) { var r; return r; } -var r = f({ foo: new Base(), bar: new Derived() }); -var r2 = f({ foo: new Derived(), bar: new Derived() }); +var r = f({ + foo: new Base(), + bar: new Derived() +}); +var r2 = f({ + foo: new Derived(), + bar: new Derived() +}); function f2(x) { var r; return r; @@ -74,7 +80,13 @@ var r3 = f2(i); function f3(x, y) { return y(null); } -var r4 = f3(new Base(), function (x) { return x; }); -var r5 = f3(new Derived(), function (x) { return x; }); +var r4 = f3(new Base(), function (x) { + return x; +}); +var r5 = f3(new Derived(), function (x) { + return x; +}); var r6 = f3(null, null); // any -var r7 = f3(null, function (x) { return x; }); // any +var r7 = f3(null, function (x) { + return x; +}); // any diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js index b9c722f80be..9dca38866c6 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js @@ -68,17 +68,32 @@ function f(a) { var r; return r; } -var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is supertype of the other +var r1 = f({ + x: new Derived(), + y: new Derived2() +}); // error because neither is supertype of the other function f2(a) { var r; return r; } -var r2 = f2({ x: new Derived(), y: new Derived2() }); // ok -var r3 = f2({ x: new Derived(), y: new Derived2() }); // ok +var r2 = f2({ + x: new Derived(), + y: new Derived2() +}); // ok +var r3 = f2({ + x: new Derived(), + y: new Derived2() +}); // ok function f3(y, x) { return y(null); } // all ok - second argument is processed before x is fixed -var r4 = f3(function (x) { return x; }, new Base()); -var r5 = f3(function (x) { return x; }, new Derived()); -var r6 = f3(function (x) { return x; }, null); +var r4 = f3(function (x) { + return x; +}, new Base()); +var r5 = f3(function (x) { + return x; +}, new Derived()); +var r6 = f3(function (x) { + return x; +}, null); diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js index 10d32ddeae7..2872777d1bb 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js @@ -46,19 +46,29 @@ var D = (function () { return D; })(); function foo(t, t2) { - return function (x) { return t2; }; + return function (x) { + return t2; + }; } var c; var d; var r = foo(c, d); var r2 = foo(d, c); // error because C does not extend D -var r3 = foo(c, { x: '', foo: c }); +var r3 = foo(c, { + x: '', + foo: c +}); var r4 = foo(null, null); var r5 = foo({}, null); var r6 = foo(null, {}); var r7 = foo({}, {}); -var r8 = foo(function () { }, function () { }); -var r9 = foo(function () { }, function () { return 1; }); +var r8 = foo(function () { +}, function () { +}); +var r9 = foo(function () { +}, function () { + return 1; +}); function other() { var r4 = foo(c, d); var r5 = foo(c, d); // error diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js index 95b98767a09..c0432cfcacf 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js @@ -37,12 +37,17 @@ var D = (function () { return D; })(); function foo(t, t2) { - return function (x) { return t2; }; + return function (x) { + return t2; + }; } var c; var d; var r2 = foo(d, c); // the constraints are self-referencing, no downstream error -var r9 = foo(function () { return 1; }, function () { }); // the constraints are self-referencing, no downstream error +var r9 = foo(function () { + return 1; +}, function () { +}); // the constraints are self-referencing, no downstream error function other() { var r5 = foo(c, d); // error } diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js index dea5948242b..b66c9ccf6c2 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js @@ -54,28 +54,44 @@ var NonGenericParameter; return cb; } var r = foo4(a); - var r2 = foo4(function (x) { return x; }); - var r4 = foo4(function (x) { return x; }); + var r2 = foo4(function (x) { + return x; + }); + var r4 = foo4(function (x) { + return x; + }); })(NonGenericParameter || (NonGenericParameter = {})); var GenericParameter; (function (GenericParameter) { function foo5(cb) { return cb; } - var r5 = foo5(function (x) { return x; }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any + var r5 = foo5(function (x) { + return x; + }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any var a; var r7 = foo5(a); // any => string (+1 overload) function foo6(cb) { return cb; } - var r8 = foo6(function (x) { return x; }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any - var r9 = foo6(function (x) { return ''; }); // any => string (+1 overload) - var r11 = foo6(function (x, y) { return ''; }); // any => string (+1 overload) + var r8 = foo6(function (x) { + return x; + }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any + var r9 = foo6(function (x) { + return ''; + }); // any => string (+1 overload) + var r11 = foo6(function (x, y) { + return ''; + }); // any => string (+1 overload) function foo7(x, cb) { return cb; } - var r12 = foo7(1, function (x) { return x; }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] - var r13 = foo7(1, function (x) { return ''; }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] + var r12 = foo7(1, function (x) { + return x; + }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] + var r13 = foo7(1, function (x) { + return ''; + }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] var a; var r14 = foo7(1, a); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] })(GenericParameter || (GenericParameter = {})); diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js index b4f96f67942..e61e2b06b4e 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js @@ -46,22 +46,31 @@ var NonGenericParameter; function foo4(cb) { return cb; } - var r3 = foo4(function (x) { var r; return r; }); // ok + var r3 = foo4(function (x) { + var r; + return r; + }); // ok })(NonGenericParameter || (NonGenericParameter = {})); var GenericParameter; (function (GenericParameter) { function foo5(cb) { return cb; } - var r6 = foo5(function (x) { return x; }); // ok + var r6 = foo5(function (x) { + return x; + }); // ok function foo6(cb) { return cb; } - var r10 = foo6(function (x, y) { return ''; }); // error + var r10 = foo6(function (x, y) { + return ''; + }); // error function foo7(x, cb) { return cb; } - var r13 = foo7(1, function (x) { return x; }); // ok + var r13 = foo7(1, function (x) { + return x; + }); // ok var a; var r14 = foo7(1, a); // ok })(GenericParameter || (GenericParameter = {})); diff --git a/tests/baselines/reference/genericCallWithTupleType.js b/tests/baselines/reference/genericCallWithTupleType.js index 296a6dad63b..fa29f01384e 100644 --- a/tests/baselines/reference/genericCallWithTupleType.js +++ b/tests/baselines/reference/genericCallWithTupleType.js @@ -29,18 +29,48 @@ i2.tuple1 = [{}]; var i1; var i2; // no error -i1.tuple1 = ["foo", 5]; +i1.tuple1 = [ + "foo", + 5 +]; var e1 = i1.tuple1[0]; // string var e2 = i1.tuple1[1]; // number -i1.tuple1 = ["foo", 5, false, true]; +i1.tuple1 = [ + "foo", + 5, + false, + true +]; var e3 = i1.tuple1[2]; // {} -i1.tuple1[3] = { a: "string" }; +i1.tuple1[3] = { + a: "string" +}; var e4 = i1.tuple1[3]; // {} -i2.tuple1 = ["foo", 5]; -i2.tuple1 = ["foo", "bar"]; -i2.tuple1 = [5, "bar"]; -i2.tuple1 = [{}, {}]; +i2.tuple1 = [ + "foo", + 5 +]; +i2.tuple1 = [ + "foo", + "bar" +]; +i2.tuple1 = [ + 5, + "bar" +]; +i2.tuple1 = [ + {}, + {} +]; // error -i1.tuple1 = [5, "foo"]; -i1.tuple1 = [{}, {}]; -i2.tuple1 = [{}]; +i1.tuple1 = [ + 5, + "foo" +]; +i1.tuple1 = [ + {}, + {} +]; +i2.tuple1 = [ + {} +]; diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js index e63c7a98272..682cd6010f1 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js @@ -56,11 +56,13 @@ var M; function D() { } D.prototype._subscribe = function (viewModel) { - var f = function (newValue) { }; + var f = function (newValue) { + }; var v = viewModel.value; // both of these should work v.subscribe(f); - v.subscribe(function (newValue) { }); + v.subscribe(function (newValue) { + }); }; return D; })(); diff --git a/tests/baselines/reference/genericCallsWithoutParens.js b/tests/baselines/reference/genericCallsWithoutParens.js index a479fbab375..e51ed55224c 100644 --- a/tests/baselines/reference/genericCallsWithoutParens.js +++ b/tests/baselines/reference/genericCallsWithoutParens.js @@ -10,7 +10,8 @@ var c = new C; // parse error //// [genericCallsWithoutParens.js] -function f() { } +function f() { +} var r = f(); // parse error var C = (function () { function C() { diff --git a/tests/baselines/reference/genericChainedCalls.js b/tests/baselines/reference/genericChainedCalls.js index a738e19023b..48bc37101cd 100644 --- a/tests/baselines/reference/genericChainedCalls.js +++ b/tests/baselines/reference/genericChainedCalls.js @@ -15,9 +15,20 @@ var s3 = s2.func(num => num.toString()) //// [genericChainedCalls.js] -var r1 = v1.func(function (num) { return num.toString(); }) - .func(function (str) { return str.length; }) // error, number doesn't have a length - .func(function (num) { return num.toString(); }); -var s1 = v1.func(function (num) { return num.toString(); }); -var s2 = s1.func(function (str) { return str.length; }); // should also error -var s3 = s2.func(function (num) { return num.toString(); }); +var r1 = v1.func(function (num) { + return num.toString(); +}).func(function (str) { + return str.length; +}) // error, number doesn't have a length +.func(function (num) { + return num.toString(); +}); +var s1 = v1.func(function (num) { + return num.toString(); +}); +var s2 = s1.func(function (str) { + return str.length; +}); // should also error +var s3 = s2.func(function (num) { + return num.toString(); +}); diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js index 4f26e35d1b0..8d1e87cb495 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js @@ -91,8 +91,11 @@ var Portal; var Validator = (function () { function Validator(message) { } - Validator.prototype.destroy = function () { }; - Validator.prototype._validate = function (value) { return 0; }; + Validator.prototype.destroy = function () { + }; + Validator.prototype._validate = function (value) { + return 0; + }; return Validator; })(); Validators.Validator = Validator; diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js index 5156c4d6b12..4aab45f5228 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js @@ -78,9 +78,15 @@ var ImmediatelyFix; return C; })(); var c = new C(); - var r = c.foo(function (x) { return ''; }); // {} - var r2 = c.foo(function (x) { return ''; }); // string - var r3 = c.foo(function (x) { return ''; }); // {} + var r = c.foo(function (x) { + return ''; + }); // {} + var r2 = c.foo(function (x) { + return ''; + }); // string + var r3 = c.foo(function (x) { + return ''; + }); // {} var C2 = (function () { function C2() { } @@ -90,8 +96,12 @@ var ImmediatelyFix; return C2; })(); var c2 = new C2(); - var ra = c2.foo(function (x) { return 1; }); // number - var r3a = c2.foo(function (x) { return 1; }); // number + var ra = c2.foo(function (x) { + return 1; + }); // number + var r3a = c2.foo(function (x) { + return 1; + }); // number })(ImmediatelyFix || (ImmediatelyFix = {})); var WithCandidates; (function (WithCandidates) { @@ -104,9 +114,15 @@ var WithCandidates; 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 - var r6 = c.foo2('', function (a) { return 1; }); // number + 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 + var r6 = c.foo2('', function (a) { + return 1; + }); // number var C2 = (function () { function C2() { } @@ -116,8 +132,12 @@ var WithCandidates; return C2; })(); var c2; - var r7 = c2.foo3(1, function (a) { return ''; }, ''); // string - var r8 = c2.foo3(1, function (a) { return ''; }, ''); // string + var r7 = c2.foo3(1, function (a) { + return ''; + }, ''); // string + var r8 = c2.foo3(1, function (a) { + return ''; + }, ''); // string var C3 = (function () { function C3() { } @@ -128,10 +148,20 @@ var WithCandidates; })(); var c3; function other(t, u) { - var r10 = c.foo2(1, function (x) { return ''; }); // error - var r10 = c.foo2(1, function (x) { return ''; }); // string - var r11 = c3.foo3(1, function (x) { return ''; }, ''); // error - var r11b = c3.foo3(1, function (x) { return ''; }, 1); // error - var r12 = c3.foo3(1, function (a) { return ''; }, 1); // error + var r10 = c.foo2(1, function (x) { + return ''; + }); // error + var r10 = c.foo2(1, function (x) { + return ''; + }); // string + var r11 = c3.foo3(1, function (x) { + return ''; + }, ''); // error + var r11b = c3.foo3(1, function (x) { + return ''; + }, 1); // error + var r12 = c3.foo3(1, function (a) { + return ''; + }, 1); // error } })(WithCandidates || (WithCandidates = {})); diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js index 4caeacd19e2..4aca0e37520 100644 --- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js +++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js @@ -25,9 +25,14 @@ var Foo = (function () { Foo.f = function (xs) { return xs.reverse(); }; - Foo.a = function (n) { }; + Foo.a = function (n) { + }; Foo.c = []; - Foo.d = false || (function (x) { return x || undefined; })(null); - Foo.e = function (x) { return null; }; + Foo.d = false || (function (x) { + return x || undefined; + })(null); + Foo.e = function (x) { + return null; + }; return Foo; })(); diff --git a/tests/baselines/reference/genericCloduleInModule.js b/tests/baselines/reference/genericCloduleInModule.js index 92c519aa012..f3938735695 100644 --- a/tests/baselines/reference/genericCloduleInModule.js +++ b/tests/baselines/reference/genericCloduleInModule.js @@ -18,8 +18,10 @@ var A; var B = (function () { function B() { } - B.prototype.foo = function () { }; - B.bar = function () { }; + B.prototype.foo = function () { + }; + B.bar = function () { + }; return B; })(); A.B = B; diff --git a/tests/baselines/reference/genericCloduleInModule2.js b/tests/baselines/reference/genericCloduleInModule2.js index bb8021ffe8c..1cb3bd66403 100644 --- a/tests/baselines/reference/genericCloduleInModule2.js +++ b/tests/baselines/reference/genericCloduleInModule2.js @@ -21,8 +21,10 @@ var A; var B = (function () { function B() { } - B.prototype.foo = function () { }; - B.bar = function () { }; + B.prototype.foo = function () { + }; + B.bar = function () { + }; return B; })(); A.B = B; diff --git a/tests/baselines/reference/genericCombinators2.js b/tests/baselines/reference/genericCombinators2.js index a23f163a906..af11f056197 100644 --- a/tests/baselines/reference/genericCombinators2.js +++ b/tests/baselines/reference/genericCombinators2.js @@ -19,6 +19,10 @@ var r5b = _.map(c2, rf1); //// [genericCombinators2.js] var _; var c2; -var rf1 = function (x, y) { return x.toFixed(); }; -var r5a = _.map(c2, function (x, y) { return x.toFixed(); }); +var rf1 = function (x, y) { + return x.toFixed(); +}; +var r5a = _.map(c2, function (x, y) { + return x.toFixed(); +}); var r5b = _.map(c2, rf1); diff --git a/tests/baselines/reference/genericConstraintDeclaration.js b/tests/baselines/reference/genericConstraintDeclaration.js index 6e3f8d5ff8b..cdf93d676d0 100644 --- a/tests/baselines/reference/genericConstraintDeclaration.js +++ b/tests/baselines/reference/genericConstraintDeclaration.js @@ -12,7 +12,9 @@ class List{ var List = (function () { function List() { } - List.empty = function () { return null; }; + List.empty = function () { + return null; + }; return List; })(); diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.js b/tests/baselines/reference/genericConstraintSatisfaction1.js index 9436e62b3ba..b7438e6c456 100644 --- a/tests/baselines/reference/genericConstraintSatisfaction1.js +++ b/tests/baselines/reference/genericConstraintSatisfaction1.js @@ -9,4 +9,6 @@ x.f({s: 1}) //// [genericConstraintSatisfaction1.js] var x; -x.f({ s: 1 }); +x.f({ + s: 1 +}); diff --git a/tests/baselines/reference/genericContextualTypingSpecialization.js b/tests/baselines/reference/genericContextualTypingSpecialization.js index 75d8b995fa3..a577db15d32 100644 --- a/tests/baselines/reference/genericContextualTypingSpecialization.js +++ b/tests/baselines/reference/genericContextualTypingSpecialization.js @@ -4,4 +4,6 @@ b.reduce((c, d) => c + d, 0); // should not error on '+' //// [genericContextualTypingSpecialization.js] var b; -b.reduce(function (c, d) { return c + d; }, 0); // should not error on '+' +b.reduce(function (c, d) { + return c + d; +}, 0); // should not error on '+' diff --git a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.js b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.js index 30d57403aec..77cad2cc87f 100644 --- a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.js +++ b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.js @@ -3,6 +3,11 @@ function f(p: (x: T) => void) { }; f(x => f(y => x = y)); //// [genericFunctionHasFreshTypeArgs.js] -function f(p) { } +function f(p) { +} ; -f(function (x) { return f(function (y) { return x = y; }); }); +f(function (x) { + return f(function (y) { + return x = y; + }); +}); diff --git a/tests/baselines/reference/genericFunctionSpecializations1.js b/tests/baselines/reference/genericFunctionSpecializations1.js index c1043f792b6..2935959b69e 100644 --- a/tests/baselines/reference/genericFunctionSpecializations1.js +++ b/tests/baselines/reference/genericFunctionSpecializations1.js @@ -6,5 +6,7 @@ function foo4(test: string); // valid function foo4(test: T) { } //// [genericFunctionSpecializations1.js] -function foo3(test) { } -function foo4(test) { } +function foo3(test) { +} +function foo4(test) { +} diff --git a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.js b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.js index e9db28578f7..c1a8daa6a1b 100644 --- a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.js +++ b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.js @@ -3,4 +3,8 @@ declare function map(f: (x: T) => U, xs: T[]): U[]; map((a) => a.length, [1]); //// [genericFunctionTypedArgumentsAreFixed.js] -map(function (a) { return a.length; }, [1]); +map(function (a) { + return a.length; +}, [ + 1 +]); diff --git a/tests/baselines/reference/genericFunctions0.js b/tests/baselines/reference/genericFunctions0.js index b52f0583524..408abdb9ce0 100644 --- a/tests/baselines/reference/genericFunctions0.js +++ b/tests/baselines/reference/genericFunctions0.js @@ -4,7 +4,9 @@ function foo (x: T) { return x; } var x = foo(5); // 'x' should be number //// [genericFunctions0.js] -function foo(x) { return x; } +function foo(x) { + return x; +} var x = foo(5); // 'x' should be number diff --git a/tests/baselines/reference/genericFunctions1.js b/tests/baselines/reference/genericFunctions1.js index d9bb3413890..25cc91820b8 100644 --- a/tests/baselines/reference/genericFunctions1.js +++ b/tests/baselines/reference/genericFunctions1.js @@ -4,7 +4,9 @@ function foo (x: T) { return x; } var x = foo(5); // 'x' should be number //// [genericFunctions1.js] -function foo(x) { return x; } +function foo(x) { + return x; +} var x = foo(5); // 'x' should be number diff --git a/tests/baselines/reference/genericFunctions2.js b/tests/baselines/reference/genericFunctions2.js index f14c1be6dc9..ec01cc885bd 100644 --- a/tests/baselines/reference/genericFunctions2.js +++ b/tests/baselines/reference/genericFunctions2.js @@ -8,7 +8,9 @@ var lengths = map(myItems, x => x.length); //// [genericFunctions2.js] var myItems; -var lengths = map(myItems, function (x) { return x.length; }); +var lengths = map(myItems, function (x) { + return x.length; +}); //// [genericFunctions2.d.ts] diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js index 9ad885a899a..2a5ce0a333c 100644 --- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js +++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js @@ -19,13 +19,26 @@ var r5 = utils.mapReduce(c, f1, f2); var Collection = (function () { function Collection() { } - Collection.prototype.add = function (x) { }; + 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(); }); -var r4 = utils.mapReduce(c, function (x) { return 1; }, function (y) { return new Date(); }); -var f1 = function (x) { return 1; }; -var f2 = function (y) { return new Date(); }; +var r3 = utils.mapReduce(c, function (x) { + return 1; +}, function (y) { + return new Date(); +}); +var r4 = utils.mapReduce(c, function (x) { + return 1; +}, function (y) { + return new Date(); +}); +var f1 = function (x) { + return 1; +}; +var f2 = function (y) { + return new Date(); +}; var r5 = utils.mapReduce(c, f1, f2); diff --git a/tests/baselines/reference/genericFunduleInModule.js b/tests/baselines/reference/genericFunduleInModule.js index 95700edecab..5a85a46a395 100644 --- a/tests/baselines/reference/genericFunduleInModule.js +++ b/tests/baselines/reference/genericFunduleInModule.js @@ -12,7 +12,9 @@ A.B(1); //// [genericFunduleInModule.js] var A; (function (A) { - function B(x) { return x; } + function B(x) { + return x; + } A.B = B; var B; (function (B) { diff --git a/tests/baselines/reference/genericFunduleInModule2.js b/tests/baselines/reference/genericFunduleInModule2.js index 956e9129ec7..6b5a0a74e23 100644 --- a/tests/baselines/reference/genericFunduleInModule2.js +++ b/tests/baselines/reference/genericFunduleInModule2.js @@ -15,7 +15,9 @@ A.B(1); //// [genericFunduleInModule2.js] var A; (function (A) { - function B(x) { return x; } + function B(x) { + return x; + } A.B = B; })(A || (A = {})); var A; diff --git a/tests/baselines/reference/genericImplements.js b/tests/baselines/reference/genericImplements.js index b8d295153a4..17d3d2c0d20 100644 --- a/tests/baselines/reference/genericImplements.js +++ b/tests/baselines/reference/genericImplements.js @@ -37,20 +37,26 @@ var B = (function () { var X = (function () { function X() { } - X.prototype.f = function () { return undefined; }; + X.prototype.f = function () { + return undefined; + }; return X; })(); // { f: () => { b; } } // OK var Y = (function () { function Y() { } - Y.prototype.f = function () { return undefined; }; + Y.prototype.f = function () { + return undefined; + }; return Y; })(); // { f: () => { a; } } // OK var Z = (function () { function Z() { } - Z.prototype.f = function () { return undefined; }; + Z.prototype.f = function () { + return undefined; + }; return Z; })(); // { f: () => T } diff --git a/tests/baselines/reference/genericInference1.js b/tests/baselines/reference/genericInference1.js index dc81b9a9556..26a92970290 100644 --- a/tests/baselines/reference/genericInference1.js +++ b/tests/baselines/reference/genericInference1.js @@ -2,4 +2,10 @@ ['a', 'b', 'c'].map(x => x.length); //// [genericInference1.js] -['a', 'b', 'c'].map(function (x) { return x.length; }); +[ + 'a', + 'b', + 'c' +].map(function (x) { + return x.length; +}); diff --git a/tests/baselines/reference/genericInterfaceTypeCall.js b/tests/baselines/reference/genericInterfaceTypeCall.js index 7f5f586ec12..f171fa6e36d 100644 --- a/tests/baselines/reference/genericInterfaceTypeCall.js +++ b/tests/baselines/reference/genericInterfaceTypeCall.js @@ -17,5 +17,9 @@ test.fail2(arg => foo.reject(arg)); // Error: Supplied parameters do not match a //// [genericInterfaceTypeCall.js] var foo; var test; -test.fail(function (arg) { return foo.reject(arg); }); -test.fail2(function (arg) { return foo.reject(arg); }); // Error: Supplied parameters do not match any signature of call target +test.fail(function (arg) { + return foo.reject(arg); +}); +test.fail2(function (arg) { + return foo.reject(arg); +}); // Error: Supplied parameters do not match any signature of call target diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.js b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.js index e1cc5cadbd5..f57f6713c9f 100644 --- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.js +++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.js @@ -12,4 +12,6 @@ foo((arg: Foo) => { return arg.x; }); function foo(a) { return null; } -foo(function (arg) { return arg.x; }); +foo(function (arg) { + return arg.x; +}); diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js index 9b0fbf4bcad..5d4ecdc0838 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js @@ -7,7 +7,9 @@ module foo { //// [genericMergedDeclarationUsingTypeParameter.js] -function foo(y, z) { return y; } +function foo(y, z) { + return y; +} var foo; (function (foo) { foo.x; diff --git a/tests/baselines/reference/genericMethodOverspecialization.js b/tests/baselines/reference/genericMethodOverspecialization.js index 6ec28922af0..04d1466cfc4 100644 --- a/tests/baselines/reference/genericMethodOverspecialization.js +++ b/tests/baselines/reference/genericMethodOverspecialization.js @@ -27,7 +27,13 @@ var widths:number[] = elements.map(function (e) { // should not error //// [genericMethodOverspecialization.js] -var names = ["list", "table1", "table2", "table3", "summary"]; +var names = [ + "list", + "table1", + "table2", + "table3", + "summary" +]; var elements = names.map(function (name) { return document.getElementById(name); }); diff --git a/tests/baselines/reference/genericObjectLitReturnType.js b/tests/baselines/reference/genericObjectLitReturnType.js index 826f5233b55..327da9ce0f5 100644 --- a/tests/baselines/reference/genericObjectLitReturnType.js +++ b/tests/baselines/reference/genericObjectLitReturnType.js @@ -15,7 +15,11 @@ t1.a = 5; // Should not error: t1 should have type {a: number}, instead has type var X = (function () { function X() { } - X.prototype.f = function (t) { return { a: t }; }; + X.prototype.f = function (t) { + return { + a: t + }; + }; return X; })(); var x; diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js index 1f115aa486a..435575b0152 100644 --- a/tests/baselines/reference/genericOfACloduleType1.js +++ b/tests/baselines/reference/genericOfACloduleType1.js @@ -16,7 +16,9 @@ var g2 = new G() // was: error Type reference cannot refer to container 'M. var G = (function () { function G() { } - G.prototype.bar = function (x) { return x; }; + G.prototype.bar = function (x) { + return x; + }; return G; })(); var M; @@ -24,7 +26,8 @@ var M; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); M.C = C; diff --git a/tests/baselines/reference/genericOfACloduleType2.js b/tests/baselines/reference/genericOfACloduleType2.js index 1d671289cb2..4c73addcf72 100644 --- a/tests/baselines/reference/genericOfACloduleType2.js +++ b/tests/baselines/reference/genericOfACloduleType2.js @@ -19,7 +19,9 @@ module N { var G = (function () { function G() { } - G.prototype.bar = function (x) { return x; }; + G.prototype.bar = function (x) { + return x; + }; return G; })(); var M; @@ -27,7 +29,8 @@ var M; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); M.C = C; diff --git a/tests/baselines/reference/genericOverloadSignatures.js b/tests/baselines/reference/genericOverloadSignatures.js index 45a21d5a334..ec4c9ba74dc 100644 --- a/tests/baselines/reference/genericOverloadSignatures.js +++ b/tests/baselines/reference/genericOverloadSignatures.js @@ -31,7 +31,8 @@ interface D { } //// [genericOverloadSignatures.js] -function f(a) { } +function f(a) { +} var C2 = (function () { function C2() { } diff --git a/tests/baselines/reference/genericParameterAssignability1.js b/tests/baselines/reference/genericParameterAssignability1.js index a6a465b4089..ae8eb4348d3 100644 --- a/tests/baselines/reference/genericParameterAssignability1.js +++ b/tests/baselines/reference/genericParameterAssignability1.js @@ -4,6 +4,10 @@ var r = (x: T) => x; r = f; // should be allowed //// [genericParameterAssignability1.js] -function f(x) { return null; } -var r = function (x) { return x; }; +function f(x) { + return null; +} +var r = function (x) { + return x; +}; r = f; // should be allowed diff --git a/tests/baselines/reference/genericPrototypeProperty.js b/tests/baselines/reference/genericPrototypeProperty.js index fb6f9b78848..c38cdb753a7 100644 --- a/tests/baselines/reference/genericPrototypeProperty.js +++ b/tests/baselines/reference/genericPrototypeProperty.js @@ -13,7 +13,9 @@ var r3 = r.foo(null); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var r = C.prototype; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js index e01c9045345..11113b778d3 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js @@ -69,10 +69,7 @@ var TypeScript; }; PullTypeSymbol.prototype.getScopedNameEx = function (scopeSymbol, useConstraintInName, getPrettyTypeName, getTypeParamMarkerInfo) { if (this.isArray()) { - var elementMemberName = this._elementType ? - (this._elementType.isArray() || this._elementType.isNamedTypeSymbol() ? - this._elementType.getScopedNameEx(scopeSymbol, false, getPrettyTypeName, getTypeParamMarkerInfo) : - this._elementType.getMemberTypeNameEx(false, scopeSymbol, getPrettyTypeName)) : 1; + var elementMemberName = this._elementType ? (this._elementType.isArray() || this._elementType.isNamedTypeSymbol() ? this._elementType.getScopedNameEx(scopeSymbol, false, getPrettyTypeName, getTypeParamMarkerInfo) : this._elementType.getMemberTypeNameEx(false, scopeSymbol, getPrettyTypeName)) : 1; return TypeScript.MemberName.create(elementMemberName, "", "[]"); } }; diff --git a/tests/baselines/reference/genericReduce.js b/tests/baselines/reference/genericReduce.js index ac160e43868..c725df8d8e4 100644 --- a/tests/baselines/reference/genericReduce.js +++ b/tests/baselines/reference/genericReduce.js @@ -14,14 +14,27 @@ n3.toExponential(2); // should error if 'n3' is correctly type 'string' n3.charAt(0); // should not error if 'n3' is correctly type 'string' //// [genericReduce.js] -var a = ["An", "array", "of", "strings"]; -var b = a.map(function (s) { return s.length; }); -var n1 = b.reduce(function (x, y) { return x + y; }); -var n2 = b.reduceRight(function (x, y) { return x + y; }); +var a = [ + "An", + "array", + "of", + "strings" +]; +var b = a.map(function (s) { + return s.length; +}); +var n1 = b.reduce(function (x, y) { + return x + y; +}); +var n2 = b.reduceRight(function (x, y) { + return x + y; +}); n1.x = "fail"; // should error, as 'n1' should be type 'number', not 'any'. n1.toExponential(2); // should not error if 'n1' is correctly number. n2.x = "fail"; // should error, as 'n2' should be type 'number', not 'any'. n2.toExponential(2); // should not error if 'n2' is correctly number. -var n3 = b.reduce(function (x, y) { return x + y; }, ""); // Initial value is of type string +var n3 = b.reduce(function (x, y) { + return x + y; +}, ""); // Initial value is of type string n3.toExponential(2); // should error if 'n3' is correctly type 'string' n3.charAt(0); // should not error if 'n3' is correctly type 'string' diff --git a/tests/baselines/reference/genericRestArgs.js b/tests/baselines/reference/genericRestArgs.js index 75c88d7cbf2..4c2ddcf0cd9 100644 --- a/tests/baselines/reference/genericRestArgs.js +++ b/tests/baselines/reference/genericRestArgs.js @@ -25,7 +25,11 @@ var a1Gb = makeArrayG(1, ""); var a1Gc = makeArrayG(1, ""); var a1Gd = makeArrayG(1, ""); // error function makeArrayGOpt(item1, item2, item3) { - return [item1, item2, item3]; + return [ + item1, + item2, + item3 + ]; } var a2Ga = makeArrayGOpt(1, ""); var a2Gb = makeArrayG(1, ""); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 741c7218345..208b12308e1 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -14,7 +14,9 @@ define(["require", "exports"], function (require, exports) { function DbSet() { } Object.defineProperty(DbSet.prototype, "entityType", { - get: function () { return this._entityType; } // used to ICE without return type annotation + get: function () { + return this._entityType; + } // used to ICE without return type annotation , enumerable: true, configurable: true diff --git a/tests/baselines/reference/genericReversingTypeParameters.js b/tests/baselines/reference/genericReversingTypeParameters.js index 2a52c2e9ba6..0e51b0256ea 100644 --- a/tests/baselines/reference/genericReversingTypeParameters.js +++ b/tests/baselines/reference/genericReversingTypeParameters.js @@ -14,8 +14,12 @@ var r2b = i.get(1); var BiMap = (function () { function BiMap() { } - BiMap.prototype.get = function (key) { return null; }; - BiMap.prototype.inverse = function () { return null; }; + BiMap.prototype.get = function (key) { + return null; + }; + BiMap.prototype.inverse = function () { + return null; + }; return BiMap; })(); var b = new BiMap(); diff --git a/tests/baselines/reference/genericReversingTypeParameters2.js b/tests/baselines/reference/genericReversingTypeParameters2.js index 4f4bc564f89..eb904f4a2ed 100644 --- a/tests/baselines/reference/genericReversingTypeParameters2.js +++ b/tests/baselines/reference/genericReversingTypeParameters2.js @@ -13,8 +13,12 @@ var r2b = i.get(1); var BiMap = (function () { function BiMap() { } - BiMap.prototype.get = function (key) { return null; }; - BiMap.prototype.inverse = function () { return null; }; + BiMap.prototype.get = function (key) { + return null; + }; + BiMap.prototype.inverse = function () { + return null; + }; return BiMap; })(); var b = new BiMap(); diff --git a/tests/baselines/reference/genericSpecializations1.js b/tests/baselines/reference/genericSpecializations1.js index 3e59fceff97..3df2c5581b9 100644 --- a/tests/baselines/reference/genericSpecializations1.js +++ b/tests/baselines/reference/genericSpecializations1.js @@ -19,18 +19,24 @@ class StringFoo3 implements IFoo { var IntFooBad = (function () { function IntFooBad() { } - IntFooBad.prototype.foo = function (x) { return null; }; + IntFooBad.prototype.foo = function (x) { + return null; + }; return IntFooBad; })(); var StringFoo2 = (function () { function StringFoo2() { } - StringFoo2.prototype.foo = function (x) { return null; }; + StringFoo2.prototype.foo = function (x) { + return null; + }; return StringFoo2; })(); var StringFoo3 = (function () { function StringFoo3() { } - StringFoo3.prototype.foo = function (x) { return null; }; + 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..666ea43eeba 100644 --- a/tests/baselines/reference/genericSpecializations2.js +++ b/tests/baselines/reference/genericSpecializations2.js @@ -31,18 +31,24 @@ var IFoo = (function () { var IntFooBad = (function () { function IntFooBad() { } - IntFooBad.prototype.foo = function (x) { return null; }; + IntFooBad.prototype.foo = function (x) { + return null; + }; return IntFooBad; })(); var StringFoo2 = (function () { function StringFoo2() { } - StringFoo2.prototype.foo = function (x) { return null; }; + StringFoo2.prototype.foo = function (x) { + return null; + }; return StringFoo2; })(); var StringFoo3 = (function () { function StringFoo3() { } - StringFoo3.prototype.foo = function (x) { return null; }; + 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..8d157761160 100644 --- a/tests/baselines/reference/genericSpecializations3.js +++ b/tests/baselines/reference/genericSpecializations3.js @@ -41,21 +41,27 @@ iFoo.foo(1); var IntFooBad = (function () { function IntFooBad() { } - IntFooBad.prototype.foo = function (x) { return null; }; + IntFooBad.prototype.foo = function (x) { + return null; + }; return IntFooBad; })(); var intFooBad; var IntFoo = (function () { function IntFoo() { } - IntFoo.prototype.foo = function (x) { return null; }; + IntFoo.prototype.foo = function (x) { + return null; + }; return IntFoo; })(); var intFoo; var StringFoo2 = (function () { function StringFoo2() { } - StringFoo2.prototype.foo = function (x) { return null; }; + StringFoo2.prototype.foo = function (x) { + return null; + }; return StringFoo2; })(); var stringFoo2; @@ -65,7 +71,9 @@ stringFoo2 = intFoo; // error var StringFoo3 = (function () { function StringFoo3() { } - StringFoo3.prototype.foo = function (x) { return null; }; + 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..055e6b4f683 100644 --- a/tests/baselines/reference/genericStaticAnyTypeFunction.js +++ b/tests/baselines/reference/genericStaticAnyTypeFunction.js @@ -25,7 +25,9 @@ var A = (function () { A.one = function (source, value) { return source; }; - A.goo = function () { return 0; }; + A.goo = function () { + return 0; + }; A.two = function (source) { return this.one(source, 42); // should not error }; diff --git a/tests/baselines/reference/genericTypeArgumentInference1.js b/tests/baselines/reference/genericTypeArgumentInference1.js index 48c279f52c3..8bf6f35cb33 100644 --- a/tests/baselines/reference/genericTypeArgumentInference1.js +++ b/tests/baselines/reference/genericTypeArgumentInference1.js @@ -17,7 +17,16 @@ var r4 = _.all([true], _.identity); //// [genericTypeArgumentInference1.js] -var r = _.all([true, 1, null, 'yes'], _.identity); -var r2 = _.all([true], _.identity); +var r = _.all([ + true, + 1, + null, + 'yes' +], _.identity); +var r2 = _.all([ + true +], _.identity); var r3 = _.all([], _.identity); -var r4 = _.all([true], _.identity); +var r4 = _.all([ + true +], _.identity); diff --git a/tests/baselines/reference/genericTypeAssertions1.js b/tests/baselines/reference/genericTypeAssertions1.js index 54637007d99..02a22aa5c81 100644 --- a/tests/baselines/reference/genericTypeAssertions1.js +++ b/tests/baselines/reference/genericTypeAssertions1.js @@ -8,7 +8,8 @@ var r2: A = >>foo; // error var A = (function () { function A() { } - A.prototype.foo = function (x) { }; + A.prototype.foo = function (x) { + }; return A; })(); var foo = new A(); diff --git a/tests/baselines/reference/genericTypeAssertions2.js b/tests/baselines/reference/genericTypeAssertions2.js index 3c904c7a30e..c7acecb5e43 100644 --- a/tests/baselines/reference/genericTypeAssertions2.js +++ b/tests/baselines/reference/genericTypeAssertions2.js @@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function (x) { }; + A.prototype.foo = function (x) { + }; return A; })(); var B = (function (_super) { diff --git a/tests/baselines/reference/genericTypeAssertions3.js b/tests/baselines/reference/genericTypeAssertions3.js index b67a277654f..19a477c142c 100644 --- a/tests/baselines/reference/genericTypeAssertions3.js +++ b/tests/baselines/reference/genericTypeAssertions3.js @@ -4,5 +4,9 @@ var s = < (x: T) => T > ((x: any) => { return null; }); // no error //// [genericTypeAssertions3.js] -var r = (function (x) { return null; }); // bug was 'could not find dotted symbol T' on x's annotation in the type assertion instead of no error -var s = (function (x) { return null; }); // no error +var r = (function (x) { + return null; +}); // bug was 'could not find dotted symbol T' on x's annotation in the type assertion instead of no error +var s = (function (x) { + return null; +}); // no error diff --git a/tests/baselines/reference/genericTypeAssertions4.js b/tests/baselines/reference/genericTypeAssertions4.js index a607fb07428..d04b6cbe104 100644 --- a/tests/baselines/reference/genericTypeAssertions4.js +++ b/tests/baselines/reference/genericTypeAssertions4.js @@ -35,7 +35,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ""; }; + A.prototype.foo = function () { + return ""; + }; return A; })(); var B = (function (_super) { @@ -43,7 +45,9 @@ var B = (function (_super) { function B() { _super.apply(this, arguments); } - B.prototype.bar = function () { return 1; }; + B.prototype.bar = function () { + return 1; + }; return B; })(A); var C = (function (_super) { @@ -51,7 +55,9 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.baz = function () { return 1; }; + C.prototype.baz = function () { + return 1; + }; return C; })(A); var a; diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js index 4be1cce27a9..dbda6074830 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js @@ -55,9 +55,18 @@ var c; var a; var b; var d; -var e = function (x) { var y; return y; }; -function f(x) { var y; return y; } -var g = function f(x) { var y; return y; }; +var e = function (x) { + var y; + return y; +}; +function f(x) { + var y; + return y; +} +var g = function f(x) { + var y; + return y; +}; var D = (function (_super) { __extends(D, _super); function D() { @@ -86,7 +95,9 @@ var D3 = (function () { } return D3; })(); -function h(x) { } -function i(x) { } +function h(x) { +} +function i(x) { +} var j = null; var k = null; diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js index 803d499705a..f6a22073702 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js @@ -50,9 +50,18 @@ var c; var a; var b; var d; -var e = function (x) { var y; return y; }; -function f(x) { var y; return y; } -var g = function f(x) { var y; return y; }; +var e = function (x) { + var y; + return y; +}; +function f(x) { + var y; + return y; +} +var g = function f(x) { + var y; + return y; +}; var D = (function (_super) { __extends(D, _super); function D() { @@ -67,7 +76,9 @@ var D2 = (function (_super) { } return D2; })(M.C); -function h(x) { } -function i(x) { } +function h(x) { +} +function i(x) { +} var j = null; var k = null; diff --git a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js index 90ad9e1ff93..69bc1c372b3 100644 --- a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js +++ b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js @@ -15,7 +15,9 @@ var i2: I; // should be an error var C = (function () { function C() { } - C.prototype.foo = function () { return null; }; + C.prototype.foo = function () { + return null; + }; return C; })(); var c1; // error diff --git a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js index 1a57b866d99..4cd7eb4165b 100644 --- a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js +++ b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js @@ -13,7 +13,8 @@ var i: I = x; // Should not be allowed -- type of 'f' is incompatible with 'I' var X = (function () { function X() { } - X.prototype.f = function (a) { }; + X.prototype.f = function (a) { + }; return X; })(); var x = new X(); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index fdd2e470a55..f0a57430546 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -33,7 +33,8 @@ define(["require", "exports"], function (require, exports) { function List() { _super.apply(this, arguments); } - List.prototype.Bar = function () { }; + List.prototype.Bar = function () { + }; return List; })(Collection); exports.List = List; diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.js b/tests/baselines/reference/genericWithOpenTypeParameters1.js index 90202767012..afdce73cb11 100644 --- a/tests/baselines/reference/genericWithOpenTypeParameters1.js +++ b/tests/baselines/reference/genericWithOpenTypeParameters1.js @@ -15,12 +15,22 @@ var f4 = (x: B) => { return x.foo(1); } // no error var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + 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 -var f2 = function (x) { return x.foo(1); }; // error -var f3 = function (x) { return x.foo(1); }; // error -var f4 = function (x) { return x.foo(1); }; // no error +var f = function (x) { + return x.foo(1); +}; // error +var f2 = function (x) { + return x.foo(1); +}; // error +var f3 = function (x) { + return x.foo(1); +}; // error +var f4 = function (x) { + return x.foo(1); +}; // no error diff --git a/tests/baselines/reference/genericsAndHigherOrderFunctions.js b/tests/baselines/reference/genericsAndHigherOrderFunctions.js index f2e6ef58f22..ad03dccbca2 100644 --- a/tests/baselines/reference/genericsAndHigherOrderFunctions.js +++ b/tests/baselines/reference/genericsAndHigherOrderFunctions.js @@ -21,11 +21,15 @@ var foo: (g: (x: K) => N) => // no errors expected var combine = function (f) { return function (g) { - return function (x) { return f(g(x)); }; + return function (x) { + return f(g(x)); + }; }; }; var foo = function (g) { return function (h) { - return function (f) { return h(combine(f)(g)); }; + return function (f) { + return h(combine(f)(g)); + }; }; }; diff --git a/tests/baselines/reference/genericsManyTypeParameters.js b/tests/baselines/reference/genericsManyTypeParameters.js index 491f0c41168..09cb7658c17 100644 --- a/tests/baselines/reference/genericsManyTypeParameters.js +++ b/tests/baselines/reference/genericsManyTypeParameters.js @@ -61,22 +61,114 @@ function Foo< //// [genericsManyTypeParameters.js] function Foo(x1, y1, z1, a1, b1, c1, x2, y2, z2, a2, b2, c2, x3, y3, z3, a3, b3, c3, x4, y4, z4, a4, b4, c4, x5, y5, z5, a5, b5, c5, x6, y6, z6, a6, b6, c6, x7, y7, z7, a7, b7, c7, x8, y8, z8, a8, b8, c8, x9, y9, z9, a9, b9, c9, x10, y12, z10, a10, b10, c10, x11, y13, z11, a11, b11, c11, x12, y14, z12, a12, b12, c12, x13, y15, z13, a13, b13, c13, x14, y16, z14, a14, b14, c14, x15, y17, z15, a15, b15, c15, x16, y18, z16, a16, b16, c16, x17, y19, z17, a17, b17, c17, x18, y10, z18, a18, b18, c18) { - return [x1, y1, z1, a1, b1, c1, - x2, y2, z2, a2, b2, c2, - x3, y3, z3, a3, b3, c3, - x4, y4, z4, a4, b4, c4, - x5, y5, z5, a5, b5, c5, - x6, y6, z6, a6, b6, c6, - x7, y7, z7, a7, b7, c7, - x8, y8, z8, a8, b8, c8, - x9, y9, z9, a9, b9, c9, - x10, y12, z10, a10, b10, c10, - x11, y13, z11, a11, b11, c11, - x12, y14, z12, a12, b12, c12, - x13, y15, z13, a13, b13, c13, - x14, y16, z14, a14, b14, c14, - x15, y17, z15, a15, b15, c15, - x16, y18, z16, a16, b16, c16, - x17, y19, z17, a17, b17, c17, - x18, y10, z18, a18, b18, c18]; + return [ + x1, + y1, + z1, + a1, + b1, + c1, + x2, + y2, + z2, + a2, + b2, + c2, + x3, + y3, + z3, + a3, + b3, + c3, + x4, + y4, + z4, + a4, + b4, + c4, + x5, + y5, + z5, + a5, + b5, + c5, + x6, + y6, + z6, + a6, + b6, + c6, + x7, + y7, + z7, + a7, + b7, + c7, + x8, + y8, + z8, + a8, + b8, + c8, + x9, + y9, + z9, + a9, + b9, + c9, + x10, + y12, + z10, + a10, + b10, + c10, + x11, + y13, + z11, + a11, + b11, + c11, + x12, + y14, + z12, + a12, + b12, + c12, + x13, + y15, + z13, + a13, + b13, + c13, + x14, + y16, + z14, + a14, + b14, + c14, + x15, + y17, + z15, + a15, + b15, + c15, + x16, + y18, + z16, + a16, + b16, + c16, + x17, + y19, + z17, + a17, + b17, + c17, + x18, + y10, + z18, + a18, + b18, + c18 + ]; } diff --git a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js index 72eeb1ab683..f7f638f10e0 100644 --- a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js +++ b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js @@ -17,16 +17,25 @@ var m = { } //// [genericsWithDuplicateTypeParameters1.js] -function f() { } -function f2(a, b) { return null; } +function f() { +} +function f2(a, b) { + return null; +} var C = (function () { function C() { } - C.prototype.f = function () { }; - C.prototype.f2 = function (a, b) { return null; }; + 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; } + 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..b4bc079cf80 100644 --- a/tests/baselines/reference/genericsWithoutTypeParameters1.js +++ b/tests/baselines/reference/genericsWithoutTypeParameters1.js @@ -37,17 +37,29 @@ function f(x: T): A { var C = (function () { function C() { } - C.prototype.foo = function () { return null; }; + C.prototype.foo = function () { + return null; + }; return C; })(); var c1; var i1; var c2; var i2; -function foo(x, y) { } -function foo2(x, y) { } -var x = { a: new C() }; -var x2 = { a: { bar: function () { return 1; } } }; +function foo(x, y) { +} +function foo2(x, y) { +} +var x = { + a: new C() +}; +var x2 = { + a: { + bar: function () { + return 1; + } + } +}; var D = (function () { function D() { } diff --git a/tests/baselines/reference/getAndSetAsMemberNames.js b/tests/baselines/reference/getAndSetAsMemberNames.js index 8b036cd0f73..22f99920fb1 100644 --- a/tests/baselines/reference/getAndSetAsMemberNames.js +++ b/tests/baselines/reference/getAndSetAsMemberNames.js @@ -49,11 +49,16 @@ var C4 = (function () { })(); var C5 = (function () { function C5() { - this.set = function () { return true; }; + this.set = function () { + return true; + }; } - C5.prototype.get = function () { return true; }; + C5.prototype.get = function () { + return true; + }; Object.defineProperty(C5.prototype, "t", { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/getAndSetNotIdenticalType.js b/tests/baselines/reference/getAndSetNotIdenticalType.js index e6eb7fecc86..7e77fc25d0b 100644 --- a/tests/baselines/reference/getAndSetNotIdenticalType.js +++ b/tests/baselines/reference/getAndSetNotIdenticalType.js @@ -14,7 +14,8 @@ var C = (function () { get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/getsetReturnTypes.js b/tests/baselines/reference/getsetReturnTypes.js index 27b6fc52fe5..55d7e9285b0 100644 --- a/tests/baselines/reference/getsetReturnTypes.js +++ b/tests/baselines/reference/getsetReturnTypes.js @@ -10,7 +10,9 @@ var y: number = makePoint(2).x; //// [getsetReturnTypes.js] function makePoint(x) { return { - get x() { return x; } + get x() { + return x; + } }; } ; diff --git a/tests/baselines/reference/getterSetterNonAccessor.js b/tests/baselines/reference/getterSetterNonAccessor.js index c28337ff7b4..e234574d734 100644 --- a/tests/baselines/reference/getterSetterNonAccessor.js +++ b/tests/baselines/reference/getterSetterNonAccessor.js @@ -10,8 +10,11 @@ Object.defineProperty({}, "0", ({ //// [getterSetterNonAccessor.js] -function getFunc() { return 0; } -function setFunc(v) { } +function getFunc() { + return 0; +} +function setFunc(v) { +} Object.defineProperty({}, "0", ({ get: getFunc, set: setFunc, diff --git a/tests/baselines/reference/gettersAndSetters.js b/tests/baselines/reference/gettersAndSetters.js index 92f959e5988..ded54213401 100644 --- a/tests/baselines/reference/gettersAndSetters.js +++ b/tests/baselines/reference/gettersAndSetters.js @@ -46,21 +46,31 @@ var C = (function () { function C() { this.fooBack = ""; this.bazBack = ""; - this.get = function () { }; // ok - this.set = function () { }; // ok + this.get = function () { + }; // ok + this.set = function () { + }; // ok } Object.defineProperty(C.prototype, "Foo", { - get: function () { return this.fooBack; } // ok + get: function () { + return this.fooBack; + } // ok , - set: function (foo) { this.fooBack = foo; } // ok + set: function (foo) { + this.fooBack = foo; + } // ok , enumerable: true, configurable: true }); Object.defineProperty(C, "Bar", { - get: function () { return C.barBack; } // ok + get: function () { + return C.barBack; + } // ok , - set: function (bar) { C.barBack = bar; } // ok + set: function (bar) { + C.barBack = bar; + } // ok , enumerable: true, configurable: true @@ -76,7 +86,16 @@ C.Bar = "barv"; var baz = c.Baz; c.Baz = "bazv"; // The Foo accessors' return and param types should be contextually typed to the Foo field -var o = { get Foo() { return 0; }, set Foo(val) { val; } }; // o +var o = { + get Foo() { + return 0; + }, + set Foo(val) { + val; + } +}; // o var ofg = o.Foo; o.Foo = 0; -var i = function (n) { return n; }; +var i = function (n) { + return n; +}; diff --git a/tests/baselines/reference/gettersAndSettersAccessibility.js b/tests/baselines/reference/gettersAndSettersAccessibility.js index e0cfa3d17c5..9a7564ec96d 100644 --- a/tests/baselines/reference/gettersAndSettersAccessibility.js +++ b/tests/baselines/reference/gettersAndSettersAccessibility.js @@ -10,8 +10,11 @@ var C99 = (function () { function C99() { } Object.defineProperty(C99.prototype, "Baz", { - get: function () { return 0; }, - set: function (n) { } // error - accessors do not agree in visibility + get: function () { + return 0; + }, + set: function (n) { + } // error - accessors do not agree in visibility , enumerable: true, configurable: true diff --git a/tests/baselines/reference/gettersAndSettersErrors.js b/tests/baselines/reference/gettersAndSettersErrors.js index d92f0d833f5..514a69b2513 100644 --- a/tests/baselines/reference/gettersAndSettersErrors.js +++ b/tests/baselines/reference/gettersAndSettersErrors.js @@ -22,17 +22,23 @@ var C = (function () { this.Foo = 0; // error - duplicate identifier Foo - confirmed } Object.defineProperty(C.prototype, "Foo", { - get: function () { return "foo"; } // ok + get: function () { + return "foo"; + } // ok , - set: function (foo) { } // ok + set: function (foo) { + } // ok , enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "Goo", { - get: function (v) { return null; } // error - getters must not have a parameter + get: function (v) { + return null; + } // error - getters must not have a parameter , - set: function (v) { } // error - setters must not specify a return type + set: function (v) { + } // error - setters must not specify a return type , enumerable: true, configurable: true @@ -43,8 +49,11 @@ var E = (function () { function E() { } Object.defineProperty(E.prototype, "Baz", { - get: function () { return 0; }, - set: function (n) { } // error - accessors do not agree in visibility + get: function () { + return 0; + }, + set: function (n) { + } // error - accessors do not agree in visibility , enumerable: true, configurable: true diff --git a/tests/baselines/reference/gettersAndSettersTypesAgree.js b/tests/baselines/reference/gettersAndSettersTypesAgree.js index 91d3d844981..695a77a001a 100644 --- a/tests/baselines/reference/gettersAndSettersTypesAgree.js +++ b/tests/baselines/reference/gettersAndSettersTypesAgree.js @@ -15,22 +15,40 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { return "foo"; } // ok + get: function () { + return "foo"; + } // ok , - set: function (foo) { } // ok - type inferred from getter return statement + set: function (foo) { + } // ok - type inferred from getter return statement , enumerable: true, configurable: true }); Object.defineProperty(C.prototype, "Bar", { - get: function () { return "foo"; } // ok + get: function () { + return "foo"; + } // ok , - set: function (bar) { } // ok - type must be declared + set: function (bar) { + } // ok - type must be declared , enumerable: true, 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 +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 a5109b6e113..9de46f76b1b 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -697,45 +697,55 @@ define(["require", "exports"], function (require, exports) { MAX DEPTH 3 LEVELS */ var V; - function F() { } + function F() { + } ; var C = (function () { function C() { } - C.prototype.pF = function () { }; - C.prototype.rF = function () { }; - C.prototype.pgF = function () { }; + C.prototype.pF = function () { + }; + C.prototype.rF = function () { + }; + C.prototype.pgF = function () { + }; Object.defineProperty(C.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.psF = function (param) { }; + C.prototype.psF = function (param) { + }; Object.defineProperty(C.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - C.prototype.rgF = function () { }; + C.prototype.rgF = function () { + }; Object.defineProperty(C.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.rsF = function (param) { }; + C.prototype.rsF = function (param) { + }; Object.defineProperty(C.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tF = function () { }; - C.tsF = function (param) { }; + C.tF = function () { + }; + C.tsF = function (param) { + }; Object.defineProperty(C, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tgF = function () { }; + C.tgF = function () { + }; Object.defineProperty(C, "tgF", { get: function () { }, enumerable: true, @@ -746,45 +756,55 @@ define(["require", "exports"], function (require, exports) { var M; (function (_M) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { } - C.prototype.pF = function () { }; - C.prototype.rF = function () { }; - C.prototype.pgF = function () { }; + C.prototype.pF = function () { + }; + C.prototype.rF = function () { + }; + C.prototype.pgF = function () { + }; Object.defineProperty(C.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.psF = function (param) { }; + C.prototype.psF = function (param) { + }; Object.defineProperty(C.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - C.prototype.rgF = function () { }; + C.prototype.rgF = function () { + }; Object.defineProperty(C.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.rsF = function (param) { }; + C.prototype.rsF = function (param) { + }; Object.defineProperty(C.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tF = function () { }; - C.tsF = function (param) { }; + C.tF = function () { + }; + C.tsF = function (param) { + }; Object.defineProperty(C, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tgF = function () { }; + C.tgF = function () { + }; Object.defineProperty(C, "tgF", { get: function () { }, enumerable: true, @@ -795,7 +815,8 @@ define(["require", "exports"], function (require, exports) { var M; (function (M) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { @@ -806,7 +827,8 @@ define(["require", "exports"], function (require, exports) { ; ; M.eV; - function eF() { } + function eF() { + } M.eF = eF; ; var eC = (function () { @@ -823,46 +845,56 @@ define(["require", "exports"], function (require, exports) { ; })(M || (M = {})); _M.eV; - function eF() { } + function eF() { + } _M.eF = eF; ; var eC = (function () { function eC() { } - eC.prototype.pF = function () { }; - eC.prototype.rF = function () { }; - eC.prototype.pgF = function () { }; + eC.prototype.pF = function () { + }; + eC.prototype.rF = function () { + }; + eC.prototype.pgF = function () { + }; Object.defineProperty(eC.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.psF = function (param) { }; + eC.prototype.psF = function (param) { + }; Object.defineProperty(eC.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.prototype.rgF = function () { }; + eC.prototype.rgF = function () { + }; Object.defineProperty(eC.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.rsF = function (param) { }; + eC.prototype.rsF = function (param) { + }; Object.defineProperty(eC.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tF = function () { }; - eC.tsF = function (param) { }; + eC.tF = function () { + }; + eC.tsF = function (param) { + }; Object.defineProperty(eC, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tgF = function () { }; + eC.tgF = function () { + }; Object.defineProperty(eC, "tgF", { get: function () { }, enumerable: true, @@ -874,7 +906,8 @@ define(["require", "exports"], function (require, exports) { var eM; (function (eM) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { @@ -885,7 +918,8 @@ define(["require", "exports"], function (require, exports) { ; ; eM.eV; - function eF() { } + function eF() { + } eM.eF = eF; ; var eC = (function () { @@ -904,46 +938,56 @@ define(["require", "exports"], function (require, exports) { ; })(M || (M = {})); exports.eV; - function eF() { } + function eF() { + } exports.eF = eF; ; var eC = (function () { function eC() { } - eC.prototype.pF = function () { }; - eC.prototype.rF = function () { }; - eC.prototype.pgF = function () { }; + eC.prototype.pF = function () { + }; + eC.prototype.rF = function () { + }; + eC.prototype.pgF = function () { + }; Object.defineProperty(eC.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.psF = function (param) { }; + eC.prototype.psF = function (param) { + }; Object.defineProperty(eC.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.prototype.rgF = function () { }; + eC.prototype.rgF = function () { + }; Object.defineProperty(eC.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.rsF = function (param) { }; + eC.prototype.rsF = function (param) { + }; Object.defineProperty(eC.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tF = function () { }; - eC.tsF = function (param) { }; + eC.tF = function () { + }; + eC.tsF = function (param) { + }; Object.defineProperty(eC, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tgF = function () { }; + eC.tgF = function () { + }; Object.defineProperty(eC, "tgF", { get: function () { }, enumerable: true, @@ -955,45 +999,55 @@ define(["require", "exports"], function (require, exports) { var eM; (function (_eM) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { } - C.prototype.pF = function () { }; - C.prototype.rF = function () { }; - C.prototype.pgF = function () { }; + C.prototype.pF = function () { + }; + C.prototype.rF = function () { + }; + C.prototype.pgF = function () { + }; Object.defineProperty(C.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.psF = function (param) { }; + C.prototype.psF = function (param) { + }; Object.defineProperty(C.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - C.prototype.rgF = function () { }; + C.prototype.rgF = function () { + }; Object.defineProperty(C.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - C.prototype.rsF = function (param) { }; + C.prototype.rsF = function (param) { + }; Object.defineProperty(C.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tF = function () { }; - C.tsF = function (param) { }; + C.tF = function () { + }; + C.tsF = function (param) { + }; Object.defineProperty(C, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - C.tgF = function () { }; + C.tgF = function () { + }; Object.defineProperty(C, "tgF", { get: function () { }, enumerable: true, @@ -1004,7 +1058,8 @@ define(["require", "exports"], function (require, exports) { var M; (function (M) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { @@ -1015,7 +1070,8 @@ define(["require", "exports"], function (require, exports) { ; ; M.eV; - function eF() { } + function eF() { + } M.eF = eF; ; var eC = (function () { @@ -1032,46 +1088,56 @@ define(["require", "exports"], function (require, exports) { ; })(M || (M = {})); _eM.eV; - function eF() { } + function eF() { + } _eM.eF = eF; ; var eC = (function () { function eC() { } - eC.prototype.pF = function () { }; - eC.prototype.rF = function () { }; - eC.prototype.pgF = function () { }; + eC.prototype.pF = function () { + }; + eC.prototype.rF = function () { + }; + eC.prototype.pgF = function () { + }; Object.defineProperty(eC.prototype, "pgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.psF = function (param) { }; + eC.prototype.psF = function (param) { + }; Object.defineProperty(eC.prototype, "psF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.prototype.rgF = function () { }; + eC.prototype.rgF = function () { + }; Object.defineProperty(eC.prototype, "rgF", { get: function () { }, enumerable: true, configurable: true }); - eC.prototype.rsF = function (param) { }; + eC.prototype.rsF = function (param) { + }; Object.defineProperty(eC.prototype, "rsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tF = function () { }; - eC.tsF = function (param) { }; + eC.tF = function () { + }; + eC.tsF = function (param) { + }; Object.defineProperty(eC, "tsF", { set: function (param) { }, enumerable: true, configurable: true }); - eC.tgF = function () { }; + eC.tgF = function () { + }; Object.defineProperty(eC, "tgF", { get: function () { }, enumerable: true, @@ -1083,7 +1149,8 @@ define(["require", "exports"], function (require, exports) { var eM; (function (eM) { var V; - function F() { } + function F() { + } ; var C = (function () { function C() { @@ -1094,7 +1161,8 @@ define(["require", "exports"], function (require, exports) { ; ; eM.eV; - function eF() { } + function eF() { + } eM.eF = eF; ; var eC = (function () { diff --git a/tests/baselines/reference/globalThisCapture.js b/tests/baselines/reference/globalThisCapture.js index b854e754a34..5e724d77e0f 100644 --- a/tests/baselines/reference/globalThisCapture.js +++ b/tests/baselines/reference/globalThisCapture.js @@ -11,7 +11,9 @@ parts[0]; //// [globalThisCapture.js] var _this = this; // Add a lambda to ensure global 'this' capture is triggered -(function () { return _this.window; }); +(function () { + return _this.window; +}); var parts = []; // Ensure that the generated code is correct parts[0]; diff --git a/tests/baselines/reference/grammarAmbiguities.js b/tests/baselines/reference/grammarAmbiguities.js index f603bd1023f..ee81d947ff6 100644 --- a/tests/baselines/reference/grammarAmbiguities.js +++ b/tests/baselines/reference/grammarAmbiguities.js @@ -12,8 +12,12 @@ f(g < A, B > +(7)); // Should error //// [grammarAmbiguities.js] -function f(n) { return null; } -function g(x) { return null; } +function f(n) { + return null; +} +function g(x) { + return null; +} var A, B; f(g(7)); f(g < A, B > 7); // Should error diff --git a/tests/baselines/reference/grammarAmbiguities1.js b/tests/baselines/reference/grammarAmbiguities1.js index 1917acb7128..cb6e4b75473 100644 --- a/tests/baselines/reference/grammarAmbiguities1.js +++ b/tests/baselines/reference/grammarAmbiguities1.js @@ -14,17 +14,23 @@ f(g < A, B > +(7)); var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { } - B.prototype.bar = function () { }; + B.prototype.bar = function () { + }; return B; })(); -function f(x) { return x; } -function g(x) { return f(x); } +function f(x) { + return x; +} +function g(x) { + return f(x); +} g(7); f(g(7)); f(g < A, B > 7); diff --git a/tests/baselines/reference/heterogeneousArrayAndOverloads.js b/tests/baselines/reference/heterogeneousArrayAndOverloads.js index b816b87e3d1..f18cef71307 100644 --- a/tests/baselines/reference/heterogeneousArrayAndOverloads.js +++ b/tests/baselines/reference/heterogeneousArrayAndOverloads.js @@ -15,12 +15,25 @@ class arrTest { var arrTest = (function () { function arrTest() { } - arrTest.prototype.test = function (arg1) { }; + arrTest.prototype.test = function (arg1) { + }; arrTest.prototype.callTest = function () { - this.test([1, 2, 3, 5]); - this.test(["hi"]); + this.test([ + 1, + 2, + 3, + 5 + ]); + this.test([ + "hi" + ]); this.test([]); - this.test([1, 2, "hi", 5]); // Error + this.test([ + 1, + 2, + "hi", + 5 + ]); // Error }; return arrTest; })(); diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js index 4ac929305c0..51d316a4f43 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.js +++ b/tests/baselines/reference/heterogeneousArrayLiterals.js @@ -139,20 +139,106 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -var a = [1, '']; // {}[] -var b = [1, null]; // number[] -var c = [1, '', null]; // {}[] -var d = [{}, 1]; // {}[] -var e = [{}, Object]; // {}[] -var f = [[], [1]]; // number[][] -var g = [[1], ['']]; // {}[] -var h = [{ foo: 1, bar: '' }, { foo: 2 }]; // {foo: number}[] -var i = [{ foo: 1, bar: '' }, { foo: '' }]; // {}[] -var j = [function () { return 1; }, function () { return ''; }]; // {}[] -var k = [function () { return 1; }, function () { return 1; }]; // { (): number }[] -var l = [function () { return 1; }, function () { return null; }]; // { (): any }[] -var m = [function () { return 1; }, function () { return ''; }, function () { return null; }]; // { (): any }[] -var n = [[function () { return 1; }], [function () { return ''; }]]; // {}[] +var a = [ + 1, + '' +]; // {}[] +var b = [ + 1, + null +]; // number[] +var c = [ + 1, + '', + null +]; // {}[] +var d = [ + {}, + 1 +]; // {}[] +var e = [ + {}, + Object +]; // {}[] +var f = [ + [], + [ + 1 + ] +]; // number[][] +var g = [ + [ + 1 + ], + [ + '' + ] +]; // {}[] +var h = [ + { + foo: 1, + bar: '' + }, + { + foo: 2 + } +]; // {foo: number}[] +var i = [ + { + foo: 1, + bar: '' + }, + { + foo: '' + } +]; // {}[] +var j = [ + function () { + return 1; + }, + function () { + return ''; + } +]; // {}[] +var k = [ + function () { + return 1; + }, + function () { + return 1; + } +]; // { (): number }[] +var l = [ + function () { + return 1; + }, + function () { + return null; + } +]; // { (): any }[] +var m = [ + function () { + return 1; + }, + function () { + return ''; + }, + function () { + return null; + } +]; // { (): any }[] +var n = [ + [ + function () { + return 1; + } + ], + [ + function () { + return ''; + } + ] +]; // {}[] var Base = (function () { function Base() { } @@ -177,69 +263,312 @@ var derived; var derived2; var Derived; (function (Derived) { - var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[] - var i = [{ foo: base, basear: derived }, { foo: derived }]; // {foo: Derived}[] - var j = [function () { return base; }, function () { return derived; }]; // { {}: Base } - var k = [function () { return base; }, function () { return 1; }]; // {}[]~ - var l = [function () { return base; }, function () { return null; }]; // { (): any }[] - var m = [function () { return base; }, function () { return derived; }, function () { return null; }]; // { (): any }[] - var n = [[function () { return base; }], [function () { return derived; }]]; // { (): Base }[] - var o = [derived, derived2]; // {}[] - var p = [derived, derived2, base]; // Base[] - var q = [[function () { return derived2; }], [function () { return derived; }]]; // {}[] + var h = [ + { + foo: base, + basear: derived + }, + { + foo: base + } + ]; // {foo: Base}[] + var i = [ + { + foo: base, + basear: derived + }, + { + foo: derived + } + ]; // {foo: Derived}[] + var j = [ + function () { + return base; + }, + function () { + return derived; + } + ]; // { {}: Base } + var k = [ + function () { + return base; + }, + function () { + return 1; + } + ]; // {}[]~ + var l = [ + function () { + return base; + }, + function () { + return null; + } + ]; // { (): any }[] + var m = [ + function () { + return base; + }, + function () { + return derived; + }, + function () { + return null; + } + ]; // { (): any }[] + var n = [ + [ + function () { + return base; + } + ], + [ + function () { + return derived; + } + ] + ]; // { (): Base }[] + var o = [ + derived, + derived2 + ]; // {}[] + var p = [ + derived, + derived2, + base + ]; // Base[] + var q = [ + [ + function () { + return derived2; + } + ], + [ + function () { + return derived; + } + ] + ]; // {}[] })(Derived || (Derived = {})); var WithContextualType; (function (WithContextualType) { // no errors - var a = [derived, derived2]; - var b = [null]; + var a = [ + derived, + derived2 + ]; + var b = [ + null + ]; var c = []; - var d = [function () { return derived; }, function () { return derived2; }]; + var d = [ + function () { + return derived; + }, + function () { + return derived2; + } + ]; })(WithContextualType || (WithContextualType = {})); function foo(t, u) { - var a = [t, t]; // T[] - var b = [t, null]; // T[] - var c = [t, u]; // {}[] - var d = [t, 1]; // {}[] - var e = [function () { return t; }, function () { return u; }]; // {}[] - var f = [function () { return t; }, function () { return u; }, function () { return null; }]; // { (): any }[] + var a = [ + t, + t + ]; // T[] + var b = [ + t, + null + ]; // T[] + var c = [ + t, + u + ]; // {}[] + var d = [ + t, + 1 + ]; // {}[] + var e = [ + function () { + return t; + }, + function () { + return u; + } + ]; // {}[] + var f = [ + function () { + return t; + }, + function () { + return u; + }, + function () { + return null; + } + ]; // { (): any }[] } function foo2(t, u) { - var a = [t, t]; // T[] - var b = [t, null]; // T[] - var c = [t, u]; // {}[] - var d = [t, 1]; // {}[] - var e = [function () { return t; }, function () { return u; }]; // {}[] - var f = [function () { return t; }, function () { return u; }, function () { return null; }]; // { (): any }[] - var g = [t, base]; // Base[] - var h = [t, derived]; // Derived[] - var i = [u, base]; // Base[] - var j = [u, derived]; // Derived[] + var a = [ + t, + t + ]; // T[] + var b = [ + t, + null + ]; // T[] + var c = [ + t, + u + ]; // {}[] + var d = [ + t, + 1 + ]; // {}[] + var e = [ + function () { + return t; + }, + function () { + return u; + } + ]; // {}[] + var f = [ + function () { + return t; + }, + function () { + return u; + }, + function () { + return null; + } + ]; // { (): any }[] + var g = [ + t, + base + ]; // Base[] + var h = [ + t, + derived + ]; // Derived[] + var i = [ + u, + base + ]; // Base[] + var j = [ + u, + derived + ]; // Derived[] } function foo3(t, u) { - var a = [t, t]; // T[] - var b = [t, null]; // T[] - var c = [t, u]; // {}[] - var d = [t, 1]; // {}[] - var e = [function () { return t; }, function () { return u; }]; // {}[] - var f = [function () { return t; }, function () { return u; }, function () { return null; }]; // { (): any }[] - var g = [t, base]; // Base[] - var h = [t, derived]; // Derived[] - var i = [u, base]; // Base[] - var j = [u, derived]; // Derived[] + var a = [ + t, + t + ]; // T[] + var b = [ + t, + null + ]; // T[] + var c = [ + t, + u + ]; // {}[] + var d = [ + t, + 1 + ]; // {}[] + var e = [ + function () { + return t; + }, + function () { + return u; + } + ]; // {}[] + var f = [ + function () { + return t; + }, + function () { + return u; + }, + function () { + return null; + } + ]; // { (): any }[] + var g = [ + t, + base + ]; // Base[] + var h = [ + t, + derived + ]; // Derived[] + var i = [ + u, + base + ]; // Base[] + var j = [ + u, + derived + ]; // Derived[] } function foo4(t, u) { - var a = [t, t]; // T[] - var b = [t, null]; // T[] - var c = [t, u]; // BUG 821629 - var d = [t, 1]; // {}[] - var e = [function () { return t; }, function () { return u; }]; // {}[] - var f = [function () { return t; }, function () { return u; }, function () { return null; }]; // { (): any }[] - var g = [t, base]; // Base[] - var h = [t, derived]; // Derived[] - var i = [u, base]; // Base[] - var j = [u, derived]; // Derived[] - var k = [t, u]; + var a = [ + t, + t + ]; // T[] + var b = [ + t, + null + ]; // T[] + var c = [ + t, + u + ]; // BUG 821629 + var d = [ + t, + 1 + ]; // {}[] + var e = [ + function () { + return t; + }, + function () { + return u; + } + ]; // {}[] + var f = [ + function () { + return t; + }, + function () { + return u; + }, + function () { + return null; + } + ]; // { (): any }[] + var g = [ + t, + base + ]; // Base[] + var h = [ + t, + derived + ]; // Derived[] + var i = [ + u, + base + ]; // Base[] + var j = [ + u, + derived + ]; // Derived[] + var k = [ + t, + u + ]; } //function foo3(t: T, u: U) { // var a = [t, t]; // T[] diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js index 793094584bf..db23ea4681c 100644 --- a/tests/baselines/reference/ifDoWhileStatements.js +++ b/tests/baselines/reference/ifDoWhileStatements.js @@ -186,8 +186,12 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } -function F2(x) { return x < 42; } +function F(x) { + return 42; +} +function F2(x) { + return x < 42; +} var M; (function (M) { var A = (function () { @@ -196,7 +200,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); var N; @@ -207,101 +213,216 @@ var N; return A; })(); N.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } N.F2 = F2; })(N || (N = {})); // literals -if (true) { } -while (true) { } -do { } while (true); -if (null) { } -while (null) { } -do { } while (null); -if (undefined) { } -while (undefined) { } -do { } while (undefined); -if (0.0) { } -while (0.0) { } -do { } while (0.0); -if ('a string') { } -while ('a string') { } -do { } while ('a string'); -if ('') { } -while ('') { } -do { } while (''); -if (/[a-z]/) { } -while (/[a-z]/) { } -do { } while (/[a-z]/); -if ([]) { } -while ([]) { } -do { } while ([]); -if ([1, 2]) { } -while ([1, 2]) { } -do { } while ([1, 2]); -if ({}) { } -while ({}) { } -do { } while ({}); -if ({ x: 1, y: 'a' }) { } -while ({ x: 1, y: 'a' }) { } -do { } while ({ x: 1, y: 'a' }); -if (function () { return 43; }) { } -while (function () { return 43; }) { } -do { } while (function () { return 43; }); -if (new C()) { } -while (new C()) { } -do { } while (new C()); -if (new D()) { } -while (new D()) { } -do { } while (new D()); +if (true) { +} +while (true) { +} +do { +} while (true); +if (null) { +} +while (null) { +} +do { +} while (null); +if (undefined) { +} +while (undefined) { +} +do { +} while (undefined); +if (0.0) { +} +while (0.0) { +} +do { +} while (0.0); +if ('a string') { +} +while ('a string') { +} +do { +} while ('a string'); +if ('') { +} +while ('') { +} +do { +} while (''); +if (/[a-z]/) { +} +while (/[a-z]/) { +} +do { +} while (/[a-z]/); +if ([]) { +} +while ([]) { +} +do { +} while ([]); +if ([ + 1, + 2 +]) { +} +while ([ + 1, + 2 +]) { +} +do { +} while ([ + 1, + 2 +]); +if ({}) { +} +while ({}) { +} +do { +} while ({}); +if ({ + x: 1, + y: 'a' +}) { +} +while ({ + x: 1, + y: 'a' +}) { +} +do { +} while ({ + x: 1, + y: 'a' +}); +if (function () { + return 43; +}) { +} +while (function () { + return 43; +}) { +} +do { +} while (function () { + return 43; +}); +if (new C()) { +} +while (new C()) { +} +do { +} while (new C()); +if (new D()) { +} +while (new D()) { +} +do { +} while (new D()); // references var a = true; -if (a) { } -while (a) { } -do { } while (a); +if (a) { +} +while (a) { +} +do { +} while (a); var b = null; -if (b) { } -while (b) { } -do { } while (b); +if (b) { +} +while (b) { +} +do { +} while (b); var c = undefined; -if (c) { } -while (c) { } -do { } while (c); +if (c) { +} +while (c) { +} +do { +} while (c); var d = 0.0; -if (d) { } -while (d) { } -do { } while (d); +if (d) { +} +while (d) { +} +do { +} while (d); var e = 'a string'; -if (e) { } -while (e) { } -do { } while (e); +if (e) { +} +while (e) { +} +do { +} while (e); var f = ''; -if (f) { } -while (f) { } -do { } while (f); +if (f) { +} +while (f) { +} +do { +} while (f); var g = /[a-z]/; -if (g) { } -while (g) { } -do { } while (g); +if (g) { +} +while (g) { +} +do { +} while (g); var h = []; -if (h) { } -while (h) { } -do { } while (h); -var i = [1, 2]; -if (i) { } -while (i) { } -do { } while (i); +if (h) { +} +while (h) { +} +do { +} while (h); +var i = [ + 1, + 2 +]; +if (i) { +} +while (i) { +} +do { +} while (i); var j = {}; -if (j) { } -while (j) { } -do { } while (j); -var k = { x: 1, y: 'a' }; -if (k) { } -while (k) { } -do { } while (k); -function fn(x) { return null; } -if (fn()) { } -while (fn()) { } -do { } while (fn()); -if (fn) { } -while (fn) { } -do { } while (fn); +if (j) { +} +while (j) { +} +do { +} while (j); +var k = { + x: 1, + y: 'a' +}; +if (k) { +} +while (k) { +} +do { +} while (k); +function fn(x) { + return null; +} +if (fn()) { +} +while (fn()) { +} +do { +} while (fn()); +if (fn) { +} +while (fn) { +} +do { +} while (fn); diff --git a/tests/baselines/reference/illegalSuperCallsInConstructor.js b/tests/baselines/reference/illegalSuperCallsInConstructor.js index 0bdcebed9c5..5fbad149b91 100644 --- a/tests/baselines/reference/illegalSuperCallsInConstructor.js +++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js @@ -35,9 +35,15 @@ var Base = (function () { var Derived = (function (_super) { __extends(Derived, _super); function Derived() { - var r2 = function () { return _super.call(this); }; - var r3 = function () { _super.call(this); }; - var r4 = function () { _super.call(this); }; + var r2 = function () { + return _super.call(this); + }; + var r3 = function () { + _super.call(this); + }; + var r4 = function () { + _super.call(this); + }; var r5 = { get foo() { _super.call(this); diff --git a/tests/baselines/reference/implementsClauseAlreadySeen.js b/tests/baselines/reference/implementsClauseAlreadySeen.js index abb28886615..84823c13fa8 100644 --- a/tests/baselines/reference/implementsClauseAlreadySeen.js +++ b/tests/baselines/reference/implementsClauseAlreadySeen.js @@ -15,6 +15,7 @@ var C = (function () { var D = (function () { function D() { } - D.prototype.baz = function () { }; + D.prototype.baz = function () { + }; return D; })(); diff --git a/tests/baselines/reference/implicitAnyCastedValue.js b/tests/baselines/reference/implicitAnyCastedValue.js index be6bd1bfef3..bc0855c838b 100644 --- a/tests/baselines/reference/implicitAnyCastedValue.js +++ b/tests/baselines/reference/implicitAnyCastedValue.js @@ -160,4 +160,7 @@ function multipleRets2(x) { var bar1 = null; var bar2 = undefined; var bar3 = 0; -var array = [null, undefined]; +var array = [ + null, + undefined +]; diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.js b/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.js index 9bfad713d82..cba7602d049 100644 --- a/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.js +++ b/tests/baselines/reference/implicitAnyDeclareFunctionExprWithoutFormalType.js @@ -19,15 +19,32 @@ var lambda10 = function temp1() { return 5; } //// [implicitAnyDeclareFunctionExprWithoutFormalType.js] // these should be errors for implicit any parameter -var lambda = function (l1) { }; // Error at "l1" -var lambd2 = function (ll1, ll2) { }; // Error at "ll1" -var lamda3 = function myLambda3(myParam) { }; -var lamda4 = function () { return null; }; +var lambda = function (l1) { +}; // Error at "l1" +var lambd2 = function (ll1, ll2) { +}; // Error at "ll1" +var lamda3 = function myLambda3(myParam) { +}; +var lamda4 = function () { + return null; +}; // these should be error for implicit any return type -var lambda5 = function temp() { return null; }; -var lambda6 = function () { return null; }; -var lambda7 = function temp() { return undefined; }; -var lambda8 = function () { return undefined; }; +var lambda5 = function temp() { + return null; +}; +var lambda6 = function () { + return null; +}; +var lambda7 = function temp() { + return undefined; +}; +var lambda8 = function () { + return undefined; +}; // this shouldn't be an error -var lambda9 = function () { return 5; }; -var lambda10 = function temp1() { return 5; }; +var lambda9 = function () { + return 5; +}; +var lambda10 = function temp1() { + return 5; +}; diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js index c13479daff3..6332f444487 100644 --- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js +++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js @@ -13,11 +13,14 @@ function noError2(x: number, y: string) { }; //// [implicitAnyDeclareFunctionWithoutFormalType.js] // these should be errors -function foo(x) { } +function foo(x) { +} ; -function bar(x, y) { } +function bar(x, y) { +} ; // error at "y"; no error at "x" -function func2(a, b, c) { } +function func2(a, b, c) { +} ; // error at "a,b,c" function func3() { var args = []; @@ -37,5 +40,6 @@ function noError1(x, y) { if (y === void 0) { y = 2; } } ; -function noError2(x, y) { } +function noError2(x, y) { +} ; diff --git a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js index 59d625fff4a..1a49449529e 100644 --- a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js +++ b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js @@ -15,6 +15,7 @@ var C = (function () { function C(c1, c2, c3) { this.x = null; // error at "x" } // error at "c1, c2" - C.prototype.funcOfC = function (f1, f2, f3) { }; // error at "f1,f2" + C.prototype.funcOfC = function (f1, f2, f3) { + }; // error at "f1,f2" return C; })(); diff --git a/tests/baselines/reference/implicitAnyDeclareVariablesWithoutTypeAndInit.js b/tests/baselines/reference/implicitAnyDeclareVariablesWithoutTypeAndInit.js index e3c44e9b783..ae09bf2e40e 100644 --- a/tests/baselines/reference/implicitAnyDeclareVariablesWithoutTypeAndInit.js +++ b/tests/baselines/reference/implicitAnyDeclareVariablesWithoutTypeAndInit.js @@ -14,7 +14,8 @@ var x1: any; var y1 = new x1; //// [implicitAnyDeclareVariablesWithoutTypeAndInit.js] // this should be an error var x; // error at "x" -function func(k) { } +function func(k) { +} ; //error at "k" func(x); // this shouldn't be an error diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.js b/tests/baselines/reference/implicitAnyFromCircularInference.js index d818ea17105..b2ea707d176 100644 --- a/tests/baselines/reference/implicitAnyFromCircularInference.js +++ b/tests/baselines/reference/implicitAnyFromCircularInference.js @@ -58,15 +58,21 @@ var b; var c; // Error expected var d; -function f() { return f; } +function f() { + return f; +} // Error expected -function g() { return g(); } +function g() { + return g(); +} // Error expected var f1 = function () { return f1(); }; // Error expected -var f2 = function () { return f2(); }; +var f2 = function () { + return f2(); +}; // Error expected function h() { return foo(); @@ -74,7 +80,9 @@ function h() { return h() || "hello"; } } -function foo(x) { return "abc"; } +function foo(x) { + return "abc"; +} var C = (function () { function C() { // Error expected diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js index bc5b9453665..21a3171b439 100644 --- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js +++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js @@ -38,28 +38,42 @@ var newC2 = new C([], null) //// [implicitAnyFunctionInvocationWithAnyArguements.js] // this should be errors var arg0 = null; // error at "arg0" -var anyArray = [null, undefined]; // error at array literal +var anyArray = [ + null, + undefined +]; // error at array literal var objL; // error at "y,z" var funcL; -function temp1(arg1) { } // error at "temp1" -function testFunctionExprC(subReplace) { } -function testFunctionExprC2(eq) { } +function temp1(arg1) { +} // error at "temp1" +function testFunctionExprC(subReplace) { +} +function testFunctionExprC2(eq) { +} ; -function testObjLiteral(objLit) { } +function testObjLiteral(objLit) { +} ; -function testFuncLiteral(funcLit) { } +function testFuncLiteral(funcLit) { +} ; // this should not be an error -testFunctionExprC2(function (v1, v2) { return 1; }); +testFunctionExprC2(function (v1, v2) { + return 1; +}); testObjLiteral(objL); testFuncLiteral(funcL); var k = temp1(null); var result = temp1(arg0); var result1 = temp1(anyArray); -function noError(variable, array) { } +function noError(variable, array) { +} noError(null, []); noError(undefined, []); -noError(null, [null, undefined]); +noError(null, [ + null, + undefined +]); noError(undefined, anyArray); var C = (function () { function C(emtpyArray, variable) { diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js index 82eb56fbde6..699b57603eb 100644 --- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js +++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js @@ -26,8 +26,12 @@ undefinedWidenFunction(); //// [implicitAnyFunctionReturnNullOrUndefined.js] // this should be an error -function nullWidenFunction() { return null; } // error at "nullWidenFunction" -function undefinedWidenFunction() { return undefined; } // error at "undefinedWidenFunction" +function nullWidenFunction() { + return null; +} // error at "nullWidenFunction" +function undefinedWidenFunction() { + return undefined; +} // error at "undefinedWidenFunction" var C = (function () { function C() { } @@ -40,10 +44,18 @@ var C = (function () { return C; })(); // this should not be an error -function foo1() { return null; } -function bar1() { return undefined; } -function fooBar() { return 1; } -function fooFoo() { return 5; } +function foo1() { + return null; +} +function bar1() { + return undefined; +} +function fooBar() { + return 1; +} +function fooFoo() { + return 5; +} // this should not be an error as the error is raised by expr above nullWidenFunction(); undefinedWidenFunction(); diff --git a/tests/baselines/reference/implicitAnyGenericTypeInference.js b/tests/baselines/reference/implicitAnyGenericTypeInference.js index 583ab7f0b01..37ef042f262 100644 --- a/tests/baselines/reference/implicitAnyGenericTypeInference.js +++ b/tests/baselines/reference/implicitAnyGenericTypeInference.js @@ -10,5 +10,9 @@ var r = c.compareTo(1, ''); //// [implicitAnyGenericTypeInference.js] var c; -c = { compareTo: function (x, y) { return y; } }; +c = { + compareTo: function (x, y) { + return y; + } +}; var r = c.compareTo(1, ''); diff --git a/tests/baselines/reference/implicitAnyGenerics.js b/tests/baselines/reference/implicitAnyGenerics.js index daea0dfe54c..a5c98590a8f 100644 --- a/tests/baselines/reference/implicitAnyGenerics.js +++ b/tests/baselines/reference/implicitAnyGenerics.js @@ -46,7 +46,9 @@ var d2 = new D(1); var d3 = new D(1); var d4 = new D(1); var d5 = new D(null); -function foo() { return null; } +function foo() { + return null; +} ; foo(); foo(); diff --git a/tests/baselines/reference/implicitAnyInCatch.js b/tests/baselines/reference/implicitAnyInCatch.js index c35e92372e3..29a2e03a130 100644 --- a/tests/baselines/reference/implicitAnyInCatch.js +++ b/tests/baselines/reference/implicitAnyInCatch.js @@ -16,11 +16,14 @@ class C { //// [implicitAnyInCatch.js] // this should not be an error -try { } +try { +} catch (error) { - if (error.number === -2147024809) { } + if (error.number === -2147024809) { + } +} +for (var key in this) { } -for (var key in this) { } var C = (function () { function C() { } diff --git a/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js b/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js index 9e558122b15..4218d9a9a21 100644 --- a/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js +++ b/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js @@ -3,5 +3,7 @@ function Point() { this.x = 3; } var x: any = new Point(); // error at "new" //// [implicitAnyNewExprLackConstructorSignature.js] -function Point() { this.x = 3; } +function Point() { + this.x = 3; +} var x = new Point(); // error at "new" diff --git a/tests/baselines/reference/implicitAnyWidenToAny.js b/tests/baselines/reference/implicitAnyWidenToAny.js index 838593a88ef..01ad0dcb9b2 100644 --- a/tests/baselines/reference/implicitAnyWidenToAny.js +++ b/tests/baselines/reference/implicitAnyWidenToAny.js @@ -31,7 +31,10 @@ var obj1 = anyReturnFunc(); // these should be errors var x = null; // error at "x" var x1 = undefined; // error at "x1" -var widenArray = [null, undefined]; // error at "widenArray" +var widenArray = [ + null, + undefined +]; // error at "widenArray" var emptyArray = []; // error at "emptyArray" // these should not be error var AnimalObj = (function () { @@ -44,13 +47,28 @@ var bar = "Hello World"; var foo1 = null; var foo2 = undefined; var temp = 5; -var c = { x: null }; -var array1 = ["Bob", 2]; +var c = { + x: null +}; +var array1 = [ + "Bob", + 2 +]; var array2 = []; -var array3 = [null, undefined]; -var array4 = [null, undefined]; -var array5 = [null, undefined]; +var array3 = [ + null, + undefined +]; +var array4 = [ + null, + undefined +]; +var array5 = [ + null, + undefined +]; var objLit; -function anyReturnFunc() { } +function anyReturnFunc() { +} var obj0 = new objLit(1); var obj1 = anyReturnFunc(); diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 3329fb810a7..35992b86fec 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -17,7 +17,8 @@ module m_private { //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js] var m; (function (m) { - function foo() { } + function foo() { + } m.foo = foo; })(m = exports.m || (exports.m = {})); //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] diff --git a/tests/baselines/reference/importAliasIdentifiers.js b/tests/baselines/reference/importAliasIdentifiers.js index 7bd15b28c66..620fdf13866 100644 --- a/tests/baselines/reference/importAliasIdentifiers.js +++ b/tests/baselines/reference/importAliasIdentifiers.js @@ -69,18 +69,27 @@ var clodule = (function () { })(); var clodule; (function (clodule) { - var Point = { x: 0, y: 0 }; + var Point = { + x: 0, + y: 0 + }; })(clodule || (clodule = {})); var clolias = clodule; var p; var p; var p; function fundule() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } var fundule; (function (fundule) { - var Point = { x: 0, y: 0 }; + var Point = { + x: 0, + y: 0 + }; })(fundule || (fundule = {})); var funlias = fundule; var p; diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index 8114e88ca4b..9e52c4dd067 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -14,7 +14,9 @@ class Hello extends Greeter { } var Greeter = (function () { function Greeter() { } - Greeter.prototype.greet = function () { return 'greet'; }; + Greeter.prototype.greet = function () { + return 'greet'; + }; return Greeter; })(); exports.Greeter = Greeter; diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index 9d4839e5e7c..d6f2855908e 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -89,7 +89,9 @@ var d = (function () { })(); exports.d = d; exports.x; -function foo() { return null; } +function foo() { + return null; +} exports.foo = foo; //// [importDecl_require1.js] var d = (function () { @@ -99,7 +101,9 @@ var d = (function () { })(); exports.d = d; var x; -function foo() { return null; } +function foo() { + return null; +} exports.foo = foo; //// [importDecl_require2.js] var d = (function () { @@ -109,7 +113,9 @@ var d = (function () { })(); exports.d = d; exports.x; -function foo() { return null; } +function foo() { + return null; +} exports.foo = foo; //// [importDecl_require3.js] var d = (function () { @@ -119,10 +125,14 @@ var d = (function () { })(); exports.d = d; exports.x; -function foo() { return null; } +function foo() { + return null; +} exports.foo = foo; //// [importDecl_require4.js] -function foo2() { return null; } +function foo2() { + return null; +} exports.foo2 = foo2; //// [importDecl_1.js] /// diff --git a/tests/baselines/reference/importInTypePosition.js b/tests/baselines/reference/importInTypePosition.js index c0d64a4ef7b..08f7078cca3 100644 --- a/tests/baselines/reference/importInTypePosition.js +++ b/tests/baselines/reference/importInTypePosition.js @@ -39,5 +39,8 @@ var C; (function (C) { var m; var p; - var p = { x: 0, y: 0 }; + var p = { + x: 0, + y: 0 + }; })(C || (C = {})); diff --git a/tests/baselines/reference/importStatements.js b/tests/baselines/reference/importStatements.js index b8d06a3546e..dddbadbcc7a 100644 --- a/tests/baselines/reference/importStatements.js +++ b/tests/baselines/reference/importStatements.js @@ -52,7 +52,10 @@ var C; (function (C) { var m; var p; - var p = { x: 0, y: 0 }; + var p = { + x: 0, + y: 0 + }; })(C || (C = {})); // code gen expected var D; diff --git a/tests/baselines/reference/importStatementsInterfaces.js b/tests/baselines/reference/importStatementsInterfaces.js index 4f7bb447565..bb24aeb0f6b 100644 --- a/tests/baselines/reference/importStatementsInterfaces.js +++ b/tests/baselines/reference/importStatementsInterfaces.js @@ -47,7 +47,11 @@ var C; (function (C) { var m; var p; - var p = { x: 0, y: 0, z: 0 }; + var p = { + x: 0, + y: 0, + z: 0 + }; })(C || (C = {})); // no code gen expected var D; diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js index dd7dfcd5fc9..6685bec69e3 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.js +++ b/tests/baselines/reference/importedModuleAddToGlobal.js @@ -28,5 +28,7 @@ var B; })(B || (B = {})); var C; (function (C) { - function hello() { return null; } + function hello() { + return null; + } })(C || (C = {})); diff --git a/tests/baselines/reference/inOperator.js b/tests/baselines/reference/inOperator.js index 10059bcf2b7..1407ef9d59c 100644 --- a/tests/baselines/reference/inOperator.js +++ b/tests/baselines/reference/inOperator.js @@ -14,9 +14,12 @@ if (y in c) { } //// [inOperator.js] var a = []; -for (var x in a) { } -if (3 in a) { } +for (var x in a) { +} +if (3 in a) { +} var b = '' in 0; var c; var y; -if (y in c) { } +if (y in c) { +} diff --git a/tests/baselines/reference/inOperatorWithFunction.js b/tests/baselines/reference/inOperatorWithFunction.js index bc293ca2c43..f06e95ff6b7 100644 --- a/tests/baselines/reference/inOperatorWithFunction.js +++ b/tests/baselines/reference/inOperatorWithFunction.js @@ -4,5 +4,9 @@ fn("a" in { "a": true }); //// [inOperatorWithFunction.js] -var fn = function (val) { return val; }; -fn("a" in { "a": true }); +var fn = function (val) { + return val; +}; +fn("a" in { + "a": true +}); diff --git a/tests/baselines/reference/incompatibleTypes.js b/tests/baselines/reference/incompatibleTypes.js index 7e24afecf5f..a0b4d0f9ca2 100644 --- a/tests/baselines/reference/incompatibleTypes.js +++ b/tests/baselines/reference/incompatibleTypes.js @@ -102,12 +102,18 @@ var C4 = (function () { } return C4; })(); -function if1(a) { } +function if1(a) { +} var c1; var c2; if1(c1); -function of1(a) { return null; } -of1({ e: 0, f: 0 }); +function of1(a) { + return null; +} +of1({ + e: 0, + f: 0 +}); function foo(fn) { } function bar() { @@ -116,7 +122,25 @@ function bar() { map = {}; }); } -var o1 = { e: 0, f: 0 }; -var a1 = [{ e: 0, f: 0 }, { e: 0, f: 0 }, { e: 0, g: 0 }]; +var o1 = { + e: 0, + f: 0 +}; +var a1 = [ + { + e: 0, + f: 0 + }, + { + e: 0, + f: 0 + }, + { + e: 0, + g: 0 + } +]; var i1c1 = 5; -var fp1 = function (a) { return 0; }; +var fp1 = function (a) { + return 0; +}; diff --git a/tests/baselines/reference/incompleteObjectLiteral1.js b/tests/baselines/reference/incompleteObjectLiteral1.js index ecdbe86604a..6859267fee1 100644 --- a/tests/baselines/reference/incompleteObjectLiteral1.js +++ b/tests/baselines/reference/incompleteObjectLiteral1.js @@ -3,5 +3,7 @@ var tt = { aa; } var x = tt; //// [incompleteObjectLiteral1.js] -var tt = { aa: }; +var tt = { + aa: +}; var x = tt; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js index 4c9d570d07f..7fd47a937a8 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js @@ -52,8 +52,14 @@ M.n++; // ++ operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; -var obj = { x: 1, y: null }; +var ANY2 = [ + "", + "" +]; +var obj = { + x: 1, + y: null +}; var A = (function () { function A() { } diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js index 6f76fba6d8c..3e1c47faedc 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -72,9 +72,16 @@ ANY2++; //// [incrementOperatorWithAnyOtherTypeInvalidOperations.js] // ++ operator on any type var ANY1; -var ANY2 = [1, 2]; +var ANY2 = [ + 1, + 2 +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.js b/tests/baselines/reference/incrementOperatorWithNumberType.js index 09365833e3b..e8312c5e5f2 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.js +++ b/tests/baselines/reference/incrementOperatorWithNumberType.js @@ -42,7 +42,10 @@ objA.a++, M.n++; //// [incrementOperatorWithNumberType.js] // ++ operator on number type var NUMBER; -var NUMBER1 = [1, 2]; +var NUMBER1 = [ + 1, + 2 +]; var A = (function () { function A() { } diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js index eb9cd949280..4629f10a964 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js @@ -49,12 +49,19 @@ foo()++; //// [incrementOperatorWithNumberTypeInvalidOperations.js] // ++ operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -67,11 +74,27 @@ var ResultIsNumber1 = ++NUMBER1; var ResultIsNumber2 = NUMBER1++; // number type literal var ResultIsNumber3 = ++1; -var ResultIsNumber4 = ++{ x: 1, y: 2 }; -var ResultIsNumber5 = ++{ x: 1, y: function (n) { return n; } }; +var ResultIsNumber4 = ++{ + x: 1, + y: 2 +}; +var ResultIsNumber5 = ++{ + x: 1, + y: function (n) { + return n; + } +}; var ResultIsNumber6 = 1++; -var ResultIsNumber7 = { x: 1, y: 2 }++; -var ResultIsNumber8 = { x: 1, y: function (n) { return n; } }++; +var ResultIsNumber7 = { + x: 1, + y: 2 +}++; +var ResultIsNumber8 = { + x: 1, + y: function (n) { + return n; + } +}++; // number type expressions var ResultIsNumber9 = ++foo(); var ResultIsNumber10 = ++A.foo(); diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js index 6a974443f7b..09549a71a0c 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js @@ -57,11 +57,15 @@ objA.a++, M.n++; //// [incrementOperatorWithUnsupportedBooleanType.js] // ++ operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return true; }; + A.foo = function () { + return true; + }; return A; })(); var M; @@ -74,11 +78,27 @@ var ResultIsNumber1 = ++BOOLEAN; var ResultIsNumber2 = BOOLEAN++; // boolean type literal var ResultIsNumber3 = ++true; -var ResultIsNumber4 = ++{ x: true, y: false }; -var ResultIsNumber5 = ++{ x: true, y: function (n) { return n; } }; +var ResultIsNumber4 = ++{ + x: true, + y: false +}; +var ResultIsNumber5 = ++{ + x: true, + y: function (n) { + return n; + } +}; var ResultIsNumber6 = true++; -var ResultIsNumber7 = { x: true, y: false }++; -var ResultIsNumber8 = { x: true, y: function (n) { return n; } }++; +var ResultIsNumber7 = { + x: true, + y: false +}++; +var ResultIsNumber8 = { + x: true, + y: function (n) { + return n; + } +}++; // boolean type expressions var ResultIsNumber9 = ++objA.a; var ResultIsNumber10 = ++M.n; diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js index 82bf03cd83a..5abb2cd8b79 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js @@ -68,12 +68,19 @@ objA.a++, M.n++; //// [incrementOperatorWithUnsupportedStringType.js] // ++ operator on string type var STRING; -var STRING1 = ["", ""]; -function foo() { return ""; } +var STRING1 = [ + "", + "" +]; +function foo() { + return ""; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -88,11 +95,27 @@ var ResultIsNumber3 = STRING++; var ResultIsNumber4 = STRING1++; // string type literal var ResultIsNumber5 = ++""; -var ResultIsNumber6 = ++{ x: "", y: "" }; -var ResultIsNumber7 = ++{ x: "", y: function (s) { return s; } }; +var ResultIsNumber6 = ++{ + x: "", + y: "" +}; +var ResultIsNumber7 = ++{ + x: "", + y: function (s) { + return s; + } +}; var ResultIsNumber8 = ""++; -var ResultIsNumber9 = { x: "", y: "" }++; -var ResultIsNumber10 = { x: "", y: function (s) { return s; } }++; +var ResultIsNumber9 = { + x: "", + y: "" +}++; +var ResultIsNumber10 = { + x: "", + y: function (s) { + return s; + } +}++; // string type expressions var ResultIsNumber11 = ++objA.a; var ResultIsNumber12 = ++M.n; diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.js b/tests/baselines/reference/indexSignaturesInferentialTyping.js index 53636be716c..fc1525eda0f 100644 --- a/tests/baselines/reference/indexSignaturesInferentialTyping.js +++ b/tests/baselines/reference/indexSignaturesInferentialTyping.js @@ -9,9 +9,25 @@ var x4 = bar({ zero: 0, one: 1 }); // type should be number //// [indexSignaturesInferentialTyping.js] -function foo(items) { return undefined; } -function bar(items) { return undefined; } -var x1 = foo({ 0: 0, 1: 1 }); // type should be number -var x2 = foo({ zero: 0, one: 1 }); -var x3 = bar({ 0: 0, 1: 1 }); -var x4 = bar({ zero: 0, one: 1 }); // type should be number +function foo(items) { + return undefined; +} +function bar(items) { + return undefined; +} +var x1 = foo({ + 0: 0, + 1: 1 +}); // type should be number +var x2 = foo({ + zero: 0, + one: 1 +}); +var x3 = bar({ + 0: 0, + 1: 1 +}); +var x4 = bar({ + zero: 0, + one: 1 +}); // type should be number diff --git a/tests/baselines/reference/indexer.js b/tests/baselines/reference/indexer.js index 97e734a029f..12c28236d8d 100644 --- a/tests/baselines/reference/indexer.js +++ b/tests/baselines/reference/indexer.js @@ -11,5 +11,12 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } }; jq[0].id; //// [indexer.js] -var jq = { 0: { id: "a" }, 1: { id: "b" } }; +var jq = { + 0: { + id: "a" + }, + 1: { + id: "b" + } +}; jq[0].id; diff --git a/tests/baselines/reference/indexerA.js b/tests/baselines/reference/indexerA.js index 5216026f714..2a377c3436d 100644 --- a/tests/baselines/reference/indexerA.js +++ b/tests/baselines/reference/indexerA.js @@ -21,5 +21,12 @@ var JQuery = (function () { } return JQuery; })(); -var jq = { 0: { id: "a" }, 1: { id: "b" } }; +var jq = { + 0: { + id: "a" + }, + 1: { + id: "b" + } +}; jq[0].id; diff --git a/tests/baselines/reference/indexerWithTuple.js b/tests/baselines/reference/indexerWithTuple.js index 91d90792e6d..b73b5e80a87 100644 --- a/tests/baselines/reference/indexerWithTuple.js +++ b/tests/baselines/reference/indexerWithTuple.js @@ -33,10 +33,25 @@ var eleUnion25 = unionTuple2["0"]; // boolean var eleUnion26 = unionTuple2["1"]; // string | number //// [indexerWithTuple.js] -var strNumTuple = ["foo", 10]; -var numTupleTuple = [10, ["bar", 20]]; -var unionTuple1 = [10, "foo"]; -var unionTuple2 = [true, "foo"]; +var strNumTuple = [ + "foo", + 10 +]; +var numTupleTuple = [ + 10, + [ + "bar", + 20 + ] +]; +var unionTuple1 = [ + 10, + "foo" +]; +var unionTuple2 = [ + true, + "foo" +]; // no error var idx0 = 0; var idx1 = 1; diff --git a/tests/baselines/reference/inferSecondaryParameter.js b/tests/baselines/reference/inferSecondaryParameter.js index 24689aa9495..a02e10b5570 100644 --- a/tests/baselines/reference/inferSecondaryParameter.js +++ b/tests/baselines/reference/inferSecondaryParameter.js @@ -11,7 +11,10 @@ b.m("test", function (bug) { //// [inferSecondaryParameter.js] // type inference on 'bug' should give 'any' -var b = { m: function (test, fn) { } }; +var b = { + m: function (test, fn) { + } +}; b.m("test", function (bug) { var a = bug; }); diff --git a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.js b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.js index 97fefc0571c..194d9198d23 100644 --- a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.js +++ b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.js @@ -30,8 +30,15 @@ function h(nonarray) { args[_i - 1] = arguments[_i]; } } -function i(array, opt) { } -var a = [1, 2, 3, 4, 5]; +function i(array, opt) { +} +var a = [ + 1, + 2, + 3, + 4, + 5 +]; f(a); // OK g(a); // OK h(a); // OK diff --git a/tests/baselines/reference/inferenceFromParameterlessLambda.js b/tests/baselines/reference/inferenceFromParameterlessLambda.js index 40c18c9afe8..c1b970dee60 100644 --- a/tests/baselines/reference/inferenceFromParameterlessLambda.js +++ b/tests/baselines/reference/inferenceFromParameterlessLambda.js @@ -11,6 +11,11 @@ foo(n => n.length, () => 'hi'); //// [inferenceFromParameterlessLambda.js] -function foo(o, i) { } +function foo(o, i) { +} // Infer string from second argument because it isn't context sensitive -foo(function (n) { return n.length; }, function () { return 'hi'; }); +foo(function (n) { + return n.length; +}, function () { + return 'hi'; +}); diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType2.js b/tests/baselines/reference/inferentialTypingWithFunctionType2.js index a3215a19e25..758f0e27465 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionType2.js +++ b/tests/baselines/reference/inferentialTypingWithFunctionType2.js @@ -8,4 +8,8 @@ var x = [1, 2, 3].map(identity)[0]; function identity(a) { return a; } -var x = [1, 2, 3].map(identity)[0]; +var x = [ + 1, + 2, + 3 +].map(identity)[0]; diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.js b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.js index aeb9a840773..b9b6f9e4bde 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.js +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.js @@ -5,4 +5,8 @@ declare function identity(y: V): V; var s = map("", () => { return { x: identity }; }); //// [inferentialTypingWithFunctionTypeNested.js] -var s = map("", function () { return { x: identity }; }); +var s = map("", function () { + return { + x: identity + }; +}); diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.js b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.js index 2f5eea63a8a..b41a9f6240e 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.js +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.js @@ -36,12 +36,16 @@ s = map("", ("", identity)); //// [inferentialTypingWithFunctionTypeSyntacticScenarios.js] var s; // dotted name -var dottedIdentity = { x: identity }; +var dottedIdentity = { + x: identity +}; s = map("", dottedIdentity.x); // index expression s = map("", dottedIdentity['x']); // function call -s = map("", (function () { return identity; })()); +s = map("", (function () { + return identity; +})()); var ic; s = map("", new ic()); // assignment diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js index 35f0928378c..0e413f9b171 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js @@ -7,5 +7,11 @@ var i = result[0].x; // number //// [inferentialTypingWithFunctionTypeZip.js] var pair; var zipWith; -var result = zipWith([1, 2], ['a', 'b'], pair); +var result = zipWith([ + 1, + 2 +], [ + 'a', + 'b' +], pair); var i = result[0].x; // number diff --git a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.js b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.js index 216604dd4d5..af2b936b2a8 100644 --- a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.js +++ b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.js @@ -10,5 +10,21 @@ f({ x: [1] }, { x: [null] }).x[0] = "" // was error TS2011: Cannot convert 'stri function f(x, y) { return x; } -f({ x: [null] }, { x: [1] }).x[0] = ""; // ok -f({ x: [1] }, { x: [null] }).x[0] = ""; // was error TS2011: Cannot convert 'string' to 'number'. +f({ + x: [ + null + ] +}, { + x: [ + 1 + ] +}).x[0] = ""; // ok +f({ + x: [ + 1 + ] +}, { + x: [ + null + ] +}).x[0] = ""; // was error TS2011: Cannot convert 'string' to 'number'. diff --git a/tests/baselines/reference/inheritance.js b/tests/baselines/reference/inheritance.js index f7a274b1990..1fca887a9b1 100644 --- a/tests/baselines/reference/inheritance.js +++ b/tests/baselines/reference/inheritance.js @@ -79,9 +79,13 @@ var ND = (function (_super) { })(N); var Good = (function () { function Good() { - this.f = function () { return 0; }; + this.f = function () { + return 0; + }; } - Good.prototype.g = function () { return 0; }; + Good.prototype.g = function () { + return 0; + }; return Good; })(); var Baad = (function (_super) { @@ -89,7 +93,11 @@ var Baad = (function (_super) { function Baad() { _super.apply(this, arguments); } - Baad.prototype.f = function () { return 0; }; - Baad.prototype.g = function (n) { return 0; }; + Baad.prototype.f = function () { + return 0; + }; + Baad.prototype.g = function (n) { + return 0; + }; return Baad; })(Good); diff --git a/tests/baselines/reference/inheritance1.js b/tests/baselines/reference/inheritance1.js index f00a46922bf..e6dbd35e0df 100644 --- a/tests/baselines/reference/inheritance1.js +++ b/tests/baselines/reference/inheritance1.js @@ -78,7 +78,8 @@ var Button = (function (_super) { function Button() { _super.apply(this, arguments); } - Button.prototype.select = function () { }; + Button.prototype.select = function () { + }; return Button; })(Control); var TextBox = (function (_super) { @@ -86,7 +87,8 @@ var TextBox = (function (_super) { function TextBox() { _super.apply(this, arguments); } - TextBox.prototype.select = function () { }; + TextBox.prototype.select = function () { + }; return TextBox; })(Control); var ImageBase = (function (_super) { @@ -106,13 +108,15 @@ var Image1 = (function (_super) { var Locations = (function () { function Locations() { } - Locations.prototype.select = function () { }; + Locations.prototype.select = function () { + }; return Locations; })(); var Locations1 = (function () { function Locations1() { } - Locations1.prototype.select = function () { }; + Locations1.prototype.select = function () { + }; return Locations1; })(); var sc; diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js index 4544df2dcf2..45293ec3021 100644 --- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js +++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js @@ -20,7 +20,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.myMethod = function () { }; + A.prototype.myMethod = function () { + }; return A; })(); var B = (function (_super) { @@ -35,6 +36,7 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.myMethod = function () { }; + C.prototype.myMethod = function () { + }; return C; })(B); diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js index df6e5943173..339511df6ba 100644 --- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js +++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js @@ -20,7 +20,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.myMethod = function () { }; + A.prototype.myMethod = function () { + }; return A; })(); var B = (function (_super) { @@ -35,6 +36,7 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.myMethod = function () { }; + C.prototype.myMethod = function () { + }; return C; })(B); diff --git a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js index 682a8ab4402..f69a4962db6 100644 --- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js +++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js @@ -20,7 +20,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.myMethod = function () { }; + A.prototype.myMethod = function () { + }; return A; })(); var B = (function (_super) { @@ -35,6 +36,7 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.myMethod = function () { }; + C.prototype.myMethod = function () { + }; return C; })(B); diff --git a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.js b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.js index 85801ca704f..49fd1e40582 100644 --- a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.js +++ b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.js @@ -9,6 +9,11 @@ fn(function (a, b) { return true; }) //// [inheritedFunctionAssignmentCompatibility.js] -function fn(cb) { } -fn(function (a, b) { return true; }); -fn(function (a, b) { return true; }); +function fn(cb) { +} +fn(function (a, b) { + return true; +}); +fn(function (a, b) { + return true; +}); diff --git a/tests/baselines/reference/innerBoundLambdaEmit.js b/tests/baselines/reference/innerBoundLambdaEmit.js index c09cc8e5a66..2921cad55d0 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.js +++ b/tests/baselines/reference/innerBoundLambdaEmit.js @@ -18,5 +18,6 @@ var M; return Foo; })(); M.Foo = Foo; - var bar = function () { }; + var bar = function () { + }; })(M || (M = {})); diff --git a/tests/baselines/reference/innerFunc.js b/tests/baselines/reference/innerFunc.js index c790c09e271..1676d0789d1 100644 --- a/tests/baselines/reference/innerFunc.js +++ b/tests/baselines/reference/innerFunc.js @@ -14,13 +14,17 @@ module M { //// [innerFunc.js] function salt() { - function pepper() { return 5; } + function pepper() { + return 5; + } return pepper(); } var M; (function (M) { function tungsten() { - function oxygen() { return 6; } + function oxygen() { + return 6; + } ; return oxygen(); } diff --git a/tests/baselines/reference/innerModExport1.js b/tests/baselines/reference/innerModExport1.js index cbeced37046..d61e79f2396 100644 --- a/tests/baselines/reference/innerModExport1.js +++ b/tests/baselines/reference/innerModExport1.js @@ -28,12 +28,18 @@ var Outer; { var non_export_var = 0; Outer.export_var = 1; - function NonExportFunc() { return 0; } - function ExportFunc() { return 0; } + function NonExportFunc() { + return 0; + } + function ExportFunc() { + return 0; + } Outer.ExportFunc = ExportFunc; } Outer.outer_var_export = 0; - function outerFuncExport() { return 0; } + function outerFuncExport() { + return 0; + } Outer.outerFuncExport = outerFuncExport; })(Outer || (Outer = {})); Outer.ExportFunc(); diff --git a/tests/baselines/reference/innerModExport2.js b/tests/baselines/reference/innerModExport2.js index a1526daf6f3..26399879e6d 100644 --- a/tests/baselines/reference/innerModExport2.js +++ b/tests/baselines/reference/innerModExport2.js @@ -29,13 +29,19 @@ var Outer; { var non_export_var = 0; Outer.export_var = 1; - function NonExportFunc() { return 0; } - function ExportFunc() { return 0; } + function NonExportFunc() { + return 0; + } + function ExportFunc() { + return 0; + } Outer.ExportFunc = ExportFunc; } var export_var; Outer.outer_var_export = 0; - function outerFuncExport() { return 0; } + function outerFuncExport() { + return 0; + } Outer.outerFuncExport = outerFuncExport; })(Outer || (Outer = {})); Outer.NonExportFunc(); diff --git a/tests/baselines/reference/innerOverloads.js b/tests/baselines/reference/innerOverloads.js index 19e3fa78909..184b644406e 100644 --- a/tests/baselines/reference/innerOverloads.js +++ b/tests/baselines/reference/innerOverloads.js @@ -14,7 +14,9 @@ var x = outer(); // should work //// [innerOverloads.js] function outer() { - function inner(a) { return a; } + function inner(a) { + return a; + } return inner(0); } var x = outer(); // should work diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.js b/tests/baselines/reference/instanceAndStaticDeclarations1.js index 7dbd6dcbe7d..1396e2bcfa8 100644 --- a/tests/baselines/reference/instanceAndStaticDeclarations1.js +++ b/tests/baselines/reference/instanceAndStaticDeclarations1.js @@ -24,7 +24,9 @@ var Point = (function () { var dy = this.y - p.y; return Math.sqrt(dx * dx + dy * dy); }; - Point.distance = function (p1, p2) { return p1.distance(p2); }; + 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..28f7296f0ea 100644 --- a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js +++ b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js @@ -17,12 +17,18 @@ var C = (function () { function C() { } C.prototype.foo = function () { - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; }; C.prototype.bar = function (x) { - C.prototype.bar = function () { }; // error - C.prototype.bar = function (x) { return x; }; // ok - C.prototype.bar = function (x) { return 1; }; // ok + C.prototype.bar = function () { + }; // error + C.prototype.bar = function (x) { + return x; + }; // ok + C.prototype.bar = function (x) { + return 1; + }; // ok return 1; }; return C; diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js index 7ab3b4a0aa3..eca12f7b1ae 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js @@ -60,11 +60,14 @@ var NonGeneric; get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; return C; })(); var D = (function (_super) { @@ -92,11 +95,14 @@ var Generic; get: function () { return null; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; return C; })(); var D = (function (_super) { diff --git a/tests/baselines/reference/instancePropertyInClassType.js b/tests/baselines/reference/instancePropertyInClassType.js index 863f18de323..b2df44db6f0 100644 --- a/tests/baselines/reference/instancePropertyInClassType.js +++ b/tests/baselines/reference/instancePropertyInClassType.js @@ -50,11 +50,14 @@ var NonGeneric; get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; return C; })(); var c = new C(1, 2); @@ -75,11 +78,14 @@ var Generic; get: function () { return null; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; return C; })(); var c = new C(1, ''); diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js index 9f83181a146..8309b7e7c01 100644 --- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js @@ -50,7 +50,8 @@ var rc1 = '' instanceof {}; var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); var x; diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js index 3d7d2a7d017..15e4239eb0a 100644 --- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js +++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js @@ -27,7 +27,8 @@ var C = (function () { return C; })(); var c = new C(); -function Foo() { } +function Foo() { +} var r = new Foo(); var f; var r2 = new f(); diff --git a/tests/baselines/reference/instantiatedModule.js b/tests/baselines/reference/instantiatedModule.js index 21411e09ff1..7993628f898 100644 --- a/tests/baselines/reference/instantiatedModule.js +++ b/tests/baselines/reference/instantiatedModule.js @@ -82,7 +82,10 @@ var M2; function Point() { } Point.Origin = function () { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; }; return Point; })(); diff --git a/tests/baselines/reference/intTypeCheck.js b/tests/baselines/reference/intTypeCheck.js index fbbe1bb5d03..41f648610b5 100644 --- a/tests/baselines/reference/intTypeCheck.js +++ b/tests/baselines/reference/intTypeCheck.js @@ -209,7 +209,8 @@ var obj87: i8 = new {}; var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var anyVar; @@ -219,15 +220,22 @@ var anyVar; var obj0; var obj1 = { p: null, - p3: function () { return 0; }, - p6: function (pa1) { return 0; }, - p7: function (pa1, pa2) { return 0; } + p3: function () { + return 0; + }, + p6: function (pa1) { + return 0; + }, + p7: function (pa1, pa2) { + return 0; + } }; var obj2 = new Object(); var obj3 = new obj0; var obj4 = new Base; var obj5 = null; -var obj6 = function () { }; +var obj6 = function () { +}; //var obj7: i1 = function foo() { }; var obj8 = anyVar; var obj9 = new < i1 > anyVar; @@ -241,7 +249,9 @@ var obj13 = new Object(); var obj14 = new obj11; var obj15 = new Base; var obj16 = null; -var obj17 = function () { return 0; }; +var obj17 = function () { + return 0; +}; //var obj18: i2 = function foo() { }; var obj19 = anyVar; var obj20 = new < i2 > anyVar; @@ -255,7 +265,8 @@ var obj24 = new Object(); var obj25 = new obj22; var obj26 = new Base; var obj27 = null; -var obj28 = function () { }; +var obj28 = function () { +}; //var obj29: i3 = function foo() { }; var obj30 = anyVar; var obj31 = new < i3 > anyVar; @@ -269,7 +280,8 @@ var obj35 = new Object(); var obj36 = new obj33; var obj37 = new Base; var obj38 = null; -var obj39 = function () { }; +var obj39 = function () { +}; //var obj40: i4 = function foo() { }; var obj41 = anyVar; var obj42 = new < i4 > anyVar; @@ -283,7 +295,8 @@ var obj46 = new Object(); var obj47 = new obj44; var obj48 = new Base; var obj49 = null; -var obj50 = function () { }; +var obj50 = function () { +}; //var obj51: i5 = function foo() { }; var obj52 = anyVar; var obj53 = new < i5 > anyVar; @@ -297,7 +310,8 @@ var obj57 = new Object(); var obj58 = new obj55; var obj59 = new Base; var obj60 = null; -var obj61 = function () { }; +var obj61 = function () { +}; //var obj62: i6 = function foo() { }; var obj63 = anyVar; var obj64 = new < i6 > anyVar; @@ -311,7 +325,8 @@ var obj68 = new Object(); var obj69 = new obj66; var obj70 = new Base; var obj71 = null; -var obj72 = function () { }; +var obj72 = function () { +}; //var obj73: i7 = function foo() { }; var obj74 = anyVar; var obj75 = new < i7 > anyVar; @@ -325,7 +340,8 @@ var obj79 = new Object(); var obj80 = new obj77; var obj81 = new Base; var obj82 = null; -var obj83 = function () { }; +var obj83 = function () { +}; //var obj84: i8 = function foo() { }; var obj85 = anyVar; var obj86 = new < i8 > anyVar; diff --git a/tests/baselines/reference/interface0.js b/tests/baselines/reference/interface0.js index aecdb91e8a3..63feadfc4c7 100644 --- a/tests/baselines/reference/interface0.js +++ b/tests/baselines/reference/interface0.js @@ -7,4 +7,6 @@ var y: Generic = { x: 3 }; //// [interface0.js] -var y = { x: 3 }; +var y = { + x: 3 +}; diff --git a/tests/baselines/reference/interfaceAssignmentCompat.js b/tests/baselines/reference/interfaceAssignmentCompat.js index 1037df1769e..dbad8eabd78 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.js +++ b/tests/baselines/reference/interfaceAssignmentCompat.js @@ -72,9 +72,15 @@ var M; function test() { var x = []; var result = ""; - x[0] = { color: 2 /* Brown */ }; - x[1] = { color: 1 /* Blue */ }; - x[2] = { color: 0 /* Green */ }; + x[0] = { + color: 2 /* Brown */ + }; + x[1] = { + color: 1 /* Blue */ + }; + x[2] = { + color: 0 /* Green */ + }; x = x.sort(CompareYeux); // parameter mismatch // type of z inferred from specialized array type var z = x.sort(CompareEyes); // ok diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index 2dbdb958d6b..996b8fc98d3 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -27,11 +27,15 @@ var Bug = (function () { } Bug.prototype.ok = function () { this.values = {}; - this.values['comments'] = { italic: true }; + this.values['comments'] = { + italic: true + }; }; Bug.prototype.shouldBeOK = function () { this.values = { - comments: { italic: true } + comments: { + italic: true + } }; }; return Bug; diff --git a/tests/baselines/reference/interfaceDeclaration2.js b/tests/baselines/reference/interfaceDeclaration2.js index 30f9df0fac7..0bd59c065e0 100644 --- a/tests/baselines/reference/interfaceDeclaration2.js +++ b/tests/baselines/reference/interfaceDeclaration2.js @@ -19,5 +19,6 @@ var I2 = (function () { } return I2; })(); -function I3() { } +function I3() { +} var I4; diff --git a/tests/baselines/reference/interfaceDeclaration4.js b/tests/baselines/reference/interfaceDeclaration4.js index 728ef7156e9..576479c2beb 100644 --- a/tests/baselines/reference/interfaceDeclaration4.js +++ b/tests/baselines/reference/interfaceDeclaration4.js @@ -69,4 +69,5 @@ var C3 = (function () { return C3; })(); I1; -{ } +{ +} diff --git a/tests/baselines/reference/interfaceExtendingClass.js b/tests/baselines/reference/interfaceExtendingClass.js index f1232d78245..39db7460915 100644 --- a/tests/baselines/reference/interfaceExtendingClass.js +++ b/tests/baselines/reference/interfaceExtendingClass.js @@ -23,7 +23,8 @@ i = f; var Foo = (function () { function Foo() { } - Foo.prototype.y = function () { }; + Foo.prototype.y = function () { + }; Object.defineProperty(Foo.prototype, "Z", { get: function () { return 1; diff --git a/tests/baselines/reference/interfaceExtendingClass2.js b/tests/baselines/reference/interfaceExtendingClass2.js index 6e6605e2459..b0958717aa8 100644 --- a/tests/baselines/reference/interfaceExtendingClass2.js +++ b/tests/baselines/reference/interfaceExtendingClass2.js @@ -19,7 +19,8 @@ interface I2 extends Foo { // error var Foo = (function () { function Foo() { } - Foo.prototype.y = function () { }; + Foo.prototype.y = function () { + }; Object.defineProperty(Foo.prototype, "Z", { get: function () { return 1; diff --git a/tests/baselines/reference/interfaceExtendsClass1.js b/tests/baselines/reference/interfaceExtendsClass1.js index d376f2dca98..5903726c05d 100644 --- a/tests/baselines/reference/interfaceExtendsClass1.js +++ b/tests/baselines/reference/interfaceExtendsClass1.js @@ -35,7 +35,8 @@ var Button = (function (_super) { function Button() { _super.apply(this, arguments); } - Button.prototype.select = function () { }; + Button.prototype.select = function () { + }; return Button; })(Control); var TextBox = (function (_super) { @@ -43,7 +44,8 @@ var TextBox = (function (_super) { function TextBox() { _super.apply(this, arguments); } - TextBox.prototype.select = function () { }; + TextBox.prototype.select = function () { + }; return TextBox; })(Control); var Image = (function (_super) { @@ -56,6 +58,7 @@ var Image = (function (_super) { var Location = (function () { function Location() { } - Location.prototype.select = function () { }; + Location.prototype.select = function () { + }; return Location; })(); diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js index 521a71199ad..4cf0281ac7a 100644 --- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js +++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js @@ -38,7 +38,9 @@ var C = (function () { function C() { this.x = 1; } - C.prototype.foo = function (x) { return x; }; + C.prototype.foo = function (x) { + return x; + }; return C; })(); var D = (function (_super) { @@ -46,9 +48,14 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.prototype.foo = function (x) { return x; }; - D.prototype.other = function (x) { return x; }; - D.prototype.bar = function () { }; + D.prototype.foo = function (x) { + return x; + }; + D.prototype.other = function (x) { + return x; + }; + D.prototype.bar = function () { + }; return D; })(C); var c; diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js index c177f2e7a90..5805302d7d7 100644 --- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js +++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js @@ -34,7 +34,9 @@ var C = (function () { function C() { this.x = 1; } - C.prototype.foo = function (x) { return x; }; + C.prototype.foo = function (x) { + return x; + }; return C; })(); var D = (function (_super) { @@ -44,9 +46,14 @@ var D = (function (_super) { this.x = 2; this.y = 3; } - D.prototype.foo = function (x) { return x; }; - D.prototype.other = function (x) { return x; }; - D.prototype.bar = function () { }; + D.prototype.foo = function (x) { + return x; + }; + D.prototype.other = function (x) { + return x; + }; + D.prototype.bar = function () { + }; return D; })(C); var D2 = (function (_super) { @@ -55,8 +62,13 @@ var D2 = (function (_super) { _super.apply(this, arguments); this.x = ""; } - D2.prototype.foo = function (x) { return x; }; - D2.prototype.other = function (x) { return x; }; - D2.prototype.bar = function () { }; + D2.prototype.foo = function (x) { + return x; + }; + D2.prototype.other = function (x) { + return x; + }; + D2.prototype.bar = function () { + }; return D2; })(C); diff --git a/tests/baselines/reference/interfaceImplementation1.js b/tests/baselines/reference/interfaceImplementation1.js index 8f02596682d..ce82a24f63d 100644 --- a/tests/baselines/reference/interfaceImplementation1.js +++ b/tests/baselines/reference/interfaceImplementation1.js @@ -50,7 +50,8 @@ c["foo"]; var C1 = (function () { function C1() { } - C1.prototype.iFn = function (n, s) { }; + C1.prototype.iFn = function (n, s) { + }; return C1; })(); var C2 = (function () { diff --git a/tests/baselines/reference/interfaceImplementation3.js b/tests/baselines/reference/interfaceImplementation3.js index da85de545cd..626c92e83d1 100644 --- a/tests/baselines/reference/interfaceImplementation3.js +++ b/tests/baselines/reference/interfaceImplementation3.js @@ -19,6 +19,7 @@ class C4 implements I1 { var C4 = (function () { function C4() { } - C4.prototype.iFn = function () { }; + C4.prototype.iFn = function () { + }; return C4; })(); diff --git a/tests/baselines/reference/interfaceImplementation4.js b/tests/baselines/reference/interfaceImplementation4.js index 4a093381b5d..94565d1b22f 100644 --- a/tests/baselines/reference/interfaceImplementation4.js +++ b/tests/baselines/reference/interfaceImplementation4.js @@ -17,6 +17,7 @@ class C5 implements I1 { var C5 = (function () { function C5() { } - C5.prototype.iFn = function () { }; + C5.prototype.iFn = function () { + }; return C5; })(); diff --git a/tests/baselines/reference/interfaceImplementation5.js b/tests/baselines/reference/interfaceImplementation5.js index c710eda84f5..667c5f045ec 100644 --- a/tests/baselines/reference/interfaceImplementation5.js +++ b/tests/baselines/reference/interfaceImplementation5.js @@ -36,7 +36,9 @@ var C1 = (function () { function C1() { } Object.defineProperty(C1.prototype, "getset1", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); @@ -46,7 +48,8 @@ var C2 = (function () { function C2() { } Object.defineProperty(C2.prototype, "getset1", { - set: function (baz) { }, + set: function (baz) { + }, enumerable: true, configurable: true }); @@ -56,8 +59,11 @@ var C3 = (function () { function C3() { } Object.defineProperty(C3.prototype, "getset1", { - get: function () { return 1; }, - set: function (baz) { }, + get: function () { + return 1; + }, + set: function (baz) { + }, enumerable: true, configurable: true }); @@ -67,7 +73,10 @@ var C4 = (function () { function C4() { } Object.defineProperty(C4.prototype, "getset1", { - get: function () { var x; return x; }, + get: function () { + var x; + return x; + }, enumerable: true, configurable: true }); @@ -77,7 +86,8 @@ var C5 = (function () { function C5() { } Object.defineProperty(C5.prototype, "getset1", { - set: function (baz) { }, + set: function (baz) { + }, enumerable: true, configurable: true }); @@ -87,8 +97,12 @@ var C6 = (function () { function C6() { } Object.defineProperty(C6.prototype, "getset1", { - get: function () { var x; return x; }, - set: function (baz) { }, + get: function () { + var x; + return x; + }, + set: function (baz) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index 4feb6804db3..c9bd9113e7e 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -44,7 +44,9 @@ define(["require", "exports"], function (require, exports) { })(); var Test = (function () { function Test() { - this.pt = { item: 1 }; + this.pt = { + item: 1 + }; } return Test; })(); diff --git a/tests/baselines/reference/interfaceImplementation7.js b/tests/baselines/reference/interfaceImplementation7.js index 2813d7ee0fe..6345fe93a33 100644 --- a/tests/baselines/reference/interfaceImplementation7.js +++ b/tests/baselines/reference/interfaceImplementation7.js @@ -14,6 +14,8 @@ class C1 implements i4 { var C1 = (function () { function C1() { } - C1.prototype.name = function () { return ""; }; + C1.prototype.name = function () { + return ""; + }; return C1; })(); diff --git a/tests/baselines/reference/interfaceNaming1.js b/tests/baselines/reference/interfaceNaming1.js index 2abd2106b2f..e16f186379b 100644 --- a/tests/baselines/reference/interfaceNaming1.js +++ b/tests/baselines/reference/interfaceNaming1.js @@ -6,5 +6,6 @@ interface & { } //// [interfaceNaming1.js] interface; -{ } +{ +} interface & {}; diff --git a/tests/baselines/reference/interfaceSubtyping.js b/tests/baselines/reference/interfaceSubtyping.js index 43004985782..840ce79d869 100644 --- a/tests/baselines/reference/interfaceSubtyping.js +++ b/tests/baselines/reference/interfaceSubtyping.js @@ -14,6 +14,8 @@ var Camera = (function () { function Camera(str) { this.str = str; } - Camera.prototype.foo = function () { return "s"; }; + Camera.prototype.foo = function () { + return "s"; + }; return Camera; })(); diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js index a7605dd52bc..4f8d8919563 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js @@ -48,7 +48,8 @@ var C = (function () { } return C; })(); -function f1() { } +function f1() { +} var M; (function (M) { M.y = 1; @@ -63,10 +64,16 @@ var a = { c: true, d: {}, e: null, - f: [1], + f: [ + 1 + ], g: {}, - h: function (x) { return 1; }, - i: function (x) { return x; }, + h: function (x) { + return 1; + }, + i: function (x) { + return x; + }, j: null, k: new C(), l: f1, diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js index d53ec04c183..01907f410e3 100644 --- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js +++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js @@ -19,12 +19,14 @@ interface Foo2 extends Base2 { // error var Base = (function () { function Base() { } - Base.prototype.x = function () { }; + Base.prototype.x = function () { + }; return Base; })(); var Base2 = (function () { function Base2() { } - Base2.prototype.x = function () { }; + Base2.prototype.x = function () { + }; return Base2; })(); diff --git a/tests/baselines/reference/invalidDoWhileBreakStatements.js b/tests/baselines/reference/invalidDoWhileBreakStatements.js index 807d58a8fea..e6617ef98cd 100644 --- a/tests/baselines/reference/invalidDoWhileBreakStatements.js +++ b/tests/baselines/reference/invalidDoWhileBreakStatements.js @@ -60,7 +60,8 @@ THREE: do { // break forward do { break FIVE; - FIVE: do { } while (true); + FIVE: do { + } while (true); } while (true); // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidDoWhileContinueStatements.js b/tests/baselines/reference/invalidDoWhileContinueStatements.js index 21a10a3451b..d32ccfe0074 100644 --- a/tests/baselines/reference/invalidDoWhileContinueStatements.js +++ b/tests/baselines/reference/invalidDoWhileContinueStatements.js @@ -60,7 +60,8 @@ THREE: do { // continue forward do { continue FIVE; - FIVE: do { } while (true); + FIVE: do { + } while (true); } while (true); // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidForBreakStatements.js b/tests/baselines/reference/invalidForBreakStatements.js index 5e3430ecb41..abcd078ff2d 100644 --- a/tests/baselines/reference/invalidForBreakStatements.js +++ b/tests/baselines/reference/invalidForBreakStatements.js @@ -58,7 +58,8 @@ THREE: for (;;) { // break forward for (;;) { break FIVE; - FIVE: for (;;) { } + FIVE: for (;;) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidForContinueStatements.js b/tests/baselines/reference/invalidForContinueStatements.js index 2db1ce69ede..af0eba2a59a 100644 --- a/tests/baselines/reference/invalidForContinueStatements.js +++ b/tests/baselines/reference/invalidForContinueStatements.js @@ -58,7 +58,8 @@ THREE: for (;;) { // continue forward for (;;) { continue FIVE; - FIVE: for (;;) { } + FIVE: for (;;) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidForInBreakStatements.js b/tests/baselines/reference/invalidForInBreakStatements.js index 1784b9a57a6..bf383613c3b 100644 --- a/tests/baselines/reference/invalidForInBreakStatements.js +++ b/tests/baselines/reference/invalidForInBreakStatements.js @@ -59,7 +59,8 @@ THREE: for (var x in {}) { // break forward for (var x in {}) { break FIVE; - FIVE: for (var x in {}) { } + FIVE: for (var x in {}) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidForInContinueStatements.js b/tests/baselines/reference/invalidForInContinueStatements.js index 94020d00f2b..d40dbd80ca0 100644 --- a/tests/baselines/reference/invalidForInContinueStatements.js +++ b/tests/baselines/reference/invalidForInContinueStatements.js @@ -59,7 +59,8 @@ THREE: for (var x in {}) { // continue forward for (var x in {}) { continue FIVE; - FIVE: for (var x in {}) { } + FIVE: for (var x in {}) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.js b/tests/baselines/reference/invalidModuleWithVarStatements.js index caa6b24f00f..4014709d361 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.js +++ b/tests/baselines/reference/invalidModuleWithVarStatements.js @@ -35,7 +35,8 @@ var Y; })(Y || (Y = {})); var Y2; (function (Y2) { - function fn(x) { } + function fn(x) { + } })(Y2 || (Y2 = {})); var Y4; (function (Y4) { @@ -43,7 +44,8 @@ var Y4; })(Y4 || (Y4 = {})); var YY; (function (YY) { - function fn(x) { } + function fn(x) { + } })(YY || (YY = {})); var YY2; (function (YY2) { @@ -51,5 +53,6 @@ var YY2; })(YY2 || (YY2 = {})); var YY3; (function (YY3) { - function fn(x) { } + function fn(x) { + } })(YY3 || (YY3 = {})); diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js index 824bee92227..62ea392be28 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js @@ -77,7 +77,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -86,7 +88,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); // all of these are errors @@ -100,11 +104,24 @@ var b; var b = new C(); var b = new C2(); var f = F; -var f = function (x) { return ''; }; +var f = function (x) { + return ''; +}; var arr; -var arr = [1, 2, 3, 4]; -var arr = [new C(), new C2(), new D()]; -var arr2 = [new D()]; +var arr = [ + 1, + 2, + 3, + 4 +]; +var arr = [ + new C(), + new C2(), + new D() +]; +var arr2 = [ + new D() +]; var arr2 = new Array(); var m; var m = M.A; diff --git a/tests/baselines/reference/invalidReturnStatements.js b/tests/baselines/reference/invalidReturnStatements.js index d637158780a..df6f6da6753 100644 --- a/tests/baselines/reference/invalidReturnStatements.js +++ b/tests/baselines/reference/invalidReturnStatements.js @@ -28,15 +28,21 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; // all the following should be error -function fn1() { } -function fn2() { } -function fn3() { } -function fn4() { } -function fn7() { } // should be valid: any includes void +function fn1() { +} +function fn2() { +} +function fn3() { +} +function fn4() { +} +function fn7() { +} // should be valid: any includes void var C = (function () { function C() { } - C.prototype.dispose = function () { }; + C.prototype.dispose = function () { + }; return C; })(); var D = (function (_super) { @@ -46,5 +52,11 @@ var D = (function (_super) { } return D; })(C); -function fn10() { return { id: 12 }; } -function fn11() { return new 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..5521af05c83 100644 --- a/tests/baselines/reference/invalidStaticField.js +++ b/tests/baselines/reference/invalidStaticField.js @@ -6,7 +6,9 @@ class B { static NOT_NULL = new B(); } var A = (function () { function A() { } - A.prototype.foo = function () { return B.NULL; }; + A.prototype.foo = function () { + return B.NULL; + }; return A; })(); var B = (function () { diff --git a/tests/baselines/reference/invalidTryStatements.js b/tests/baselines/reference/invalidTryStatements.js index 343ad6e0584..8afadf41b4d 100644 --- a/tests/baselines/reference/invalidTryStatements.js +++ b/tests/baselines/reference/invalidTryStatements.js @@ -21,10 +21,16 @@ function fn() { var x; // ensure x is 'Any' } // no type annotation allowed - try { } - catch (z) { } - try { } - catch (a) { } - try { } - catch (y) { } + try { + } + catch (z) { + } + try { + } + catch (a) { + } + try { + } + catch (y) { + } } diff --git a/tests/baselines/reference/invalidTryStatements2.js b/tests/baselines/reference/invalidTryStatements2.js index 1b2976dc4e7..d2ef92ac831 100644 --- a/tests/baselines/reference/invalidTryStatements2.js +++ b/tests/baselines/reference/invalidTryStatements2.js @@ -36,16 +36,20 @@ function fn() { } try { } - catch (x) { } // error missing try - finally { } // potential error; can be absorbed by the 'catch' + catch (x) { + } // error missing try + finally { + } // potential error; can be absorbed by the 'catch' } function fn2() { try { } - finally { } // error missing try + finally { + } // error missing try try { } // error missing try - catch (x) { } // error missing try + catch (x) { + } // error missing try // no error try { } diff --git a/tests/baselines/reference/invalidTypeOfTarget.js b/tests/baselines/reference/invalidTypeOfTarget.js index 52b39f3c76a..88128d15e85 100644 --- a/tests/baselines/reference/invalidTypeOfTarget.js +++ b/tests/baselines/reference/invalidTypeOfTarget.js @@ -15,5 +15,6 @@ var x3 = 1; var x4 = ''; var x5; var x6 = null; -var x7 = function f() { }; +var x7 = function f() { +}; var x8 = /123/; diff --git a/tests/baselines/reference/invalidUndefinedAssignments.js b/tests/baselines/reference/invalidUndefinedAssignments.js index 1feba71212d..0b37316e085 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.js +++ b/tests/baselines/reference/invalidUndefinedAssignments.js @@ -44,6 +44,7 @@ var M; M.x = 1; })(M || (M = {})); M = x; -function i(a) { } +function i(a) { +} // BUG 767030 i = x; diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js index 819bf114cec..b4751cf25d8 100644 --- a/tests/baselines/reference/invalidUndefinedValues.js +++ b/tests/baselines/reference/invalidUndefinedValues.js @@ -54,7 +54,10 @@ var M; M.x = 1; })(M || (M = {})); x = M; -x = { f: function () { } }; +x = { + f: function () { + } +}; function f(a) { x = a; } diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js index 40b83d329c1..c8c395b0e4f 100644 --- a/tests/baselines/reference/invalidVoidAssignments.js +++ b/tests/baselines/reference/invalidVoidAssignments.js @@ -59,4 +59,7 @@ var E; })(E || (E = {})); x = E; x = 0 /* A */; -x = { f: function () { } }; +x = { + f: function () { + } +}; diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js index 658ebc7e1ca..6740eb3fc1b 100644 --- a/tests/baselines/reference/invalidVoidValues.js +++ b/tests/baselines/reference/invalidVoidValues.js @@ -46,7 +46,10 @@ var a; x = a; var b; x = b; -x = { f: function () { } }; +x = { + f: function () { + } +}; var M; (function (M) { M.x = 1; diff --git a/tests/baselines/reference/invalidWhileBreakStatements.js b/tests/baselines/reference/invalidWhileBreakStatements.js index 7f10a08d65c..a8e261f036c 100644 --- a/tests/baselines/reference/invalidWhileBreakStatements.js +++ b/tests/baselines/reference/invalidWhileBreakStatements.js @@ -59,7 +59,8 @@ THREE: while (true) { // break forward while (true) { break FIVE; - FIVE: while (true) { } + FIVE: while (true) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/invalidWhileContinueStatements.js b/tests/baselines/reference/invalidWhileContinueStatements.js index b8234bf9604..544314bf68d 100644 --- a/tests/baselines/reference/invalidWhileContinueStatements.js +++ b/tests/baselines/reference/invalidWhileContinueStatements.js @@ -59,7 +59,8 @@ THREE: while (true) { // continue forward while (true) { continue FIVE; - FIVE: while (true) { } + FIVE: while (true) { + } } // label on non-loop statement NINE: var y = 12; diff --git a/tests/baselines/reference/ipromise4.js b/tests/baselines/reference/ipromise4.js index 98660aa5824..5b65e0818c2 100644 --- a/tests/baselines/reference/ipromise4.js +++ b/tests/baselines/reference/ipromise4.js @@ -18,5 +18,10 @@ p.then(function (x) { return "hello"; } ).then(function (x) { return x } ); // s //// [ipromise4.js] var p = null; -p.then(function (x) { }); // should not error -p.then(function (x) { return "hello"; }).then(function (x) { return x; }); // should not error +p.then(function (x) { +}); // should not error +p.then(function (x) { + return "hello"; +}).then(function (x) { + return x; +}); // should not error diff --git a/tests/baselines/reference/iterableContextualTyping1.js b/tests/baselines/reference/iterableContextualTyping1.js index 8621bbd8417..12943b46894 100644 --- a/tests/baselines/reference/iterableContextualTyping1.js +++ b/tests/baselines/reference/iterableContextualTyping1.js @@ -2,4 +2,6 @@ var iter: Iterable<(x: string) => number> = [s => s.length]; //// [iterableContextualTyping1.js] -var iter = [s => s.length]; +var iter = [ + s => s.length +]; diff --git a/tests/baselines/reference/keywordField.js b/tests/baselines/reference/keywordField.js index 581d5afa14a..b6b54de2067 100644 --- a/tests/baselines/reference/keywordField.js +++ b/tests/baselines/reference/keywordField.js @@ -13,6 +13,8 @@ var q = a["if"]; //// [keywordField.js] var obj = {}; obj.if = 1; -var a = { if: "test" }; +var a = { + if: "test" +}; var n = a.if; var q = a["if"]; diff --git a/tests/baselines/reference/lambdaExpression.js b/tests/baselines/reference/lambdaExpression.js index dc5c94c8b33..ece70d217f1 100644 --- a/tests/baselines/reference/lambdaExpression.js +++ b/tests/baselines/reference/lambdaExpression.js @@ -6,7 +6,11 @@ var x = 0; //// [lambdaExpression.js] -(function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration) +(function () { + return 0; +}); // Needs to be wrapped in parens to be a valid expression (not declaration) var y = 0; -(function () { return 0; }); +(function () { + return 0; +}); var x = 0; diff --git a/tests/baselines/reference/lambdaParamTypes.js b/tests/baselines/reference/lambdaParamTypes.js index 3bd212512e4..bc2858e9b49 100644 --- a/tests/baselines/reference/lambdaParamTypes.js +++ b/tests/baselines/reference/lambdaParamTypes.js @@ -24,16 +24,45 @@ thing.doSomething((x, y) => y.name.toExponential(0)); //// [lambdaParamTypes.js] -var thing = create([{ name: "bob", id: 24 }, { name: "doug", id: 32 }]); +var thing = create([ + { + name: "bob", + id: 24 + }, + { + name: "doug", + id: 32 + } +]); // Below should all be OK -thing.doSomething(function (x, y) { return x.name.charAt(0); }); // x.name should be string, so should be OK -thing.doSomething(function (x, y) { return x.id.toExponential(0); }); // x.id should be string, so should be OK -thing.doSomething(function (x, y) { return y.name.charAt(0); }); // x.name should be string, so should be OK -thing.doSomething(function (x, y) { return y.id.toExponential(0); }); // x.id should be string, so should be OK +thing.doSomething(function (x, y) { + return x.name.charAt(0); +}); // x.name should be string, so should be OK +thing.doSomething(function (x, y) { + return x.id.toExponential(0); +}); // x.id should be string, so should be OK +thing.doSomething(function (x, y) { + return y.name.charAt(0); +}); // x.name should be string, so should be OK +thing.doSomething(function (x, y) { + return y.id.toExponential(0); +}); // x.id should be string, so should be OK // Below should all be in error -thing.doSomething(function (x, y) { return x.foo; }); // no such property on x -thing.doSomething(function (x, y) { return y.foo; }); // no such property on y -thing.doSomething(function (x, y) { return x.id.charAt(0); }); // x.id should be number, no charAt member -thing.doSomething(function (x, y) { return x.name.toExponential(0); }); // x.name should be string, no toExponential member -thing.doSomething(function (x, y) { return y.id.charAt(0); }); -thing.doSomething(function (x, y) { return y.name.toExponential(0); }); +thing.doSomething(function (x, y) { + return x.foo; +}); // no such property on x +thing.doSomething(function (x, y) { + return y.foo; +}); // no such property on y +thing.doSomething(function (x, y) { + return x.id.charAt(0); +}); // x.id should be number, no charAt member +thing.doSomething(function (x, y) { + return x.name.toExponential(0); +}); // x.name should be string, no toExponential member +thing.doSomething(function (x, y) { + return y.id.charAt(0); +}); +thing.doSomething(function (x, y) { + return y.name.toExponential(0); +}); diff --git a/tests/baselines/reference/lambdaPropSelf.js b/tests/baselines/reference/lambdaPropSelf.js index 8d1b16e1431..5211dcc47ca 100644 --- a/tests/baselines/reference/lambdaPropSelf.js +++ b/tests/baselines/reference/lambdaPropSelf.js @@ -28,7 +28,9 @@ var Person = (function () { function Person(name, children) { var _this = this; this.name = name; - this.addChild = function () { return _this.children.push("New child"); }; + this.addChild = function () { + return _this.children.push("New child"); + }; this.children = ko.observableArray(children); } return Person; diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.js b/tests/baselines/reference/lastPropertyInLiteralWins.js index 999fe45841b..19ec4e21000 100644 --- a/tests/baselines/reference/lastPropertyInLiteralWins.js +++ b/tests/baselines/reference/lastPropertyInLiteralWins.js @@ -21,10 +21,14 @@ function test(thing) { thing.thunk("str"); } test({ - thunk: function (str) { }, - thunk: function (num) { } + thunk: function (str) { + }, + thunk: function (num) { + } }); test({ - thunk: function (num) { }, - thunk: function (str) { } + thunk: function (num) { + }, + thunk: function (str) { + } }); diff --git a/tests/baselines/reference/letAndVarRedeclaration.js b/tests/baselines/reference/letAndVarRedeclaration.js index fd4bfe67cac..35222660b64 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.js +++ b/tests/baselines/reference/letAndVarRedeclaration.js @@ -55,11 +55,13 @@ module M2 { //// [letAndVarRedeclaration.js] let e0; var e0; -function e0() { } +function e0() { +} function f0() { let x1; var x1; - function x1() { } + function x1() { + } } function f1() { let x; @@ -67,14 +69,16 @@ function f1() { var x; } { - function x() { } + function x() { + } } } var M0; (function (M0) { let x2; var x2; - function x2() { } + function x2() { + } })(M0 || (M0 = {})); var M1; (function (M1) { @@ -83,7 +87,8 @@ var M1; var x2; } { - function x2() { } + function x2() { + } } })(M1 || (M1 = {})); let x11; diff --git a/tests/baselines/reference/letDeclarations-access.js b/tests/baselines/reference/letDeclarations-access.js index 6ae289d220f..404c2876310 100644 --- a/tests/baselines/reference/letDeclarations-access.js +++ b/tests/baselines/reference/letDeclarations-access.js @@ -58,9 +58,11 @@ x--; ++x; --x; var a = x + 1; -function f(v) { } +function f(v) { +} f(x); -if (x) { } +if (x) { +} x; (x); -x; diff --git a/tests/baselines/reference/letDeclarations-es5.js b/tests/baselines/reference/letDeclarations-es5.js index 4ad43d52f76..5246e91edfb 100644 --- a/tests/baselines/reference/letDeclarations-es5.js +++ b/tests/baselines/reference/letDeclarations-es5.js @@ -20,5 +20,7 @@ var l3, l4, l5, l6; var l7 = false; var l8 = 23; var l9 = 0, l10 = "", l11 = null; -for (var _l11 in {}) { } -for (var l12 = 0; l12 < 9; l12++) { } +for (var _l11 in {}) { +} +for (var l12 = 0; l12 < 9; l12++) { +} diff --git a/tests/baselines/reference/letDeclarations.js b/tests/baselines/reference/letDeclarations.js index 8acb82204e3..bc186b732f5 100644 --- a/tests/baselines/reference/letDeclarations.js +++ b/tests/baselines/reference/letDeclarations.js @@ -20,8 +20,10 @@ let l3, l4, l5, l6; let l7 = false; let l8 = 23; let l9 = 0, l10 = "", l11 = null; -for (let l11 in {}) { } -for (let l12 = 0; l12 < 9; l12++) { } +for (let l11 in {}) { +} +for (let l12 = 0; l12 < 9; l12++) { +} //// [letDeclarations.d.ts] diff --git a/tests/baselines/reference/letInLetOrConstDeclarations.js b/tests/baselines/reference/letInLetOrConstDeclarations.js index ee23abc4e4f..6560ea84911 100644 --- a/tests/baselines/reference/letInLetOrConstDeclarations.js +++ b/tests/baselines/reference/letInLetOrConstDeclarations.js @@ -14,7 +14,8 @@ //// [letInLetOrConstDeclarations.js] { let let = 1; // should error - for (let let in []) { } // should error + for (let let in []) { + } // should error } { const let = 1; // should error diff --git a/tests/baselines/reference/lift.js b/tests/baselines/reference/lift.js index 33f8200530b..21c09aaeb53 100644 --- a/tests/baselines/reference/lift.js +++ b/tests/baselines/reference/lift.js @@ -37,7 +37,11 @@ var C = (function (_super) { var x = 10 + w; var ll = x * w; } - C.prototype.liftxyz = function () { return x + z + this.y; }; - C.prototype.liftxylocllz = function () { return x + z + this.y + this.ll; }; + C.prototype.liftxyz = function () { + return x + z + this.y; + }; + C.prototype.liftxylocllz = function () { + return x + z + this.y + this.ll; + }; return C; })(B); diff --git a/tests/baselines/reference/literals-negative.js b/tests/baselines/reference/literals-negative.js index 39fd4ea38a5..c0c9624e6f2 100644 --- a/tests/baselines/reference/literals-negative.js +++ b/tests/baselines/reference/literals-negative.js @@ -17,6 +17,8 @@ if(null === isVoid()) { } var n = (null); var s = (null); var b = (n); -function isVoid() { } +function isVoid() { +} // Expected error: Values of type null and void cannot be compared -if (null === isVoid()) { } +if (null === isVoid()) { +} diff --git a/tests/baselines/reference/localImportNameVsGlobalName.js b/tests/baselines/reference/localImportNameVsGlobalName.js index 6a4f1ceabc1..f27e7d648d1 100644 --- a/tests/baselines/reference/localImportNameVsGlobalName.js +++ b/tests/baselines/reference/localImportNameVsGlobalName.js @@ -27,7 +27,8 @@ var Keyboard; var App; (function (App) { var Key = Keyboard.Key; - function foo(key) { } + function foo(key) { + } App.foo = foo; foo(0 /* UP */); foo(1 /* DOWN */); diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js index 28366739233..891faacd4a4 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js @@ -63,9 +63,16 @@ var ResultIsBoolean21 = !!!(ANY + ANY1); // ! operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js index 107bd9a88ec..6f16fbfa2e4 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js @@ -41,11 +41,15 @@ var ResultIsBoolean = !!BOOLEAN; //// [logicalNotOperatorWithBooleanType.js] // ! operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -57,7 +61,10 @@ var objA = new A(); var ResultIsBoolean1 = !BOOLEAN; // boolean type literal var ResultIsBoolean2 = !true; -var ResultIsBoolean3 = !{ x: true, y: false }; +var ResultIsBoolean3 = !{ + x: true, + y: false +}; // boolean type expressions var ResultIsBoolean4 = !objA.a; var ResultIsBoolean5 = !M.n; diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js index 0d0601cad23..7beba45ba0b 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js @@ -48,12 +48,19 @@ var ResultIsBoolean13 = !!!(NUMBER + NUMBER); //// [logicalNotOperatorWithNumberType.js] // ! operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -66,8 +73,16 @@ var ResultIsBoolean1 = !NUMBER; var ResultIsBoolean2 = !NUMBER1; // number type literal var ResultIsBoolean3 = !1; -var ResultIsBoolean4 = !{ x: 1, y: 2 }; -var ResultIsBoolean5 = !{ x: 1, y: function (n) { return n; } }; +var ResultIsBoolean4 = !{ + x: 1, + y: 2 +}; +var ResultIsBoolean5 = !{ + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsBoolean6 = !objA.a; var ResultIsBoolean7 = !M.n; diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js index 7f75814d601..571857cb6b3 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.js +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js @@ -47,12 +47,19 @@ var ResultIsBoolean14 = !!!(STRING + STRING); //// [logicalNotOperatorWithStringType.js] // ! operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -65,8 +72,16 @@ var ResultIsBoolean1 = !STRING; var ResultIsBoolean2 = !STRING1; // string type literal var ResultIsBoolean3 = !""; -var ResultIsBoolean4 = !{ x: "", y: "" }; -var ResultIsBoolean5 = !{ x: "", y: function (s) { return s; } }; +var ResultIsBoolean4 = !{ + x: "", + y: "" +}; +var ResultIsBoolean5 = !{ + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsBoolean6 = !objA.a; var ResultIsBoolean7 = !M.n; diff --git a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.js b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.js index 64bdc871571..12e55119c35 100644 --- a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.js +++ b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.js @@ -11,4 +11,10 @@ var r: { a: string } = { a: '', b: 123 } || { a: '', b: true }; // If the || expression is contextually typed, the operands are contextually typed by the // same type and the result is of the best common type of the contextual type and the two // operand types. -var r = { a: '', b: 123 } || { a: '', b: true }; +var r = { + a: '', + b: 123 +} || { + a: '', + b: true +}; diff --git a/tests/baselines/reference/logicalOrExpressionIsNotContextuallyTyped.js b/tests/baselines/reference/logicalOrExpressionIsNotContextuallyTyped.js index 73e1c33a4e0..0731cb620a5 100644 --- a/tests/baselines/reference/logicalOrExpressionIsNotContextuallyTyped.js +++ b/tests/baselines/reference/logicalOrExpressionIsNotContextuallyTyped.js @@ -17,4 +17,6 @@ var r = a || ((a) => a.toLowerCase()); // operand types. var a; // bug 786110 -var r = a || (function (a) { return a.toLowerCase(); }); +var r = a || (function (a) { + return a.toLowerCase(); +}); diff --git a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.js b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.js index e0fca87efa8..b73a3144064 100644 --- a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.js +++ b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.js @@ -42,6 +42,8 @@ function fn2(t, u, v) { function fn3(t, u) { var r1 = t || u; var r2 = t || u; - var r3 = t || { a: '' }; + var r3 = t || { + a: '' + }; var r4 = t || u; } diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.js b/tests/baselines/reference/matchingOfObjectLiteralConstraints.js index 1d19359894d..13d9e0e05e8 100644 --- a/tests/baselines/reference/matchingOfObjectLiteralConstraints.js +++ b/tests/baselines/reference/matchingOfObjectLiteralConstraints.js @@ -5,5 +5,8 @@ foo2({ y: "foo" }, "foo"); //// [matchingOfObjectLiteralConstraints.js] -function foo2(x, z) { } -foo2({ y: "foo" }, "foo"); +function foo2(x, z) { +} +foo2({ + y: "foo" +}, "foo"); diff --git a/tests/baselines/reference/maxConstraints.js b/tests/baselines/reference/maxConstraints.js index b2098ccaf2b..4ea37d30501 100644 --- a/tests/baselines/reference/maxConstraints.js +++ b/tests/baselines/reference/maxConstraints.js @@ -9,5 +9,7 @@ var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y }; var maxResult = max2(1, 2); //// [maxConstraints.js] -var max2 = function (x, y) { return (x.compareTo(y) > 0) ? x : y; }; +var max2 = function (x, y) { + return (x.compareTo(y) > 0) ? x : y; +}; var maxResult = max2(1, 2); diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js index 584bafad6f6..dc347e95580 100644 --- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js @@ -53,19 +53,27 @@ var r4 = D.bar(''); // error var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; - C.prototype.bar = function (x, y) { }; - C.foo = function (x, y) { }; - C.bar = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; + C.prototype.bar = function (x, y) { + }; + C.foo = function (x, y) { + }; + C.bar = function (x, y) { + }; return C; })(); var D = (function () { function D() { } - D.prototype.foo = function (x, y) { }; - D.prototype.bar = function (x, y) { }; - D.foo = function (x, y) { }; - D.bar = function (x, y) { }; + D.prototype.foo = function (x, y) { + }; + D.prototype.bar = function (x, y) { + }; + D.foo = function (x, y) { + }; + D.bar = function (x, y) { + }; return D; })(); var c; diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js index efdd6efaffa..5eaf894f549 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js @@ -44,18 +44,26 @@ class D { var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; - C.prototype.bar = function (x, y) { }; - C.foo = function (x, y) { }; - C.bar = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; + C.prototype.bar = function (x, y) { + }; + C.foo = function (x, y) { + }; + C.bar = function (x, y) { + }; return C; })(); var D = (function () { function D() { } - D.prototype.foo = function (x, y) { }; - D.prototype.bar = function (x, y) { }; - D.foo = function (x, y) { }; - D.bar = function (x, y) { }; + D.prototype.foo = function (x, y) { + }; + D.prototype.bar = function (x, y) { + }; + 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..2726756c803 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js @@ -66,23 +66,35 @@ var r2 = d.foo(2); // error var C = (function () { function C() { } - C.prototype.foo = function (x, y) { }; - C.prototype.bar = function (x, y) { }; - C.foo = function (x, y) { }; - C.prototype.baz = function (x, y) { }; - C.bar = function (x, y) { }; - C.baz = function (x, y) { }; + C.prototype.foo = function (x, y) { + }; + C.prototype.bar = function (x, y) { + }; + C.foo = function (x, y) { + }; + C.prototype.baz = function (x, y) { + }; + C.bar = function (x, y) { + }; + C.baz = function (x, y) { + }; return C; })(); var D = (function () { function D() { } - D.prototype.foo = function (x, y) { }; - D.prototype.bar = function (x, y) { }; - D.prototype.baz = function (x, y) { }; - D.foo = function (x, y) { }; - D.bar = function (x, y) { }; - D.baz = function (x, y) { }; + D.prototype.foo = function (x, y) { + }; + D.prototype.bar = function (x, y) { + }; + D.prototype.baz = function (x, y) { + }; + D.foo = function (x, y) { + }; + D.bar = function (x, y) { + }; + D.baz = function (x, y) { + }; return D; })(); var c; diff --git a/tests/baselines/reference/mergedDeclarations1.js b/tests/baselines/reference/mergedDeclarations1.js index 641ff031ded..9dc432f94a6 100644 --- a/tests/baselines/reference/mergedDeclarations1.js +++ b/tests/baselines/reference/mergedDeclarations1.js @@ -18,7 +18,10 @@ var b = point.equals(p1, p2); //// [mergedDeclarations1.js] function point(x, y) { - return { x: x, y: y }; + return { + x: x, + y: y + }; } var point; (function (point) { diff --git a/tests/baselines/reference/mergedDeclarations4.js b/tests/baselines/reference/mergedDeclarations4.js index 64fad6bd598..a3dab29ff75 100644 --- a/tests/baselines/reference/mergedDeclarations4.js +++ b/tests/baselines/reference/mergedDeclarations4.js @@ -21,7 +21,8 @@ M.f.hello; //// [mergedDeclarations4.js] var M; (function (M) { - function f() { } + function f() { + } M.f = f; f(); M.f(); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js index bb0e846d063..457bd12b8f0 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js @@ -15,7 +15,8 @@ var my; (function (data) { var foo; (function (foo) { - function buz() { } + function buz() { + } foo.buz = buz; })(foo = data.foo || (data.foo = {})); })(data = my.data || (my.data = {})); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js index a03b418fcc9..0618346dd75 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js @@ -13,7 +13,8 @@ var my; (function (my) { var data; (function (data) { - function buz() { } + function buz() { + } data.buz = buz; })(data = my.data || (my.data = {})); })(my || (my = {})); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js index 9efba74a27b..2463c9cae90 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js @@ -27,7 +27,8 @@ var superContain; (function (buz) { var data; (function (data) { - function foo() { } + function foo() { + } data.foo = foo; })(data = buz.data || (buz.data = {})); })(buz = my.buz || (my.buz = {})); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js index ce453264f78..2c8e0bb79e4 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js @@ -25,9 +25,11 @@ var M; (function (buz) { var plop; (function (plop) { - function doom() { } + function doom() { + } plop.doom = doom; - function M() { } + function M() { + } plop.M = M; })(plop = buz.plop || (buz.plop = {})); })(buz = _M.buz || (_M.buz = {})); @@ -38,8 +40,10 @@ var M; (function (_buz) { var plop; (function (_plop) { - function gunk() { } - function buz() { } + function gunk() { + } + function buz() { + } var fudge = (function () { function fudge() { } diff --git a/tests/baselines/reference/methodContainingLocalFunction.js b/tests/baselines/reference/methodContainingLocalFunction.js index f2f336d38b7..36487e3ad7c 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.js +++ b/tests/baselines/reference/methodContainingLocalFunction.js @@ -56,7 +56,8 @@ var BugExhibition = (function () { function BugExhibition() { } BugExhibition.prototype.exhibitBug = function () { - function localFunction() { } + function localFunction() { + } var x; x = localFunction; }; @@ -67,7 +68,8 @@ var BugExhibition2 = (function () { } Object.defineProperty(BugExhibition2, "exhibitBug", { get: function () { - function localFunction() { } + function localFunction() { + } var x; x = localFunction; return null; @@ -81,7 +83,8 @@ var BugExhibition3 = (function () { function BugExhibition3() { } BugExhibition3.prototype.exhibitBug = function () { - function localGenericFunction(u) { } + function localGenericFunction(u) { + } var x; x = localGenericFunction; }; @@ -91,7 +94,8 @@ var C = (function () { function C() { } C.prototype.exhibit = function () { - var funcExpr = function (u) { }; + var funcExpr = function (u) { + }; var x; x = funcExpr; }; @@ -100,7 +104,8 @@ var C = (function () { var M; (function (M) { function exhibitBug() { - function localFunction() { } + function localFunction() { + } var x; x = localFunction; } @@ -109,7 +114,8 @@ var M; var E; (function (E) { E[E["A"] = (function () { - function localFunction() { } + function localFunction() { + } var x; x = localFunction; return 0; diff --git a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.js b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.js index 0465ea46f55..0315f0c7a63 100644 --- a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.js +++ b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.js @@ -15,12 +15,44 @@ var r8 = map([1, ""], (x) => x.toString()); //// [mismatchedExplicitTypeParameterAndArgumentType.js] function map(xs, f) { var ys = []; - xs.forEach(function (x) { return ys.push(f(x)); }); + xs.forEach(function (x) { + return ys.push(f(x)); + }); return ys; } -var r0 = map([1, ""], function (x) { return x.toString(); }); -var r5 = map([1, ""], function (x) { return x.toString(); }); -var r6 = map([1, ""], function (x) { return x.toString(); }); -var r7 = map([1, ""], function (x) { return x.toString(); }); // error -var r7b = map([1, ""], function (x) { return x.toString(); }); // error -var r8 = map([1, ""], function (x) { return x.toString(); }); +var r0 = map([ + 1, + "" +], function (x) { + return x.toString(); +}); +var r5 = map([ + 1, + "" +], function (x) { + return x.toString(); +}); +var r6 = map([ + 1, + "" +], function (x) { + return x.toString(); +}); +var r7 = map([ + 1, + "" +], function (x) { + return x.toString(); +}); // error +var r7b = map([ + 1, + "" +], function (x) { + return x.toString(); +}); // error +var r8 = map([ + 1, + "" +], function (x) { + return x.toString(); +}); diff --git a/tests/baselines/reference/missingSelf.js b/tests/baselines/reference/missingSelf.js index 56dcc4f9fa0..a0400aa4b2e 100644 --- a/tests/baselines/reference/missingSelf.js +++ b/tests/baselines/reference/missingSelf.js @@ -22,8 +22,11 @@ c2.b(); var CalcButton = (function () { function CalcButton() { } - CalcButton.prototype.a = function () { this.onClick(); }; - CalcButton.prototype.onClick = function () { }; + CalcButton.prototype.a = function () { + this.onClick(); + }; + CalcButton.prototype.onClick = function () { + }; return CalcButton; })(); var CalcButton2 = (function () { @@ -31,9 +34,12 @@ var CalcButton2 = (function () { } CalcButton2.prototype.b = function () { var _this = this; - (function () { return _this.onClick(); }); + (function () { + return _this.onClick(); + }); + }; + CalcButton2.prototype.onClick = function () { }; - CalcButton2.prototype.onClick = function () { }; return CalcButton2; })(); var c = new CalcButton(); diff --git a/tests/baselines/reference/missingTypeArguments2.js b/tests/baselines/reference/missingTypeArguments2.js index bc5c1d88f46..fe4b7c7dd79 100644 --- a/tests/baselines/reference/missingTypeArguments2.js +++ b/tests/baselines/reference/missingTypeArguments2.js @@ -13,6 +13,9 @@ var A = (function () { return A; })(); var x; -(function (a) { }); +(function (a) { +}); var y; -(function () { return null; }); +(function () { + return null; +}); diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js index db1bc28a144..3105c923304 100644 --- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js +++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js @@ -45,11 +45,13 @@ module E { //// [mixingFunctionAndAmbientModule1.js] var A; (function (A) { - function My(s) { } + function My(s) { + } })(A || (A = {})); var B; (function (B) { - function My(s) { } + function My(s) { + } })(B || (B = {})); var C; (function (C) { diff --git a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js index 22367461c2c..59495280771 100644 --- a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js +++ b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js @@ -39,31 +39,37 @@ class C5 { var C1 = (function () { function C1() { } - C1.foo1 = function (a) { }; + C1.foo1 = function (a) { + }; return C1; })(); var C2 = (function () { function C2() { } - C2.prototype.foo2 = function (a) { }; + C2.prototype.foo2 = function (a) { + }; return C2; })(); var C3 = (function () { function C3() { } - C3.prototype.foo3 = function (a) { }; + C3.prototype.foo3 = function (a) { + }; return C3; })(); var C4 = (function () { function C4() { } - C4.foo4 = function (a) { }; + C4.foo4 = function (a) { + }; return C4; })(); var C5 = (function () { function C5() { } - C5.prototype.foo5 = function (a) { }; - C5.foo5 = function (a) { }; + C5.prototype.foo5 = function (a) { + }; + C5.foo5 = function (a) { + }; return C5; })(); diff --git a/tests/baselines/reference/modFunctionCrash.js b/tests/baselines/reference/modFunctionCrash.js index 0d4f62eae63..f216788c0eb 100644 --- a/tests/baselines/reference/modFunctionCrash.js +++ b/tests/baselines/reference/modFunctionCrash.js @@ -7,4 +7,6 @@ declare module Q { Q.f(function() {this;}); //// [modFunctionCrash.js] -Q.f(function () { this; }); +Q.f(function () { + this; +}); diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index a7580e97ef7..6f5f0a4e912 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -24,14 +24,17 @@ var v = E2.B; //// [moduleCodeGenTest5.js] exports.x = 0; var y = 0; -function f1() { } +function f1() { +} exports.f1 = f1; -function f2() { } +function f2() { +} var C1 = (function () { function C1() { this.p1 = 0; } - C1.prototype.p2 = function () { }; + C1.prototype.p2 = function () { + }; return C1; })(); exports.C1 = C1; @@ -39,7 +42,8 @@ var C2 = (function () { function C2() { this.p1 = 0; } - C2.prototype.p2 = function () { }; + C2.prototype.p2 = function () { + }; return C2; })(); (function (E1) { diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index 972bbae63d1..92fcd5b16e2 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -19,4 +19,5 @@ var Promise = (function () { })(); exports.Promise = Promise; //// [moduleInTypePosition1_1.js] -var x = function (w1) { }; +var x = function (w1) { +}; diff --git a/tests/baselines/reference/moduleKeywordRepeatError.js b/tests/baselines/reference/moduleKeywordRepeatError.js index 385bce001a2..8ec656f22ae 100644 --- a/tests/baselines/reference/moduleKeywordRepeatError.js +++ b/tests/baselines/reference/moduleKeywordRepeatError.js @@ -6,4 +6,5 @@ module.module { } //// [moduleKeywordRepeatError.js] // "module.module { }" should raise a syntax error module.module; -{ } +{ +} diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js index 1467ec18b91..63ccf613a77 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js @@ -102,7 +102,8 @@ var TypeScript; (function (TypeScript) { var Syntax; (function (Syntax) { - function childIndex() { } + function childIndex() { + } Syntax.childIndex = childIndex; var VariableWidthTokenWithTrailingTrivia = (function () { function VariableWidthTokenWithTrailingTrivia() { diff --git a/tests/baselines/reference/moduleNewExportBug.js b/tests/baselines/reference/moduleNewExportBug.js index ce40915b2f6..51e1bb24144 100644 --- a/tests/baselines/reference/moduleNewExportBug.js +++ b/tests/baselines/reference/moduleNewExportBug.js @@ -19,7 +19,8 @@ var mod1; var C = (function () { function C() { } - C.prototype.moo = function () { }; + C.prototype.moo = function () { + }; return C; })(); })(mod1 || (mod1 = {})); diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js index 951c558ddfd..d2dc938872a 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js @@ -23,7 +23,9 @@ var M; var C2 = (function () { function C2() { } - C2.prototype.f = function () { return null; }; + C2.prototype.f = function () { + return null; + }; return C2; })(); M.C2 = C2; diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.js b/tests/baselines/reference/moduleReopenedTypeSameBlock.js index 92e7e9e5228..c3546f20b2f 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.js @@ -21,7 +21,9 @@ var M; var C2 = (function () { function C2() { } - C2.prototype.f = function () { return null; }; + C2.prototype.f = function () { + return null; + }; return C2; })(); M.C2 = C2; diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index cbe435e570c..1bcf1dbea0a 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -26,15 +26,24 @@ var x = v2; // Should be global v2 of type number again var v1 = "sausages"; // Global scope //// [file2.js] var v2 = 42; // Global scope -var v4 = function () { return 5; }; +var v4 = function () { + return 5; +}; //// [file3.js] exports.v3 = true; -var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope +var v2 = [ + 1, + 2, + 3 +]; // Module scope. Should not appear in global scope //// [file4.js] var file3 = require('./file3'); var t1 = v1; var t2 = v2; var t3 = file3.v3; -var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module +var v4 = { + a: true, + b: NaN +}; // Should shadow global v2 in this module //// [file5.js] var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js index d43fff1378a..0a812a62e09 100644 --- a/tests/baselines/reference/moduleSymbolMerging.js +++ b/tests/baselines/reference/moduleSymbolMerging.js @@ -22,7 +22,9 @@ var A; })(A || (A = {})); var B; (function (B) { - function f() { return null; } + function f() { + return null; + } B.f = f; })(B || (B = {})); diff --git a/tests/baselines/reference/moduleUnassignedVariable.js b/tests/baselines/reference/moduleUnassignedVariable.js index 1765342efcd..179a2577adf 100644 --- a/tests/baselines/reference/moduleUnassignedVariable.js +++ b/tests/baselines/reference/moduleUnassignedVariable.js @@ -12,7 +12,11 @@ module Bar { var Bar; (function (Bar) { Bar.a = 1; - function fooA() { return Bar.a; } // Correct: return Bar.a + function fooA() { + return Bar.a; + } // Correct: return Bar.a Bar.b; - function fooB() { return Bar.b; } // Incorrect: return b + function fooB() { + return Bar.b; + } // Incorrect: return b })(Bar || (Bar = {})); diff --git a/tests/baselines/reference/moduleVisibilityTest1.js b/tests/baselines/reference/moduleVisibilityTest1.js index a2957cb9582..d8bdedfafe2 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.js +++ b/tests/baselines/reference/moduleVisibilityTest1.js @@ -70,11 +70,15 @@ c.someMethodThatCallsAnOuterMethod(); //// [moduleVisibilityTest1.js] var OuterMod; (function (OuterMod) { - function someExportedOuterFunc() { return -1; } + function someExportedOuterFunc() { + return -1; + } OuterMod.someExportedOuterFunc = someExportedOuterFunc; var OuterInnerMod; (function (OuterInnerMod) { - function someExportedOuterInnerFunc() { return "foo"; } + function someExportedOuterInnerFunc() { + return "foo"; + } OuterInnerMod.someExportedOuterInnerFunc = someExportedOuterInnerFunc; })(OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {})); })(OuterMod || (OuterMod = {})); @@ -83,7 +87,9 @@ var M; (function (M) { var InnerMod; (function (InnerMod) { - function someExportedInnerFunc() { return -2; } + function someExportedInnerFunc() { + return -2; + } InnerMod.someExportedInnerFunc = someExportedInnerFunc; })(InnerMod = M.InnerMod || (M.InnerMod = {})); (function (E) { @@ -103,18 +109,30 @@ var M; var C = (function () { function C() { this.someProp = 1; - function someInnerFunc() { return 2; } + function someInnerFunc() { + return 2; + } var someInnerVar = 3; } - C.prototype.someMethodThatCallsAnOuterMethod = function () { return OuterInnerAlias.someExportedOuterInnerFunc(); }; - C.prototype.someMethodThatCallsAnInnerMethod = function () { return InnerMod.someExportedInnerFunc(); }; - C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); }; - C.prototype.someMethod = function () { return 0; }; + C.prototype.someMethodThatCallsAnOuterMethod = function () { + return OuterInnerAlias.someExportedOuterInnerFunc(); + }; + C.prototype.someMethodThatCallsAnInnerMethod = function () { + return InnerMod.someExportedInnerFunc(); + }; + 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; } + function someModuleFunction() { + return 5; + } })(M || (M = {})); var M; (function (M) { diff --git a/tests/baselines/reference/moduleVisibilityTest2.js b/tests/baselines/reference/moduleVisibilityTest2.js index 9102bd17ae2..63ecaf0c135 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.js +++ b/tests/baselines/reference/moduleVisibilityTest2.js @@ -71,11 +71,15 @@ c.someMethodThatCallsAnOuterMethod(); //// [moduleVisibilityTest2.js] var OuterMod; (function (OuterMod) { - function someExportedOuterFunc() { return -1; } + function someExportedOuterFunc() { + return -1; + } OuterMod.someExportedOuterFunc = someExportedOuterFunc; var OuterInnerMod; (function (OuterInnerMod) { - function someExportedOuterInnerFunc() { return "foo"; } + function someExportedOuterInnerFunc() { + return "foo"; + } OuterInnerMod.someExportedOuterInnerFunc = someExportedOuterInnerFunc; })(OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {})); })(OuterMod || (OuterMod = {})); @@ -84,7 +88,9 @@ var M; (function (M) { var InnerMod; (function (InnerMod) { - function someExportedInnerFunc() { return -2; } + function someExportedInnerFunc() { + return -2; + } InnerMod.someExportedInnerFunc = someExportedInnerFunc; })(InnerMod || (InnerMod = {})); var E; @@ -104,18 +110,30 @@ var M; var C = (function () { function C() { this.someProp = 1; - function someInnerFunc() { return 2; } + function someInnerFunc() { + return 2; + } var someInnerVar = 3; } - C.prototype.someMethodThatCallsAnOuterMethod = function () { return OuterInnerAlias.someExportedOuterInnerFunc(); }; - C.prototype.someMethodThatCallsAnInnerMethod = function () { return InnerMod.someExportedInnerFunc(); }; - C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); }; - C.prototype.someMethod = function () { return 0; }; + C.prototype.someMethodThatCallsAnOuterMethod = function () { + return OuterInnerAlias.someExportedOuterInnerFunc(); + }; + C.prototype.someMethodThatCallsAnInnerMethod = function () { + return InnerMod.someExportedInnerFunc(); + }; + 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; } + function someModuleFunction() { + return 5; + } })(M || (M = {})); var M; (function (M) { diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js index 8496588c5bb..5161f72d5f0 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js @@ -112,7 +112,11 @@ var A; var fn = function (s) { return 'hello ' + s; }; - var ol = { s: 'hello', id: 2, isvalid: true }; + var ol = { + s: 'hello', + id: 2, + isvalid: true + }; })(A || (A = {})); var Y; (function (Y) { @@ -166,5 +170,9 @@ var Y; Y.fn = function (s) { return 'hello ' + s; }; - Y.ol = { s: 'hello', id: 2, isvalid: true }; + Y.ol = { + s: 'hello', + id: 2, + isvalid: true + }; })(Y || (Y = {})); diff --git a/tests/baselines/reference/multiCallOverloads.js b/tests/baselines/reference/multiCallOverloads.js index d4e765c5514..85b008d52b7 100644 --- a/tests/baselines/reference/multiCallOverloads.js +++ b/tests/baselines/reference/multiCallOverloads.js @@ -14,10 +14,15 @@ load(function(z?) {}) // this shouldn't be an error //// [multiCallOverloads.js] -function load(f) { } -var f1 = function (z) { }; -var f2 = function (z) { }; +function load(f) { +} +var f1 = function (z) { +}; +var f2 = function (z) { +}; load(f1); // ok load(f2); // ok -load(function () { }); // this shouldn’t be an error -load(function (z) { }); // this shouldn't be an error +load(function () { +}); // this shouldn’t be an error +load(function (z) { +}); // this shouldn't be an error diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt new file mode 100644 index 00000000000..c85e7584139 --- /dev/null +++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt @@ -0,0 +1,17 @@ +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(2,18): error TS2304: Cannot find name 'Role'. +tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(4,26): error TS2304: Cannot find name 'ng'. + + +==== tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts (3 errors) ==== + return this.edit(role) + ~~~~~~ +!!! error TS1108: A 'return' statement can only be used within a function body. + .then((role: Role) => + ~~~~ +!!! error TS2304: Cannot find name 'Role'. + this.roleService.add(role) + .then((data: ng.IHttpPromiseCallbackArg) => data.data)); + ~~ +!!! error TS2304: Cannot find name 'ng'. + \ No newline at end of file diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js new file mode 100644 index 00000000000..4d0317a50a5 --- /dev/null +++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js @@ -0,0 +1,14 @@ +//// [multiLinePropertyAccessAndArrowFunctionIndent1.ts] +return this.edit(role) + .then((role: Role) => + this.roleService.add(role) + .then((data: ng.IHttpPromiseCallbackArg) => data.data)); + + +//// [multiLinePropertyAccessAndArrowFunctionIndent1.js] +var _this = this; +return this.edit(role).then(function (role) { + return _this.roleService.add(role).then(function (data) { + return data.data; + }); +}); diff --git a/tests/baselines/reference/multiModuleClodule1.js b/tests/baselines/reference/multiModuleClodule1.js index 9f6d7b5014c..a64abd81680 100644 --- a/tests/baselines/reference/multiModuleClodule1.js +++ b/tests/baselines/reference/multiModuleClodule1.js @@ -22,9 +22,12 @@ c.foo = C.foo; var C = (function () { function C(x) { } - C.prototype.foo = function () { }; - C.prototype.bar = function () { }; - C.boo = function () { }; + C.prototype.foo = function () { + }; + C.prototype.bar = function () { + }; + C.boo = function () { + }; return C; })(); var C; @@ -34,9 +37,12 @@ var C; })(C || (C = {})); var C; (function (C) { - function foo() { } + function foo() { + } C.foo = foo; - function baz() { return ''; } + function baz() { + return ''; + } })(C || (C = {})); var c = new C(C.x); c.foo = C.foo; diff --git a/tests/baselines/reference/multiModuleFundule1.js b/tests/baselines/reference/multiModuleFundule1.js index 6aa9cb959ba..f643ed5ee4d 100644 --- a/tests/baselines/reference/multiModuleFundule1.js +++ b/tests/baselines/reference/multiModuleFundule1.js @@ -13,14 +13,16 @@ var r2 = new C(2); // using void returning function as constructor var r3 = C.foo(); //// [multiModuleFundule1.js] -function C(x) { } +function C(x) { +} var C; (function (C) { C.x = 1; })(C || (C = {})); var C; (function (C) { - function foo() { } + function foo() { + } C.foo = foo; })(C || (C = {})); var r = C(2); diff --git a/tests/baselines/reference/multipleInheritance.js b/tests/baselines/reference/multipleInheritance.js index 269d5c2ea19..9cab77f3dba 100644 --- a/tests/baselines/reference/multipleInheritance.js +++ b/tests/baselines/reference/multipleInheritance.js @@ -97,9 +97,13 @@ var ND = (function (_super) { })(N); var Good = (function () { function Good() { - this.f = function () { return 0; }; + this.f = function () { + return 0; + }; } - Good.prototype.g = function () { return 0; }; + Good.prototype.g = function () { + return 0; + }; return Good; })(); var Baad = (function (_super) { @@ -107,7 +111,11 @@ var Baad = (function (_super) { function Baad() { _super.apply(this, arguments); } - Baad.prototype.f = function () { return 0; }; - Baad.prototype.g = function (n) { return 0; }; + Baad.prototype.f = function () { + return 0; + }; + Baad.prototype.g = function (n) { + return 0; + }; return Baad; })(Good); diff --git a/tests/baselines/reference/multipleNumericIndexers.js b/tests/baselines/reference/multipleNumericIndexers.js index 638cf01569a..31bd84e5356 100644 --- a/tests/baselines/reference/multipleNumericIndexers.js +++ b/tests/baselines/reference/multipleNumericIndexers.js @@ -40,7 +40,10 @@ var C = (function () { return C; })(); var a; -var b = { 1: '', "2": '' }; +var b = { + 1: '', + "2": '' +}; var C2 = (function () { function C2() { } diff --git a/tests/baselines/reference/multipleStringIndexers.js b/tests/baselines/reference/multipleStringIndexers.js index 55dd816e42b..b914b205654 100644 --- a/tests/baselines/reference/multipleStringIndexers.js +++ b/tests/baselines/reference/multipleStringIndexers.js @@ -39,7 +39,9 @@ var C = (function () { return C; })(); var a; -var b = { y: '' }; +var b = { + y: '' +}; var C2 = (function () { function C2() { } diff --git a/tests/baselines/reference/mutrec.js b/tests/baselines/reference/mutrec.js index 1d1ccb4e90b..ba6c8ade036 100644 --- a/tests/baselines/reference/mutrec.js +++ b/tests/baselines/reference/mutrec.js @@ -43,11 +43,15 @@ g(i4); //// [mutrec.js] -function f(p) { return p; } +function f(p) { + return p; +} ; var b; f(b); -function g(p) { return p; } +function g(p) { + return p; +} ; var i2; g(i2); diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js index 76fd13aa320..585a3d2178b 100644 --- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js +++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js @@ -20,7 +20,9 @@ var __extends = this.__extends || function (d, b) { var foo = (function () { function foo() { } - foo.prototype.bar = function () { return null; }; + foo.prototype.bar = function () { + return null; + }; return foo; })(); var foo2 = (function (_super) { diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js index 2cfaba94993..51b66adcefe 100644 --- a/tests/baselines/reference/nameCollisions.js +++ b/tests/baselines/reference/nameCollisions.js @@ -76,8 +76,10 @@ var T; })(); // error var w; var f; - function f() { } //error - function f2() { } + function f() { + } //error + function f2() { + } var f2; // error var i; var C = (function () { @@ -85,14 +87,17 @@ var T; } return C; })(); - function C() { } // error - function C2() { } + function C() { + } // error + function C2() { + } var C2 = (function () { function C2() { } return C2; })(); // error - function fi() { } + function fi() { + } var cli = (function () { function cli() { } diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js index 1f3631e03ba..4c2634d881d 100644 --- a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js +++ b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js @@ -4,4 +4,8 @@ var y = { x() { x++; } }; //// [nameCollisionsInPropertyAssignments.js] var x = 1; -var y = { x: function () { x++; } }; +var y = { + x: function () { + x++; + } +}; diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js index 8418bbbe467..453b032e004 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js @@ -57,9 +57,16 @@ var ResultIsNumber15 = -(ANY - ANY1); // - operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "", y: function () { } }; +var obj1 = { + x: "", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js index 9442f54490f..f50382de652 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.js +++ b/tests/baselines/reference/negateOperatorWithBooleanType.js @@ -38,11 +38,15 @@ var ResultIsNumber7 = -A.foo(); //// [negateOperatorWithBooleanType.js] // - operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -54,7 +58,10 @@ var objA = new A(); var ResultIsNumber1 = -BOOLEAN; // boolean type literal var ResultIsNumber2 = -true; -var ResultIsNumber3 = -{ x: true, y: false }; +var ResultIsNumber3 = -{ + x: true, + y: false +}; // boolean type expressions var ResultIsNumber4 = -objA.a; var ResultIsNumber5 = -M.n; diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js index 5fa83e088c8..90cb9c073b3 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.js +++ b/tests/baselines/reference/negateOperatorWithNumberType.js @@ -44,12 +44,19 @@ var ResultIsNumber11 = -(NUMBER - NUMBER); //// [negateOperatorWithNumberType.js] // - operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -62,8 +69,16 @@ var ResultIsNumber1 = -NUMBER; var ResultIsNumber2 = -NUMBER1; // number type literal var ResultIsNumber3 = -1; -var ResultIsNumber4 = -{ x: 1, y: 2 }; -var ResultIsNumber5 = -{ x: 1, y: function (n) { return n; } }; +var ResultIsNumber4 = -{ + x: 1, + y: 2 +}; +var ResultIsNumber5 = -{ + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsNumber6 = -objA.a; var ResultIsNumber7 = -M.n; diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js index bdbc4a3d664..153a5921094 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.js +++ b/tests/baselines/reference/negateOperatorWithStringType.js @@ -43,12 +43,19 @@ var ResultIsNumber12 = -STRING.charAt(0); //// [negateOperatorWithStringType.js] // - operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -61,8 +68,16 @@ var ResultIsNumber1 = -STRING; var ResultIsNumber2 = -STRING1; // string type literal var ResultIsNumber3 = -""; -var ResultIsNumber4 = -{ x: "", y: "" }; -var ResultIsNumber5 = -{ x: "", y: function (s) { return s; } }; +var ResultIsNumber4 = -{ + x: "", + y: "" +}; +var ResultIsNumber5 = -{ + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsNumber6 = -objA.a; var ResultIsNumber7 = -M.n; diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js index 70445b3372f..c7f0ffe34fc 100644 --- a/tests/baselines/reference/nestedClassDeclaration.js +++ b/tests/baselines/reference/nestedClassDeclaration.js @@ -30,11 +30,13 @@ var C2 = (function () { } return C2; })(); -function foo() { } +function foo() { +} var C3 = (function () { function C3() { } return C3; })(); var x = { - class: C4 }, _a = void 0; + class: C4 +}, _a = void 0; diff --git a/tests/baselines/reference/nestedModules.js b/tests/baselines/reference/nestedModules.js index f146990ec82..fe3af5ae69c 100644 --- a/tests/baselines/reference/nestedModules.js +++ b/tests/baselines/reference/nestedModules.js @@ -37,7 +37,10 @@ var A; (function (A) { var B; (function (B) { - var Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' + var Point = { + x: 0, + y: 0 + }; // bug 832088: could not find module 'C' })(B = A.B || (A.B = {})); })(A || (A = {})); var M2; diff --git a/tests/baselines/reference/nestedRecursiveLambda.js b/tests/baselines/reference/nestedRecursiveLambda.js index 0273b5691e6..eff3da0e216 100644 --- a/tests/baselines/reference/nestedRecursiveLambda.js +++ b/tests/baselines/reference/nestedRecursiveLambda.js @@ -8,8 +8,26 @@ void(r =>(r => r)); //// [nestedRecursiveLambda.js] function f(a) { - void (function (r) { return (function (r) { return r; }); }); + void (function (r) { + return (function (r) { + return r; + }); + }); } -f((function (r) { return (function (r) { return r; }); })); -void (function (r) { return (function (r) { return r; }); }); -[(function (r) { return (function (r) { return r; }); })]; +f((function (r) { + return (function (r) { + return r; + }); +})); +void (function (r) { + return (function (r) { + return r; + }); +}); +[ + (function (r) { + return (function (r) { + return r; + }); + }) +]; diff --git a/tests/baselines/reference/nestedSelf.js b/tests/baselines/reference/nestedSelf.js index 9c0feaa887f..b61a0956676 100644 --- a/tests/baselines/reference/nestedSelf.js +++ b/tests/baselines/reference/nestedSelf.js @@ -17,7 +17,13 @@ var M; } C.prototype.foo = function () { var _this = this; - [1, 2, 3].map(function (x) { return _this.n * x; }); + [ + 1, + 2, + 3 + ].map(function (x) { + return _this.n * x; + }); }; return C; })(); diff --git a/tests/baselines/reference/newExpressionWithCast.js b/tests/baselines/reference/newExpressionWithCast.js index 8743d9b83bc..6ce025a4267 100644 --- a/tests/baselines/reference/newExpressionWithCast.js +++ b/tests/baselines/reference/newExpressionWithCast.js @@ -15,12 +15,15 @@ var test3 = new (Test3)(); //// [newExpressionWithCast.js] -function Test() { } +function Test() { +} // valid but error with noImplicitAny var test = new Test(); -function Test2() { } +function Test2() { +} // parse error var test2 = new < any > Test2(); -function Test3() { } +function Test3() { +} // valid with noImplicitAny var test3 = new Test3(); diff --git a/tests/baselines/reference/newFunctionImplicitAny.js b/tests/baselines/reference/newFunctionImplicitAny.js index 459c7d581d8..9f8d303680b 100644 --- a/tests/baselines/reference/newFunctionImplicitAny.js +++ b/tests/baselines/reference/newFunctionImplicitAny.js @@ -6,5 +6,6 @@ var test = new Test(); //// [newFunctionImplicitAny.js] // No implicit any error given when newing a function (up for debate) -function Test() { } +function Test() { +} var test = new Test(); diff --git a/tests/baselines/reference/newOperatorConformance.js b/tests/baselines/reference/newOperatorConformance.js index a04b10dc8fe..4e5c209bbff 100644 --- a/tests/baselines/reference/newOperatorConformance.js +++ b/tests/baselines/reference/newOperatorConformance.js @@ -104,7 +104,8 @@ function newFn2(s) { var p; } // Construct expression of void returning function -function fnVoid() { } +function fnVoid() { +} var t = new fnVoid(); var t; // Chained new expressions diff --git a/tests/baselines/reference/newOperatorErrorCases.js b/tests/baselines/reference/newOperatorErrorCases.js index b893beba02a..8a44d51fb5c 100644 --- a/tests/baselines/reference/newOperatorErrorCases.js +++ b/tests/baselines/reference/newOperatorErrorCases.js @@ -65,5 +65,7 @@ var c1 = new T; var c1; var c2 = new T(); // Parse error // Construct expression of non-void returning function -function fnNumber() { return 32; } +function fnNumber() { + return 32; +} var s = new fnNumber(); // Error diff --git a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js index 8a485a2ebe2..4ddb34b094c 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js @@ -9,4 +9,6 @@ var _this = (function () { } return _this; })(); -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js index 727b1b6087a..4e746582364 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js @@ -50,19 +50,23 @@ var class1 = (function () { Object.defineProperty(class1.prototype, "a", { get: function () { var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; return 10; }, set: function (val) { var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; }, enumerable: true, @@ -77,18 +81,22 @@ var class2 = (function () { get: function () { var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; return 10; }, set: function (val) { var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; }, enumerable: true, diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js index a01996848b1..ce86ca47301 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js @@ -25,10 +25,12 @@ class class2 { var class1 = (function () { function class1() { var x2 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; } return class1; @@ -37,9 +39,11 @@ var class2 = (function () { function class2() { var _this = 2; var x2 = { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; } return class2; diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.js index bdb55633682..d144a78fae3 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.js @@ -11,5 +11,7 @@ function x() { var console; function x() { var _this = 5; - (function (x) { console.log(_this); }); + (function (x) { + console.log(_this); + }); } diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.js index 83f21d10425..487751bd493 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.js @@ -10,9 +10,13 @@ alert(x.doStuff(x => alert(x))); //// [noCollisionThisExpressionAndLocalVarInLambda.js] var x = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; -alert(x.doStuff(function (x) { return alert(x); })); +alert(x.doStuff(function (x) { + return alert(x); +})); diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js index b7e9cc7561f..f91039b6c61 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js @@ -26,18 +26,22 @@ var a = (function () { } a.prototype.method1 = function () { return { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; }; a.prototype.method2 = function () { var _this = 2; return { - doStuff: function (callback) { return function () { - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + return callback(_this); + }; + } }; }; return a; diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js index da989bed263..374a812ba4b 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js @@ -23,10 +23,12 @@ class class2 { var class1 = (function () { function class1() { this.prop1 = { - doStuff: function (callback) { return function () { - var _this = 2; - return callback(_this); - }; } + doStuff: function (callback) { + return function () { + var _this = 2; + return callback(_this); + }; + } }; } return class1; @@ -34,9 +36,11 @@ var class1 = (function () { var class2 = (function () { function class2() { this.prop1 = { - doStuff: function (callback) { return function () { - return callback(10); - }; } + doStuff: function (callback) { + return function () { + return callback(10); + }; + } }; var _this = 2; } diff --git a/tests/baselines/reference/noCollisionThisExpressionAndVarInGlobal.js b/tests/baselines/reference/noCollisionThisExpressionAndVarInGlobal.js index bea476ed09f..c0377976e9b 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndVarInGlobal.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndVarInGlobal.js @@ -4,4 +4,6 @@ var f = () => _this; //// [noCollisionThisExpressionAndVarInGlobal.js] var _this = 1; -var f = function () { return _this; }; +var f = function () { + return _this; +}; diff --git a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.js b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.js index b3677681822..c34ad4c97bd 100644 --- a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.js +++ b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.js @@ -12,5 +12,7 @@ var console; var _this = 5; function x() { var _this = this; - (function (x) { console.log(_this); }); + (function (x) { + console.log(_this); + }); } diff --git a/tests/baselines/reference/noConstraintInReturnType1.js b/tests/baselines/reference/noConstraintInReturnType1.js index 0402f9d83cb..747cbfdf758 100644 --- a/tests/baselines/reference/noConstraintInReturnType1.js +++ b/tests/baselines/reference/noConstraintInReturnType1.js @@ -8,7 +8,9 @@ class List { var List = (function () { function List() { } - List.empty = function () { return null; }; + List.empty = function () { + return null; + }; return List; })(); diff --git a/tests/baselines/reference/noImplicitAnyForIn.js b/tests/baselines/reference/noImplicitAnyForIn.js index c8743936a9a..067a553e2dd 100644 --- a/tests/baselines/reference/noImplicitAnyForIn.js +++ b/tests/baselines/reference/noImplicitAnyForIn.js @@ -32,7 +32,16 @@ var n = [[]] || []; for (n[idx++] in m); //// [noImplicitAnyForIn.js] -var x = [[1, 2, 3], ["hello"]]; +var x = [ + [ + 1, + 2, + 3 + ], + [ + "hello" + ] +]; for (var i in x) { for (var j in x[i]) { //Should yield an implicit 'any' error @@ -50,8 +59,16 @@ for (var a in x) { var c = a || b; } var idx = 0; -var m = [1, 2, 3, 4, 5]; +var m = [ + 1, + 2, + 3, + 4, + 5 +]; // Should yield an implicit 'any' error. -var n = [[]] || []; +var n = [ + [] +] || []; for (n[idx++] in m) ; diff --git a/tests/baselines/reference/noImplicitAnyForMethodParameters.js b/tests/baselines/reference/noImplicitAnyForMethodParameters.js index fc5b94d4768..379cf85b5e2 100644 --- a/tests/baselines/reference/noImplicitAnyForMethodParameters.js +++ b/tests/baselines/reference/noImplicitAnyForMethodParameters.js @@ -18,12 +18,14 @@ class D { var C = (function () { function C() { } - C.prototype.foo = function (a) { }; // OK - non-ambient class and private method - error + 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 + D.prototype.foo = function (a) { + }; // OK - non-ambient class and public method - error return D; })(); diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.js b/tests/baselines/reference/noImplicitAnyInCastExpression.js index 1b7cc59c7c0..4e23b91527b 100644 --- a/tests/baselines/reference/noImplicitAnyInCastExpression.js +++ b/tests/baselines/reference/noImplicitAnyInCastExpression.js @@ -19,8 +19,15 @@ interface IFoo { //// [noImplicitAnyInCastExpression.js] // verify no noImplictAny errors reported with cast expression // Expr type not assignable to target type -{ a: null }; +{ + a: null +}; // Expr type assignable to target type -{ a: 2, b: undefined }; +{ + a: 2, + b: undefined +}; // Neither types is assignable to each other -{ c: null }; +{ + c: null +}; diff --git a/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.js b/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.js index 7722165fd23..f14810c8013 100644 --- a/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.js +++ b/tests/baselines/reference/noImplicitAnyInContextuallyTypesFunctionParamter.js @@ -5,5 +5,10 @@ regexMatchList.forEach(match => ''.replace(match, '')); //// [noImplicitAnyInContextuallyTypesFunctionParamter.js] -var regexMatchList = ['', '']; -regexMatchList.forEach(function (match) { return ''.replace(match, ''); }); +var regexMatchList = [ + '', + '' +]; +regexMatchList.forEach(function (match) { + return ''.replace(match, ''); +}); diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js index 8efe32d3140..6be61702143 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js +++ b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js @@ -46,15 +46,20 @@ var f14 = (x, ...r) => ""; //// [noImplicitAnyParametersInBareFunctions.js] // No implicit-'any' errors. -function f1() { } +function f1() { +} // Implicit-'any' error for x. -function f2(x) { } +function f2(x) { +} // No implicit-'any' errors. -function f3(x) { } +function f3(x) { +} // Implicit-'any' errors for x, y, and z. -function f4(x, y, z) { } +function f4(x, y, z) { +} // Implicit-'any' errors for x, and z. -function f5(x, y, z) { } +function f5(x, y, z) { +} // Implicit-'any[]' error for r. function f6() { var r = []; @@ -69,15 +74,24 @@ function f7(x) { r[_i - 1] = arguments[_i]; } } -function f8(x3, y3) { } +function f8(x3, y3) { +} // No implicit-'any' errors. -var f9 = function () { return ""; }; +var f9 = function () { + return ""; +}; // Implicit-'any' errors for x. -var f10 = function (x) { return ""; }; +var f10 = function (x) { + return ""; +}; // Implicit-'any' errors for x, y, and z. -var f11 = function (x, y, z) { return ""; }; +var f11 = function (x, y, z) { + return ""; +}; // Implicit-'any' errors for x and z. -var f12 = function (x, y, z) { return ""; }; +var f12 = function (x, y, z) { + return ""; +}; // Implicit-'any[]' error for r. var f13 = function () { var r = []; diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js index 0873935b600..1460d07b729 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInClass.js +++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js @@ -96,13 +96,21 @@ class C { var C = (function () { function C() { // No implicit-'any' errors. - this.pub_f9 = function () { return ""; }; + this.pub_f9 = function () { + return ""; + }; // Implicit-'any' errors for x. - this.pub_f10 = function (x) { return ""; }; + this.pub_f10 = function (x) { + return ""; + }; // Implicit-'any' errors for x, y, and z. - this.pub_f11 = function (x, y, z) { return ""; }; + this.pub_f11 = function (x, y, z) { + return ""; + }; // Implicit-'any' errors for x and z. - this.pub_f12 = function (x, y, z) { return ""; }; + this.pub_f12 = function (x, y, z) { + return ""; + }; // Implicit-'any[]' error for r. this.pub_f13 = function () { var r = []; @@ -120,13 +128,21 @@ var C = (function () { return ""; }; // No implicit-'any' errors. - this.priv_f9 = function () { return ""; }; + this.priv_f9 = function () { + return ""; + }; // Implicit-'any' errors for x. - this.priv_f10 = function (x) { return ""; }; + this.priv_f10 = function (x) { + return ""; + }; // Implicit-'any' errors for x, y, and z. - this.priv_f11 = function (x, y, z) { return ""; }; + this.priv_f11 = function (x, y, z) { + return ""; + }; // Implicit-'any' errors for x and z. - this.priv_f12 = function (x, y, z) { return ""; }; + this.priv_f12 = function (x, y, z) { + return ""; + }; // Implicit-'any[]' error for r. this.priv_f13 = function () { var r = []; @@ -145,15 +161,20 @@ var C = (function () { }; } // No implicit-'any' errors. - C.prototype.pub_f1 = function () { }; + C.prototype.pub_f1 = function () { + }; // Implicit-'any' errors for x. - C.prototype.pub_f2 = function (x) { }; + C.prototype.pub_f2 = function (x) { + }; // No implicit-'any' errors. - C.prototype.pub_f3 = function (x) { }; + C.prototype.pub_f3 = function (x) { + }; // Implicit-'any' errors for x, y, and z. - C.prototype.pub_f4 = function (x, y, z) { }; + C.prototype.pub_f4 = function (x, y, z) { + }; // Implicit-'any' errors for x, and z. - C.prototype.pub_f5 = function (x, y, z) { }; + C.prototype.pub_f5 = function (x, y, z) { + }; // Implicit-'any[]' errors for r. C.prototype.pub_f6 = function () { var r = []; @@ -168,18 +189,24 @@ var C = (function () { r[_i - 1] = arguments[_i]; } }; - C.prototype.pub_f8 = function (x3, y3) { }; + C.prototype.pub_f8 = function (x3, y3) { + }; /////////////////////////////////////////// // No implicit-'any' errors. - C.prototype.priv_f1 = function () { }; + C.prototype.priv_f1 = function () { + }; // Implicit-'any' errors for x. - C.prototype.priv_f2 = function (x) { }; + C.prototype.priv_f2 = function (x) { + }; // No implicit-'any' errors. - C.prototype.priv_f3 = function (x) { }; + C.prototype.priv_f3 = function (x) { + }; // Implicit-'any' errors for x, y, and z. - C.prototype.priv_f4 = function (x, y, z) { }; + C.prototype.priv_f4 = function (x, y, z) { + }; // Implicit-'any' errors for x, and z. - C.prototype.priv_f5 = function (x, y, z) { }; + C.prototype.priv_f5 = function (x, y, z) { + }; // Implicit-'any[]' errors for r. C.prototype.priv_f6 = function () { var r = []; @@ -194,6 +221,7 @@ var C = (function () { r[_i - 1] = arguments[_i]; } }; - C.prototype.priv_f8 = function (x3, y3) { }; + C.prototype.priv_f8 = function (x3, y3) { + }; return C; })(); diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js index e7f30205559..d89c4229c7b 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.js +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js @@ -50,15 +50,20 @@ module M { var M; (function (M) { // No implicit-'any' errors. - function m_f1() { } + function m_f1() { + } // Implicit-'any' error for x. - function m_f2(x) { } + function m_f2(x) { + } // No implicit-'any' errors. - function m_f3(x) { } + function m_f3(x) { + } // Implicit-'any' errors for x, y, and z. - function m_f4(x, y, z) { } + function m_f4(x, y, z) { + } // Implicit-'any' errors for x and z. - function m_f5(x, y, z) { } + function m_f5(x, y, z) { + } // Implicit-'any[]' error for r. function m_f6() { var r = []; @@ -73,15 +78,24 @@ var M; r[_i - 1] = arguments[_i]; } } - function m_f8(x3, y3) { } + function m_f8(x3, y3) { + } // No implicit-'any' errors. - var m_f9 = function () { return ""; }; + var m_f9 = function () { + return ""; + }; // Implicit-'any' error for x. - var m_f10 = function (x) { return ""; }; + var m_f10 = function (x) { + return ""; + }; // Implicit-'any' errors for x, y, and z. - var m_f11 = function (x, y, z) { return ""; }; + var m_f11 = function (x, y, z) { + return ""; + }; // Implicit-'any' errors for x and z. - var m_f12 = function (x, y, z) { return ""; }; + var m_f12 = function (x, y, z) { + return ""; + }; // Implicit-'any[]' errors for r. var m_f13 = function () { var r = []; diff --git a/tests/baselines/reference/noImplicitAnyWithOverloads.js b/tests/baselines/reference/noImplicitAnyWithOverloads.js index fd56b6e0d73..3bce6e18ba3 100644 --- a/tests/baselines/reference/noImplicitAnyWithOverloads.js +++ b/tests/baselines/reference/noImplicitAnyWithOverloads.js @@ -10,5 +10,8 @@ function callb(a) { } callb((a) => { a.foo; }); // error, chose first overload //// [noImplicitAnyWithOverloads.js] -function callb(a) { } -callb(function (a) { a.foo; }); // error, chose first overload +function callb(a) { +} +callb(function (a) { + a.foo; +}); // error, chose first overload diff --git a/tests/baselines/reference/noSelfOnVars.js b/tests/baselines/reference/noSelfOnVars.js index 913e3a23ba2..2e1f5080c26 100644 --- a/tests/baselines/reference/noSelfOnVars.js +++ b/tests/baselines/reference/noSelfOnVars.js @@ -9,6 +9,7 @@ function foo() { //// [noSelfOnVars.js] function foo() { - function bar() { } + function bar() { + } var x = bar; } diff --git a/tests/baselines/reference/nonInstantiatedModule.js b/tests/baselines/reference/nonInstantiatedModule.js index fc3ad19546f..ff7ea10358b 100644 --- a/tests/baselines/reference/nonInstantiatedModule.js +++ b/tests/baselines/reference/nonInstantiatedModule.js @@ -62,7 +62,10 @@ var M2; var Point; (function (Point) { function Origin() { - return { x: 0, y: 0 }; + return { + x: 0, + y: 0 + }; } Point.Origin = Origin; })(Point = M2.Point || (M2.Point = {})); diff --git a/tests/baselines/reference/null.js b/tests/baselines/reference/null.js index 499d6901847..c82cb3ab432 100644 --- a/tests/baselines/reference/null.js +++ b/tests/baselines/reference/null.js @@ -38,4 +38,7 @@ function g() { return null; return 3; } -var w = { x: null, y: 3 }; +var w = { + x: null, + y: 3 +}; diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js index c32cd84ce26..f69fe668f34 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js @@ -108,12 +108,22 @@ var r4 = true ? new Date() : null; var r4 = true ? null : new Date(); var r5 = true ? /1/ : null; var r5 = true ? null : /1/; -var r6 = true ? { foo: 1 } : null; -var r6 = true ? null : { foo: 1 }; -var r7 = true ? function () { } : null; -var r7 = true ? null : function () { }; -var r8 = true ? function (x) { return x; } : null; -var r8b = true ? null : function (x) { return x; }; // type parameters not identical across declarations +var r6 = true ? { + foo: 1 +} : null; +var r6 = true ? null : { + foo: 1 +}; +var r7 = true ? function () { +} : null; +var r7 = true ? null : function () { +}; +var r8 = true ? function (x) { + return x; +} : null; +var r8b = true ? null : function (x) { + return x; +}; // type parameters not identical across declarations var i1; var r9 = true ? i1 : null; var r9 = true ? null : i1; @@ -141,7 +151,8 @@ var r13 = true ? E : null; var r13 = true ? null : E; var r14 = true ? 0 /* A */ : null; var r14 = true ? null : 0 /* A */; -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/numberAsInLHS.js b/tests/baselines/reference/numberAsInLHS.js index d2fee353ab4..bcc1bcf7b84 100644 --- a/tests/baselines/reference/numberAsInLHS.js +++ b/tests/baselines/reference/numberAsInLHS.js @@ -2,4 +2,7 @@ 3 in [0, 1] //// [numberAsInLHS.js] -3 in [0, 1]; +3 in [ + 0, + 1 +]; diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js index cf08bb98217..339f674b9da 100644 --- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js +++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js @@ -106,7 +106,8 @@ var C = (function () { get: function () { return ''; }, - set: function (v) { } // ok + set: function (v) { + } // ok , enumerable: true, configurable: true @@ -114,7 +115,8 @@ var C = (function () { C.prototype.foo = function () { return ''; }; - C.foo = function () { }; // ok + C.foo = function () { + }; // ok Object.defineProperty(C, "X", { get: function () { return 1; @@ -129,7 +131,8 @@ var a; var b = { a: '', b: 1, - c: function () { }, + c: function () { + }, "d": '', "e": 1, 1.0: '', @@ -140,7 +143,8 @@ var b = { get X() { return ''; }, - set X(v) { }, + set X(v) { + }, foo: function () { return ''; } diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js index 0474abef393..1cfd94a0c97 100644 --- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js +++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js @@ -56,7 +56,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ''; }; + A.prototype.foo = function () { + return ''; + }; return A; })(); var B = (function (_super) { @@ -64,7 +66,9 @@ var B = (function (_super) { function B() { _super.apply(this, arguments); } - B.prototype.bar = function () { return ''; }; + B.prototype.bar = function () { + return ''; + }; return B; })(A); var Foo = (function () { diff --git a/tests/baselines/reference/numericIndexerConstraint1.js b/tests/baselines/reference/numericIndexerConstraint1.js index ed51e3af066..9587863a035 100644 --- a/tests/baselines/reference/numericIndexerConstraint1.js +++ b/tests/baselines/reference/numericIndexerConstraint1.js @@ -8,7 +8,8 @@ var result: Foo = x["one"]; // error var Foo = (function () { function Foo() { } - Foo.prototype.foo = function () { }; + Foo.prototype.foo = function () { + }; return Foo; })(); var x; diff --git a/tests/baselines/reference/numericIndexerConstraint2.js b/tests/baselines/reference/numericIndexerConstraint2.js index 4d8ce742e73..edc9df36a13 100644 --- a/tests/baselines/reference/numericIndexerConstraint2.js +++ b/tests/baselines/reference/numericIndexerConstraint2.js @@ -8,7 +8,8 @@ x = a; var Foo = (function () { function Foo() { } - Foo.prototype.foo = function () { }; + Foo.prototype.foo = function () { + }; return Foo; })(); var x; diff --git a/tests/baselines/reference/numericIndexerConstraint4.js b/tests/baselines/reference/numericIndexerConstraint4.js index 531c450e7e1..cbbf6b68c4e 100644 --- a/tests/baselines/reference/numericIndexerConstraint4.js +++ b/tests/baselines/reference/numericIndexerConstraint4.js @@ -30,4 +30,6 @@ var B = (function (_super) { } return B; })(A); -var x = { data: new B() }; +var x = { + data: new B() +}; diff --git a/tests/baselines/reference/numericIndexerConstraint5.js b/tests/baselines/reference/numericIndexerConstraint5.js index 3ad19f75d0b..b0684454394 100644 --- a/tests/baselines/reference/numericIndexerConstraint5.js +++ b/tests/baselines/reference/numericIndexerConstraint5.js @@ -3,5 +3,8 @@ var x = { name: "x", 0: new Date() }; var z: { [name: number]: string } = x; //// [numericIndexerConstraint5.js] -var x = { name: "x", 0: new Date() }; +var x = { + name: "x", + 0: new Date() +}; var z = x; diff --git a/tests/baselines/reference/numericIndexingResults.js b/tests/baselines/reference/numericIndexingResults.js index 70c6e15d15a..043bf3265e9 100644 --- a/tests/baselines/reference/numericIndexingResults.js +++ b/tests/baselines/reference/numericIndexingResults.js @@ -85,14 +85,20 @@ var r3 = a['3']; var r4 = a[1]; var r5 = a[2]; var r6 = a[3]; -var b = { 1: '', "2": '' }; +var b = { + 1: '', + "2": '' +}; var r1a = b['1']; var r2a = b['2']; var r3 = b['3']; var r4 = b[1]; var r5 = b[2]; var r6 = b[3]; -var b2 = { 1: '', "2": '' }; +var b2 = { + 1: '', + "2": '' +}; var r1b = b2['1']; var r2b = b2['2']; var r3 = b2['3']; diff --git a/tests/baselines/reference/objectLitIndexerContextualType.js b/tests/baselines/reference/objectLitIndexerContextualType.js index f0cf90724b3..a6124814cff 100644 --- a/tests/baselines/reference/objectLitIndexerContextualType.js +++ b/tests/baselines/reference/objectLitIndexerContextualType.js @@ -26,14 +26,22 @@ y = { var x; var y; x = { - s: function (t) { return t * t; } + s: function (t) { + return t * t; + } }; x = { - 0: function (t) { return t * t; } + 0: function (t) { + return t * t; + } }; y = { - s: function (t) { return t * t; } + s: function (t) { + return t * t; + } }; y = { - 0: function (t) { return t * t; } + 0: function (t) { + return t * t; + } }; diff --git a/tests/baselines/reference/objectLitStructuralTypeMismatch.js b/tests/baselines/reference/objectLitStructuralTypeMismatch.js index 380b8a2aacf..c24f742f082 100644 --- a/tests/baselines/reference/objectLitStructuralTypeMismatch.js +++ b/tests/baselines/reference/objectLitStructuralTypeMismatch.js @@ -4,4 +4,6 @@ var x: { a: number; } = { b: 5 }; //// [objectLitStructuralTypeMismatch.js] // Shouldn't compile -var x = { b: 5 }; +var x = { + b: 5 +}; diff --git a/tests/baselines/reference/objectLitTargetTypeCallSite.js b/tests/baselines/reference/objectLitTargetTypeCallSite.js index 999b889e415..76cd4c660dc 100644 --- a/tests/baselines/reference/objectLitTargetTypeCallSite.js +++ b/tests/baselines/reference/objectLitTargetTypeCallSite.js @@ -9,4 +9,7 @@ process({a:true,b:"y"}); function process(x) { return x.a; } -process({ a: true, b: "y" }); +process({ + a: true, + b: "y" +}); diff --git a/tests/baselines/reference/objectLiteral1.js b/tests/baselines/reference/objectLiteral1.js index ebeabd011b5..7d625c8e815 100644 --- a/tests/baselines/reference/objectLiteral1.js +++ b/tests/baselines/reference/objectLiteral1.js @@ -2,4 +2,7 @@ var v30 = {a:1, b:2}; //// [objectLiteral1.js] -var v30 = { a: 1, b: 2 }; +var v30 = { + a: 1, + b: 2 +}; diff --git a/tests/baselines/reference/objectLiteral2.js b/tests/baselines/reference/objectLiteral2.js index 189e495c5f5..b517d99b05d 100644 --- a/tests/baselines/reference/objectLiteral2.js +++ b/tests/baselines/reference/objectLiteral2.js @@ -2,4 +2,7 @@ var v30 = {a:1, b:2}, v31; //// [objectLiteral2.js] -var v30 = { a: 1, b: 2 }, v31; +var v30 = { + a: 1, + b: 2 +}, v31; diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.js b/tests/baselines/reference/objectLiteralArraySpecialization.js index 0a48a3dccdd..9f704adba0e 100644 --- a/tests/baselines/reference/objectLiteralArraySpecialization.js +++ b/tests/baselines/reference/objectLiteralArraySpecialization.js @@ -9,5 +9,16 @@ thing.doSomething((x, y) => x.name === "bob"); // should not error //// [objectLiteralArraySpecialization.js] -var thing = create([{ name: "bob", id: 24 }, { name: "doug", id: 32 }]); // should not error -thing.doSomething(function (x, y) { return x.name === "bob"; }); // should not error +var thing = create([ + { + name: "bob", + id: 24 + }, + { + name: "doug", + id: 32 + } +]); // should not error +thing.doSomething(function (x, y) { + return x.name === "bob"; +}); // should not error diff --git a/tests/baselines/reference/objectLiteralContextualTyping.js b/tests/baselines/reference/objectLiteralContextualTyping.js index 48686042754..c61452c2057 100644 --- a/tests/baselines/reference/objectLiteralContextualTyping.js +++ b/tests/baselines/reference/objectLiteralContextualTyping.js @@ -29,13 +29,23 @@ var b: {}; //// [objectLiteralContextualTyping.js] // Tests related to #1774 -var x = foo({ name: "Sprocket" }); +var x = foo({ + name: "Sprocket" +}); var x; -var y = foo({ name: "Sprocket", description: "Bumpy wheel" }); +var y = foo({ + name: "Sprocket", + description: "Bumpy wheel" +}); var y; -var z = foo({ name: "Sprocket", description: false }); +var z = foo({ + name: "Sprocket", + description: false +}); var z; -var w = foo({ a: 10 }); +var w = foo({ + a: 10 +}); var w; var b = bar({}); var b; diff --git a/tests/baselines/reference/objectLiteralErrors.js b/tests/baselines/reference/objectLiteralErrors.js index 4dccc78b67d..ac1ab2ec10e 100644 --- a/tests/baselines/reference/objectLiteralErrors.js +++ b/tests/baselines/reference/objectLiteralErrors.js @@ -48,44 +48,210 @@ var g3 = { get a(): number { return undefined; }, set a(n: string) { } }; //// [objectLiteralErrors.js] // Multiple properties with the same name -var e1 = { a: 0, a: 0 }; -var e2 = { a: '', a: '' }; -var e3 = { a: 0, a: '' }; -var e4 = { a: true, a: false }; -var e5 = { a: {}, a: {} }; -var e6 = { a: 0, 'a': 0 }; -var e7 = { 'a': 0, a: 0 }; -var e8 = { 'a': 0, "a": 0 }; -var e9 = { 'a': 0, 'a': 0 }; -var e10 = { "a": 0, 'a': 0 }; -var e11 = { 1.0: 0, '1': 0 }; -var e12 = { 0: 0, 0: 0 }; -var e13 = { 0: 0, 0: 0 }; -var e14 = { 0: 0, 0x0: 0 }; -var e14 = { 0: 0, 000: 0 }; -var e15 = { "100": 0, 1e2: 0 }; -var e16 = { 0x20: 0, 3.2e1: 0 }; -var e17 = { a: 0, b: 1, a: 0 }; +var e1 = { + a: 0, + a: 0 +}; +var e2 = { + a: '', + a: '' +}; +var e3 = { + a: 0, + a: '' +}; +var e4 = { + a: true, + a: false +}; +var e5 = { + a: {}, + a: {} +}; +var e6 = { + a: 0, + 'a': 0 +}; +var e7 = { + 'a': 0, + a: 0 +}; +var e8 = { + 'a': 0, + "a": 0 +}; +var e9 = { + 'a': 0, + 'a': 0 +}; +var e10 = { + "a": 0, + 'a': 0 +}; +var e11 = { + 1.0: 0, + '1': 0 +}; +var e12 = { + 0: 0, + 0: 0 +}; +var e13 = { + 0: 0, + 0: 0 +}; +var e14 = { + 0: 0, + 0x0: 0 +}; +var e14 = { + 0: 0, + 000: 0 +}; +var e15 = { + "100": 0, + 1e2: 0 +}; +var e16 = { + 0x20: 0, + 3.2e1: 0 +}; +var e17 = { + a: 0, + b: 1, + a: 0 +}; // Accessor and property with the same name -var f1 = { a: 0, get a() { return 0; } }; -var f2 = { a: '', get a() { return ''; } }; -var f3 = { a: 0, get a() { return ''; } }; -var f4 = { a: true, get a() { return false; } }; -var f5 = { a: {}, get a() { return {}; } }; -var f6 = { a: 0, get 'a'() { return 0; } }; -var f7 = { 'a': 0, get a() { return 0; } }; -var f8 = { 'a': 0, get "a"() { return 0; } }; -var f9 = { 'a': 0, get 'a'() { return 0; } }; -var f10 = { "a": 0, get 'a'() { return 0; } }; -var f11 = { 1.0: 0, get '1'() { return 0; } }; -var f12 = { 0: 0, get 0() { return 0; } }; -var f13 = { 0: 0, get 0() { return 0; } }; -var f14 = { 0: 0, get 0x0() { return 0; } }; -var f14 = { 0: 0, get 000() { return 0; } }; -var f15 = { "100": 0, get 1e2() { return 0; } }; -var f16 = { 0x20: 0, get 3.2e1() { return 0; } }; -var f17 = { a: 0, get b() { return 1; }, get a() { return 0; } }; +var f1 = { + a: 0, + get a() { + return 0; + } +}; +var f2 = { + a: '', + get a() { + return ''; + } +}; +var f3 = { + a: 0, + get a() { + return ''; + } +}; +var f4 = { + a: true, + get a() { + return false; + } +}; +var f5 = { + a: {}, + get a() { + return {}; + } +}; +var f6 = { + a: 0, + get 'a'() { + return 0; + } +}; +var f7 = { + 'a': 0, + get a() { + return 0; + } +}; +var f8 = { + 'a': 0, + get "a"() { + return 0; + } +}; +var f9 = { + 'a': 0, + get 'a'() { + return 0; + } +}; +var f10 = { + "a": 0, + get 'a'() { + return 0; + } +}; +var f11 = { + 1.0: 0, + get '1'() { + return 0; + } +}; +var f12 = { + 0: 0, + get 0() { + return 0; + } +}; +var f13 = { + 0: 0, + get 0() { + return 0; + } +}; +var f14 = { + 0: 0, + get 0x0() { + return 0; + } +}; +var f14 = { + 0: 0, + get 000() { + return 0; + } +}; +var f15 = { + "100": 0, + get 1e2() { + return 0; + } +}; +var f16 = { + 0x20: 0, + get 3.2e1() { + return 0; + } +}; +var f17 = { + a: 0, + get b() { + return 1; + }, + get a() { + return 0; + } +}; // Get and set accessor with mismatched type annotations -var g1 = { get a() { return 4; }, set a(n) { } }; -var g2 = { get a() { return 4; }, set a(n) { } }; -var g3 = { get a() { return undefined; }, set a(n) { } }; +var g1 = { + get a() { + return 4; + }, + set a(n) { + } +}; +var g2 = { + get a() { + return 4; + }, + set a(n) { + } +}; +var g3 = { + get a() { + return undefined; + }, + set a(n) { + } +}; diff --git a/tests/baselines/reference/objectLiteralErrorsES3.js b/tests/baselines/reference/objectLiteralErrorsES3.js index 031a68fd109..f2910c37c3e 100644 --- a/tests/baselines/reference/objectLiteralErrorsES3.js +++ b/tests/baselines/reference/objectLiteralErrorsES3.js @@ -7,6 +7,19 @@ var e3 = { get a() { return ''; }, set a(n) { } }; //// [objectLiteralErrorsES3.js] -var e1 = { get a() { return 4; } }; -var e2 = { set a(n) { } }; -var e3 = { get a() { return ''; }, set a(n) { } }; +var e1 = { + get a() { + return 4; + } +}; +var e2 = { + set a(n) { + } +}; +var e3 = { + get a() { + return ''; + }, + set a(n) { + } +}; diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.js b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.js index 7f9bdc5c54a..b0f18da34df 100644 --- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.js +++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.js @@ -14,10 +14,31 @@ f2({ toString: (s: string) => s }) // error, missing property value from ArgsStr f2({ value: '', toString: (s) => s.uhhh }) // error //// [objectLiteralFunctionArgContextualTyping.js] -function f2(args) { } -f2({ hello: 1 }); // error -f2({ value: '' }); // missing toString satisfied by Object's member -f2({ value: '', what: 1 }); // missing toString satisfied by Object's member -f2({ toString: function (s) { return s; } }); // error, missing property value from ArgsString -f2({ toString: function (s) { return s; } }); // error, missing property value from ArgsString -f2({ value: '', toString: function (s) { return s.uhhh; } }); // error +function f2(args) { +} +f2({ + hello: 1 +}); // error +f2({ + value: '' +}); // missing toString satisfied by Object's member +f2({ + value: '', + what: 1 +}); // missing toString satisfied by Object's member +f2({ + toString: function (s) { + return s; + } +}); // error, missing property value from ArgsString +f2({ + toString: function (s) { + return s; + } +}); // error, missing property value from ArgsString +f2({ + value: '', + toString: function (s) { + return s.uhhh; + } +}); // error diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.js b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.js index 96d1106e1ff..73d22c8dd51 100644 --- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.js +++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.js @@ -14,10 +14,31 @@ f2({ toString: (s: string) => s }) f2({ value: '', toString: (s) => s.uhhh }) //// [objectLiteralFunctionArgContextualTyping2.js] -function f2(args) { } -f2({ hello: 1 }); -f2({ value: '' }); -f2({ value: '', what: 1 }); -f2({ toString: function (s) { return s; } }); -f2({ toString: function (s) { return s; } }); -f2({ value: '', toString: function (s) { return s.uhhh; } }); +function f2(args) { +} +f2({ + hello: 1 +}); +f2({ + value: '' +}); +f2({ + value: '', + what: 1 +}); +f2({ + toString: function (s) { + return s; + } +}); +f2({ + toString: function (s) { + return s; + } +}); +f2({ + value: '', + toString: function (s) { + return s.uhhh; + } +}); diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.js b/tests/baselines/reference/objectLiteralGettersAndSetters.js index d226c2c5569..bdaf0966e10 100644 --- a/tests/baselines/reference/objectLiteralGettersAndSetters.js +++ b/tests/baselines/reference/objectLiteralGettersAndSetters.js @@ -85,40 +85,139 @@ var getParamType3 = { //// [objectLiteralGettersAndSetters.js] // Get and set accessor with the same name -var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p; } }; -var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p; } }; -var sameName3a = { get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p; } }; -var sameName4a = { get ''() { return ''; }, set ""(n) { var p = n; var p; } }; -var sameName5a = { get '\t'() { return ''; }, set '\t'(n) { var p = n; var p; } }; -var sameName6a = { get 'a'() { return ''; }, set a(n) { var p = n; var p; } }; +var sameName1a = { + get 'a'() { + return ''; + }, + set a(n) { + var p = n; + var p; + } +}; +var sameName2a = { + get 0.0() { + return ''; + }, + set 0(n) { + var p = n; + var p; + } +}; +var sameName3a = { + get 0x20() { + return ''; + }, + set 3.2e1(n) { + var p = n; + var p; + } +}; +var sameName4a = { + get ''() { + return ''; + }, + set ""(n) { + var p = n; + var p; + } +}; +var sameName5a = { + get '\t'() { + return ''; + }, + set '\t'(n) { + var p = n; + var p; + } +}; +var sameName6a = { + get 'a'() { + return ''; + }, + set a(n) { + var p = n; + var p; + } +}; // PropertyName CallSignature{FunctionBody} is equivalent to PropertyName:function CallSignature{FunctionBody} -var callSig1 = { num: function (n) { return ''; } }; +var callSig1 = { + num: function (n) { + return ''; + } +}; var callSig1; -var callSig2 = { num: function (n) { return ''; } }; +var callSig2 = { + num: function (n) { + return ''; + } +}; var callSig2; -var callSig3 = { num: function (n) { return ''; } }; +var callSig3 = { + num: function (n) { + return ''; + } +}; var callSig3; // Get accessor only, type of the property is the annotated return type of the get accessor -var getter1 = { get x() { return undefined; } }; +var getter1 = { + get x() { + return undefined; + } +}; var getter1; // Get accessor only, type of the property is the inferred return type of the get accessor -var getter2 = { get x() { return ''; } }; +var getter2 = { + get x() { + return ''; + } +}; var getter2; // Set accessor only, type of the property is the param type of the set accessor -var setter1 = { set x(n) { } }; +var setter1 = { + set x(n) { + } +}; var setter1; // Set accessor only, type of the property is Any for an unannotated set accessor -var setter2 = { set x(n) { } }; +var setter2 = { + set x(n) { + } +}; var setter2; var anyVar; // Get and set accessor with matching type annotations -var sameType1 = { get x() { return undefined; }, set x(n) { } }; -var sameType2 = { get x() { return undefined; }, set x(n) { } }; -var sameType3 = { get x() { return undefined; }, set x(n) { } }; -var sameType4 = { get x() { return undefined; }, set x(n) { } }; +var sameType1 = { + get x() { + return undefined; + }, + set x(n) { + } +}; +var sameType2 = { + get x() { + return undefined; + }, + set x(n) { + } +}; +var sameType3 = { + get x() { + return undefined; + }, + set x(n) { + } +}; +var sameType4 = { + get x() { + return undefined; + }, + set x(n) { + } +}; // Type of unannotated get accessor return type is the type annotation of the set accessor param var setParamType1 = { - set n(x) { }, + set n(x) { + }, get n() { return function (t) { var p; @@ -133,7 +232,8 @@ var setParamType2 = { var p = t; }; }, - set n(x) { } + set n(x) { + } }; // Type of unannotated set accessor parameter is the return type annotation of the get accessor var getParamType1 = { @@ -141,10 +241,14 @@ var getParamType1 = { var y = x; var y; }, - get n() { return ''; } + get n() { + return ''; + } }; var getParamType2 = { - get n() { return ''; }, + get n() { + return ''; + }, set n(x) { var y = x; var y; @@ -152,7 +256,9 @@ var getParamType2 = { }; // Type of unannotated accessors is the inferred return type of the get accessor var getParamType3 = { - get n() { return ''; }, + get n() { + return ''; + }, set n(x) { var y = x; var y; diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.js b/tests/baselines/reference/objectLiteralIndexerErrors.js index 5e0159015d5..2c619743094 100644 --- a/tests/baselines/reference/objectLiteralIndexerErrors.js +++ b/tests/baselines/reference/objectLiteralIndexerErrors.js @@ -18,5 +18,11 @@ o1 = { x: c, 0: a }; // string indexer is any, number indexer is A var a; var b; var c; -var o1 = { x: b, 0: a }; // both indexers are A -o1 = { x: c, 0: a }; // string indexer is any, number indexer is A +var o1 = { + x: b, + 0: a +}; // both indexers are A +o1 = { + x: c, + 0: a +}; // string indexer is any, number indexer is A diff --git a/tests/baselines/reference/objectLiteralIndexers.js b/tests/baselines/reference/objectLiteralIndexers.js index c36cbfc7571..97bb3ee78cc 100644 --- a/tests/baselines/reference/objectLiteralIndexers.js +++ b/tests/baselines/reference/objectLiteralIndexers.js @@ -19,6 +19,15 @@ o1 = { x: c, 0: b }; // string indexer is any, number indexer is B var a; var b; var c; -var o1 = { x: a, 0: b }; // string indexer is A, number indexer is B -o1 = { x: b, 0: c }; // both indexers are any -o1 = { x: c, 0: b }; // string indexer is any, number indexer is B +var o1 = { + x: a, + 0: b +}; // string indexer is A, number indexer is B +o1 = { + x: b, + 0: c +}; // both indexers are any +o1 = { + x: c, + 0: b +}; // string indexer is any, number indexer is B diff --git a/tests/baselines/reference/objectLiteralMemberWithModifiers1.js b/tests/baselines/reference/objectLiteralMemberWithModifiers1.js index a4389d49bdf..998bc292740 100644 --- a/tests/baselines/reference/objectLiteralMemberWithModifiers1.js +++ b/tests/baselines/reference/objectLiteralMemberWithModifiers1.js @@ -2,4 +2,7 @@ var v = { public foo() { } } //// [objectLiteralMemberWithModifiers1.js] -var v = { foo: function () { } }; +var v = { + foo: function () { + } +}; diff --git a/tests/baselines/reference/objectLiteralMemberWithModifiers2.js b/tests/baselines/reference/objectLiteralMemberWithModifiers2.js index ffe2b6678df..d8cb4a3ad49 100644 --- a/tests/baselines/reference/objectLiteralMemberWithModifiers2.js +++ b/tests/baselines/reference/objectLiteralMemberWithModifiers2.js @@ -2,4 +2,7 @@ var v = { public get foo() { } } //// [objectLiteralMemberWithModifiers2.js] -var v = { get foo() { } }; +var v = { + get foo() { + } +}; diff --git a/tests/baselines/reference/objectLiteralMemberWithQuestionMark1.js b/tests/baselines/reference/objectLiteralMemberWithQuestionMark1.js index 62f7a6eefe2..539c7a1cca9 100644 --- a/tests/baselines/reference/objectLiteralMemberWithQuestionMark1.js +++ b/tests/baselines/reference/objectLiteralMemberWithQuestionMark1.js @@ -2,4 +2,7 @@ var v = { foo?() { } } //// [objectLiteralMemberWithQuestionMark1.js] -var v = { foo: function () { } }; +var v = { + foo: function () { + } +}; diff --git a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js index d6a8579be04..b8cd54803a5 100644 --- a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js +++ b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js @@ -2,4 +2,6 @@ var v = { foo(); } //// [objectLiteralMemberWithoutBlock1.js] -var v = { foo: function () { } }; +var v = { + foo: function () { } +}; diff --git a/tests/baselines/reference/objectLiteralParameterResolution.js b/tests/baselines/reference/objectLiteralParameterResolution.js index 5912a2229b1..1d680623600 100644 --- a/tests/baselines/reference/objectLiteralParameterResolution.js +++ b/tests/baselines/reference/objectLiteralParameterResolution.js @@ -23,7 +23,9 @@ var s = $.extend({ success: wrapSuccessCallback(requestContext, callback), error: wrapErrorCallback(requestContext, errorCallback), dataType: "json", - converters: { "text json": "" }, + converters: { + "text json": "" + }, traditional: true, timeout: 12 }, ""); diff --git a/tests/baselines/reference/objectLiteralReferencingInternalProperties.js b/tests/baselines/reference/objectLiteralReferencingInternalProperties.js index 793fa0c588a..1215dda92a7 100644 --- a/tests/baselines/reference/objectLiteralReferencingInternalProperties.js +++ b/tests/baselines/reference/objectLiteralReferencingInternalProperties.js @@ -2,4 +2,7 @@ var a = { b: 10, c: b }; // Should give error for attempting to reference b. //// [objectLiteralReferencingInternalProperties.js] -var a = { b: 10, c: b }; // Should give error for attempting to reference b. +var a = { + b: 10, + c: b +}; // Should give error for attempting to reference b. diff --git a/tests/baselines/reference/objectLiteralShorthandProperties.js b/tests/baselines/reference/objectLiteralShorthandProperties.js index bc18ecfb948..776b2bbe454 100644 --- a/tests/baselines/reference/objectLiteralShorthandProperties.js +++ b/tests/baselines/reference/objectLiteralShorthandProperties.js @@ -32,7 +32,8 @@ var x3 = { a: 0, b: b, c: c, - d: function () { }, + d: function () { + }, x3: x3, parent: x3 }; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.js b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.js index 251098eb6c8..f9b1e2caa9a 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignment.js @@ -17,12 +17,30 @@ var person3: { name: string; id:number } = bar("Hello", 5); //// [objectLiteralShorthandPropertiesAssignment.js] var id = 10000; var name = "my name"; -var person = { name: name, id: id }; -function foo(obj) { } +var person = { + name: name, + id: id +}; +function foo(obj) { +} ; -function bar(name, id) { return { name: name, id: id }; } -function bar1(name, id) { return { name: name }; } -function baz(name, id) { return { name: name, id: id }; } +function bar(name, id) { + return { + name: name, + id: id + }; +} +function bar1(name, id) { + return { + name: name + }; +} +function baz(name, id) { + return { + name: name, + id: id + }; +} foo(person); var person1 = bar("Hello", 5); var person2 = bar("Hello", 5); diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.js b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.js index 247ec56d127..4b21d8052ea 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentES6.js @@ -17,12 +17,30 @@ var person3: { name: string; id: number } = bar("Hello", 5); //// [objectLiteralShorthandPropertiesAssignmentES6.js] var id = 10000; var name = "my name"; -var person = { name, id }; -function foo(obj) { } +var person = { + name, + id +}; +function foo(obj) { +} ; -function bar(name, id) { return { name, id }; } -function bar1(name, id) { return { name }; } -function baz(name, id) { return { name, id }; } +function bar(name, id) { + return { + name, + id + }; +} +function bar1(name, id) { + return { + name + }; +} +function baz(name, id) { + return { + name, + id + }; +} foo(person); var person1 = bar("Hello", 5); var person2 = bar("Hello", 5); diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js index 8e2d7f80356..4f99576c30e 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js @@ -13,9 +13,21 @@ bar({ name, id }); // error //// [objectLiteralShorthandPropertiesAssignmentError.js] var id = 10000; var name = "my name"; -var person = { name: name, id: id }; // error +var person = { + name: name, + id: id +}; // error var person1 = name, id; ; // error: can't use short-hand property assignment in type position -function foo(name, id) { return { name: name, id: id }; } // error -function bar(obj) { } -bar({ name: name, id: id }); // error +function foo(name, id) { + return { + name: name, + id: id + }; +} // error +function bar(obj) { +} +bar({ + name: name, + id: id +}); // error diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js index 71449746add..1ccdb274865 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js @@ -11,9 +11,22 @@ var person2: { name: string, id: number } = bar("hello", 5); //// [objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js] var id = 10000; var name = "my name"; -var person = { name: name, id: id }; // error -function bar(name, id) { return { name: name, id: id }; } // error -function foo(name, id) { return { name: name, id: id }; } // error +var person = { + name: name, + id: id +}; // error +function bar(name, id) { + return { + name: name, + id: id + }; +} // error +function foo(name, id) { + return { + name: name, + id: id + }; +} // error var person1 = name, id; ; // error : Can't use shorthand in the type position var person2 = bar("hello", 5); diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesES6.js b/tests/baselines/reference/objectLiteralShorthandPropertiesES6.js index 9b19bdc8b5e..c65087a8da7 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesES6.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesES6.js @@ -32,7 +32,8 @@ var x3 = { a: 0, b, c, - d() { }, + d() { + }, x3, parent: x3 }; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.js b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.js index b72f0351b9c..3c457178b3e 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.js @@ -25,8 +25,10 @@ var v = { class }; // error var y = { "stringLiteral": , 42: , - get e() { }, - set f() { }, + get e() { + }, + set f() { + }, this: , super: , var: , @@ -35,7 +37,13 @@ var y = { }; var x = { a: .b, - a: ["ss"], - a: [1] + a: [ + "ss" + ], + a: [ + 1 + ] }; -var v = { class: }; // error +var v = { + class: +}; // error diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.js b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.js index 860abc24b19..65eed2eace7 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument.js @@ -13,7 +13,14 @@ var obj = { name: name, id: id }; //// [objectLiteralShorthandPropertiesFunctionArgument.js] var id = 10000; var name = "my name"; -var person = { name: name, id: id }; -function foo(p) { } +var person = { + name: name, + id: id +}; +function foo(p) { +} foo(person); -var obj = { name: name, id: id }; +var obj = { + name: name, + id: id +}; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.js b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.js index 7e9d2e7ca8b..3f396091d05 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesFunctionArgument2.js @@ -11,6 +11,10 @@ foo(person); // error //// [objectLiteralShorthandPropertiesFunctionArgument2.js] var id = 10000; var name = "my name"; -var person = { name: name, id: id }; -function foo(p) { } +var person = { + name: name, + id: id +}; +function foo(p) { +} foo(person); // error diff --git a/tests/baselines/reference/objectLiteralWithSemicolons1.js b/tests/baselines/reference/objectLiteralWithSemicolons1.js index b820b14428c..85aa5f268c5 100644 --- a/tests/baselines/reference/objectLiteralWithSemicolons1.js +++ b/tests/baselines/reference/objectLiteralWithSemicolons1.js @@ -2,4 +2,8 @@ var v = { a; b; c } //// [objectLiteralWithSemicolons1.js] -var v = { a: , b: , c: c }; +var v = { + a: , + b: , + c: c +}; diff --git a/tests/baselines/reference/objectLiteralWithSemicolons4.js b/tests/baselines/reference/objectLiteralWithSemicolons4.js index a01d52548ee..9e1e3dea4b9 100644 --- a/tests/baselines/reference/objectLiteralWithSemicolons4.js +++ b/tests/baselines/reference/objectLiteralWithSemicolons4.js @@ -5,4 +5,5 @@ var v = { //// [objectLiteralWithSemicolons4.js] var v = { - a: }; + a: +}; diff --git a/tests/baselines/reference/objectLiteralWithSemicolons5.js b/tests/baselines/reference/objectLiteralWithSemicolons5.js index 1c9c4ddf544..36fef30ad75 100644 --- a/tests/baselines/reference/objectLiteralWithSemicolons5.js +++ b/tests/baselines/reference/objectLiteralWithSemicolons5.js @@ -2,4 +2,10 @@ var v = { foo() { }; a: b; get baz() { }; } //// [objectLiteralWithSemicolons5.js] -var v = { foo: function () { }, a: b, get baz() { } }; +var v = { + foo: function () { + }, + a: b, + get baz() { + } +}; diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js index 16268c1331c..fa41e57e22e 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js @@ -76,7 +76,8 @@ var B = (function (_super) { var C = (function () { function C() { } - C.prototype.valueOf = function () { }; + C.prototype.valueOf = function () { + }; return C; })(); var c; @@ -90,7 +91,8 @@ var r2b = i.data; var r2c = r2b['hm']; // should be 'Object' var r2d = i['hm']; // should be 'any' var a = { - valueOf: function () { }, + valueOf: function () { + }, data: new B() }; var r3 = a.valueOf(); diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObject.js b/tests/baselines/reference/objectTypeHidingMembersOfObject.js index 291cc1858fd..113329cf8b6 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObject.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.js @@ -32,7 +32,8 @@ var r4: void = b.valueOf(); var C = (function () { function C() { } - C.prototype.valueOf = function () { }; + C.prototype.valueOf = function () { + }; return C; })(); var c; @@ -40,7 +41,8 @@ var r1 = c.valueOf(); var i; var r2 = i.valueOf(); var a = { - valueOf: function () { } + valueOf: function () { + } }; var r3 = a.valueOf(); var b; diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js index 5ae0c2fb1bb..93d985f7987 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js @@ -29,14 +29,16 @@ i = o; // ok var C = (function () { function C() { } - C.prototype.toString = function () { }; + C.prototype.toString = function () { + }; return C; })(); var c; o = c; // error c = o; // ok var a = { - toString: function () { } + toString: function () { + } }; o = a; // error a = o; // ok diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js index 7a2b5e2ec2f..b8a5aa87aef 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js @@ -29,14 +29,17 @@ i = o; // error var C = (function () { function C() { } - C.prototype.toString = function () { return 1; }; + C.prototype.toString = function () { + return 1; + }; return C; })(); var c; o = c; // error c = o; // error var a = { - toString: function () { } + toString: function () { + } }; o = a; // error a = o; // ok diff --git a/tests/baselines/reference/objectTypesIdentity.js b/tests/baselines/reference/objectTypesIdentity.js index 7eccee23651..b757c18ac4f 100644 --- a/tests/baselines/reference/objectTypesIdentity.js +++ b/tests/baselines/reference/objectTypesIdentity.js @@ -106,21 +106,40 @@ var C = (function () { return C; })(); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentity2.js b/tests/baselines/reference/objectTypesIdentity2.js index adbb9caeada..bdd20d8ac5e 100644 --- a/tests/baselines/reference/objectTypesIdentity2.js +++ b/tests/baselines/reference/objectTypesIdentity2.js @@ -87,15 +87,28 @@ var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -var b = { foo: 0 /* A */ }; -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + foo: 0 /* A */ +}; +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js index 0c6952291f9..3465085bdaf 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js index 43473d88e0a..5a45e4b5af0 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.js index f4cfc8dc605..289ba25bf6e 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.js @@ -42,10 +42,17 @@ function foo15(x: any) { } //// [objectTypesIdentityWithCallSignatures3.js] // object types are identical structurally var a; -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo13(x) { } -function foo14(x) { } -function foo14b(x) { } -function foo15(x) { } +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo14b(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js index 498867f0a02..c258bc277d7 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.js index 98b17767b75..fe84b3e6b92 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.js @@ -46,11 +46,19 @@ function foo15(x: any) { } //// [objectTypesIdentityWithCallSignaturesDifferingParamCounts2.js] // object types are identical structurally var a; -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo13(x) { } -function foo14(x) { } -function foo14b(x) { } -function foo15(x) { } +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo14b(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js index 54400ad81d1..29cb6f3cd54 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js @@ -121,41 +121,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; var b = { - foo: function (x) { return ''; } + foo: function (x) { + return ''; + } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.js b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.js index ca9db28223a..9f16153da37 100644 --- a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.js +++ b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.js @@ -15,4 +15,5 @@ function foo(x: B); // error after constraints above made illegal function foo(x: any) { } //// [objectTypesIdentityWithComplexConstraints.js] -function foo(x) { } +function foo(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js index 91208da5b90..caf28cd05de 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js @@ -105,19 +105,35 @@ var C = (function () { return C; })(); var a; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo15(x) { } +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js index 87067b6be28..641524de5a6 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js @@ -91,18 +91,36 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return ''; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + new: function (x) { + return ''; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js index c95159ed997..171dd5c3513 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js @@ -91,18 +91,36 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return ''; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + new: function (x) { + return ''; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js index c8bed1a47ab..f366e79341f 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js index 6ef5d15fd98..9d184204345 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var a; -var b = { foo: function (x, y) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js index 2b83064afed..b5b7f6414e0 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js index 1f9c5fa5256..cc1957eef3d 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js @@ -121,47 +121,80 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var D = (function () { function D() { } - D.prototype.foo = function (x, y) { return null; }; + D.prototype.foo = function (x, y) { + return null; + }; return D; })(); var a; -var b = { foo: function (x, y) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo6c(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo6c(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js index 21106b56b00..9774cbd2b41 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js @@ -140,47 +140,80 @@ var Two = (function () { var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var D = (function () { function D() { } - D.prototype.foo = function (x, y) { return null; }; + D.prototype.foo = function (x, y) { + return null; + }; return D; })(); var a; -var b = { foo: function (x, y) { return ''; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo6c(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return ''; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo6c(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js index 99188347d36..ac686014aa6 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return null; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return null; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js index 10d72bde0b3..e25e379bde8 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return null; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return null; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js index 5a20dfdecb6..48e98f904b0 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.js index 6bfd019dc86..944fb7d9846 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.js @@ -43,10 +43,17 @@ function foo15(x: any) { } //// [objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.js] // object types are identical structurally var a; -function foo1(x) { } -function foo2(x) { } -function foo3(x) { } -function foo13(x) { } -function foo14(x) { } -function foo14b(x) { } -function foo15(x) { } +function foo1(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo14b(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js index ec9c786b890..518bbe550ec 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js @@ -105,39 +105,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x) { return null; }; + A.prototype.foo = function (x) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x) { return null; }; + B.prototype.foo = function (x) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x) { return null; }; + C.prototype.foo = function (x) { + return null; + }; return C; })(); var a; -var b = { foo: function (x) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js index a4af2bc820e..f84341e589b 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var a; -var b = { foo: function (x, y) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js index 28b2f978b55..ea385109821 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var a; -var b = { foo: function (x, y) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js index de9b4859fa1..34acdef8599 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js @@ -109,39 +109,68 @@ function foo15(x: any) { } var A = (function () { function A() { } - A.prototype.foo = function (x, y) { return null; }; + A.prototype.foo = function (x, y) { + return null; + }; return A; })(); var B = (function () { function B() { } - B.prototype.foo = function (x, y) { return null; }; + B.prototype.foo = function (x, y) { + return null; + }; return B; })(); var C = (function () { function C() { } - C.prototype.foo = function (x, y) { return null; }; + C.prototype.foo = function (x, y) { + return null; + }; return C; })(); var a; -var b = { foo: function (x, y) { return x; } }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + foo: function (x, y) { + return x; + } +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js index fdc67d4b84a..b252fc7f8fe 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js @@ -92,17 +92,34 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return ''; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x) { + return ''; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js index 11dcdf0a609..e6450471a47 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js @@ -109,19 +109,38 @@ var D = (function () { return D; })(); var a; -var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5c(x) { } -function foo6c(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x, y) { + return ''; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5c(x) { +} +function foo6c(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js index 5c6f59eef24..0a276be9f7a 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js @@ -128,19 +128,38 @@ var D = (function () { return D; })(); var a; -var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5c(x) { } -function foo6c(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x, y) { + return ''; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5c(x) { +} +function foo6c(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js index 556d1bcaee0..e1c64ed0ec6 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js @@ -99,19 +99,38 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return null; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + new: function (x) { + return null; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js index 68c32cb0e71..ade431026d5 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js @@ -95,18 +95,36 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return null; } }; // not a construct signature, function called new -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } +var b = { + new: function (x) { + return null; + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js index 789e02d2d7b..014b4126f2c 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js @@ -87,17 +87,34 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return x; } }; -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x) { + return x; + } +}; +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js index 5a501d05834..d30a3a798a2 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js @@ -87,17 +87,34 @@ var C = (function () { return C; })(); var a; -var b = { new: function (x) { return new C(x); } }; -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x) { + return new C(x); + } +}; +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js index 685a8441d97..f71ef509ca9 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js @@ -91,17 +91,34 @@ var C = (function () { 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) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x, y) { + return new C(x, y); + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js index f16d69acaa1..00994a57fc8 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js @@ -91,17 +91,34 @@ var C = (function () { 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) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x, y) { + return new C(x, y); + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js index 25c628e9e15..572a9db5d33 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js @@ -91,17 +91,34 @@ var C = (function () { 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) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo12b(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + new: function (x, y) { + return new C(x, y); + } +}; // not a construct signature, function called new +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo12b(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js index 1dc6505456a..e49566c5531 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js @@ -160,27 +160,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js index e2fd1b99bfa..ae00306f397 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js @@ -175,27 +175,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: null }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: null +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js index 11d64efc9d5..cc9d605153c 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js @@ -160,27 +160,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.js b/tests/baselines/reference/objectTypesIdentityWithOptionality.js index 2a61cda1bb9..4fe529a1342 100644 --- a/tests/baselines/reference/objectTypesIdentityWithOptionality.js +++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.js @@ -74,13 +74,24 @@ var C = (function () { return C; })(); var a; -var b = { foo: '' }; -function foo2(x) { } -function foo3(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo10(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + foo: '' +}; +function foo2(x) { +} +function foo3(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo10(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.js b/tests/baselines/reference/objectTypesIdentityWithPrivates.js index 5c8a0afed72..e8072e7f186 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js +++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js @@ -158,27 +158,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js index 36c3e67c70e..4e62e7b551a 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js +++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js @@ -58,11 +58,17 @@ var D = (function (_super) { } return D; })(C); -function foo1(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } +function foo1(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} var r = foo4(new C()); var r = foo4(new D()); -function foo5(x) { } -function foo6(x) { } +function foo5(x) { +} +function foo6(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.js b/tests/baselines/reference/objectTypesIdentityWithPublics.js index 7c36eb48f2c..59b6e315c10 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPublics.js +++ b/tests/baselines/reference/objectTypesIdentityWithPublics.js @@ -106,21 +106,40 @@ var C = (function () { return C; })(); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js index 37c5537aa4b..f9abb678959 100644 --- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js +++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js @@ -160,27 +160,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: '' }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: '' +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js index e90dc8598e4..6bb5369122a 100644 --- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js +++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js @@ -175,27 +175,52 @@ var PB = (function (_super) { return PB; })(B); var a; -var b = { foo: null }; -function foo1(x) { } -function foo1b(x) { } -function foo1c(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } -function foo5b(x) { } -function foo5c(x) { } -function foo5d(x) { } -function foo6(x) { } -function foo7(x) { } -function foo8(x) { } -function foo9(x) { } -function foo10(x) { } -function foo11(x) { } -function foo11b(x) { } -function foo11c(x) { } -function foo12(x) { } -function foo13(x) { } -function foo14(x) { } -function foo15(x) { } -function foo16(x) { } +var b = { + foo: null +}; +function foo1(x) { +} +function foo1b(x) { +} +function foo1c(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} +function foo5b(x) { +} +function foo5c(x) { +} +function foo5d(x) { +} +function foo6(x) { +} +function foo7(x) { +} +function foo8(x) { +} +function foo9(x) { +} +function foo10(x) { +} +function foo11(x) { +} +function foo11b(x) { +} +function foo11c(x) { +} +function foo12(x) { +} +function foo13(x) { +} +function foo14(x) { +} +function foo15(x) { +} +function foo16(x) { +} diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js index cf0d113c244..3faa10447b6 100644 --- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js +++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js @@ -42,5 +42,7 @@ var C2 = (function () { return C2; })(); var b = { - x: function () { }, 1: // error + x: function () { + }, + 1: // error }; diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.js b/tests/baselines/reference/optionalAccessorsInInterface1.js index dd274b133e5..cf6a795b6bd 100644 --- a/tests/baselines/reference/optionalAccessorsInInterface1.js +++ b/tests/baselines/reference/optionalAccessorsInInterface1.js @@ -17,5 +17,13 @@ defineMyProperty2({}, "name", { get: function () { return 5; } }); //// [optionalAccessorsInInterface1.js] -defineMyProperty({}, "name", { get: function () { return 5; } }); -defineMyProperty2({}, "name", { get: function () { return 5; } }); +defineMyProperty({}, "name", { + get: function () { + return 5; + } +}); +defineMyProperty2({}, "name", { + get: function () { + return 5; + } +}); diff --git a/tests/baselines/reference/optionalBindingParameters1.js b/tests/baselines/reference/optionalBindingParameters1.js index 536cb1e567a..e2286bf40bd 100644 --- a/tests/baselines/reference/optionalBindingParameters1.js +++ b/tests/baselines/reference/optionalBindingParameters1.js @@ -12,5 +12,13 @@ foo([false, 0, ""]); function foo(_a) { var x = _a[0], y = _a[1], z = _a[2]; } -foo(["", 0, false]); -foo([false, 0, ""]); +foo([ + "", + 0, + false +]); +foo([ + false, + 0, + "" +]); diff --git a/tests/baselines/reference/optionalBindingParameters2.js b/tests/baselines/reference/optionalBindingParameters2.js index 04e1138561a..f9c55ebd4a3 100644 --- a/tests/baselines/reference/optionalBindingParameters2.js +++ b/tests/baselines/reference/optionalBindingParameters2.js @@ -12,5 +12,13 @@ foo({ x: false, y: 0, z: "" }); function foo(_a) { var x = _a.x, y = _a.y, z = _a.z; } -foo({ x: "", y: 0, z: false }); -foo({ x: false, y: 0, z: "" }); +foo({ + x: "", + y: 0, + z: false +}); +foo({ + x: false, + y: 0, + z: "" +}); diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads1.js b/tests/baselines/reference/optionalBindingParametersInOverloads1.js index 3658efa72c6..40f60108aa7 100644 --- a/tests/baselines/reference/optionalBindingParametersInOverloads1.js +++ b/tests/baselines/reference/optionalBindingParametersInOverloads1.js @@ -16,5 +16,13 @@ function foo() { rest[_i - 0] = arguments[_i]; } } -foo(["", 0, false]); -foo([false, 0, ""]); +foo([ + "", + 0, + false +]); +foo([ + false, + 0, + "" +]); diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads2.js b/tests/baselines/reference/optionalBindingParametersInOverloads2.js index 1ddfdae4f07..18e4c10fc93 100644 --- a/tests/baselines/reference/optionalBindingParametersInOverloads2.js +++ b/tests/baselines/reference/optionalBindingParametersInOverloads2.js @@ -16,5 +16,13 @@ function foo() { rest[_i - 0] = arguments[_i]; } } -foo({ x: "", y: 0, z: false }); -foo({ x: false, y: 0, z: "" }); +foo({ + x: "", + y: 0, + z: false +}); +foo({ + x: false, + y: 0, + z: "" +}); diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.js b/tests/baselines/reference/optionalConstructorArgInSuper.js index 5204d7f8307..45c0e032cd8 100644 --- a/tests/baselines/reference/optionalConstructorArgInSuper.js +++ b/tests/baselines/reference/optionalConstructorArgInSuper.js @@ -20,7 +20,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base(opt) { } - Base.prototype.foo = function (other) { }; + Base.prototype.foo = function (other) { + }; return Base; })(); var Derived = (function (_super) { diff --git a/tests/baselines/reference/optionalFunctionArgAssignability.js b/tests/baselines/reference/optionalFunctionArgAssignability.js index c82a47e88da..bca42060066 100644 --- a/tests/baselines/reference/optionalFunctionArgAssignability.js +++ b/tests/baselines/reference/optionalFunctionArgAssignability.js @@ -9,6 +9,10 @@ a = b; // error because number is not assignable to string //// [optionalFunctionArgAssignability.js] -var a = function then(onFulfill, onReject) { return null; }; -var b = function then(onFulFill, onReject) { return null; }; +var a = function then(onFulfill, onReject) { + return null; +}; +var b = function then(onFulFill, onReject) { + return null; +}; a = b; // error because number is not assignable to string diff --git a/tests/baselines/reference/optionalParamArgsTest.js b/tests/baselines/reference/optionalParamArgsTest.js index 5598f8d0872..6837c024ffb 100644 --- a/tests/baselines/reference/optionalParamArgsTest.js +++ b/tests/baselines/reference/optionalParamArgsTest.js @@ -139,8 +139,12 @@ var C1 = (function () { if (p === void 0) { p = 0; } this.n = 0; } - C1.prototype.C1M1 = function () { return 0; }; // returning C1M1A1 will result in "Unresolved symbol C1M1A1" - C1.prototype.C1M2 = function (C1M2A1) { return C1M2A1; }; // will return C1M1A2 without complaint + C1.prototype.C1M1 = function () { + return 0; + }; // returning C1M1A1 will result in "Unresolved symbol C1M1A1" + C1.prototype.C1M2 = function (C1M2A1) { + return C1M2A1; + }; // will return C1M1A2 without complaint // C1M3 contains all optional parameters C1.prototype.C1M3 = function (C1M3A1, C1M3A2) { if (C1M3A1 === void 0) { C1M3A1 = 0; } @@ -148,7 +152,9 @@ var C1 = (function () { return C1M3A1 + C1M3A2; }; // C1M4 contains a mix of optional and non-optional parameters - C1.prototype.C1M4 = function (C1M4A1, C1M4A2) { return C1M4A1 + C1M4A2; }; + C1.prototype.C1M4 = function (C1M4A1, C1M4A2) { + return C1M4A1 + C1M4A2; + }; C1.prototype.C1M5 = function (C1M5A1, C1M5A2, C1M5A3) { if (C1M5A2 === void 0) { C1M5A2 = 0; } return C1M5A1 + C1M5A2; @@ -169,22 +175,34 @@ var C2 = (function (_super) { } return C2; })(C1); -function F1() { return 0; } -function F2(F2A1) { return F2A1; } +function F1() { + return 0; +} +function F2(F2A1) { + return F2A1; +} function F3(F3A1, F3A2) { if (F3A1 === void 0) { F3A1 = 0; } if (F3A2 === void 0) { F3A2 = F3A1; } return F3A1 + F3A2; } -function F4(F4A1, F4A2) { return F4A1 + F4A2; } -var L1 = function () { return 0; }; -var L2 = function (L2A1) { return L2A1; }; +function F4(F4A1, F4A2) { + return F4A1 + F4A2; +} +var L1 = function () { + return 0; +}; +var L2 = function (L2A1) { + return L2A1; +}; var L3 = function (L3A1, L3A2) { if (L3A1 === void 0) { L3A1 = 0; } if (L3A2 === void 0) { L3A2 = L3A1; } return L3A1 + L3A2; }; -var L4 = function (L4A1, L4A2) { return L4A1 + L4A2; }; +var L4 = function (L4A1, L4A2) { + return L4A1 + L4A2; +}; var c1o1 = new C1(5); var i1o1 = new C1(5); // Valid @@ -246,6 +264,17 @@ function fnOpt1(id, children, expectedPath, isRoot) { if (children === void 0) { children = []; } if (expectedPath === void 0) { expectedPath = []; } } -function fnOpt2(id, children, expectedPath, isRoot) { } -fnOpt1(1, [2, 3], [1], true); -fnOpt2(1, [2, 3], [1], true); +function fnOpt2(id, children, expectedPath, isRoot) { +} +fnOpt1(1, [ + 2, + 3 +], [ + 1 +], true); +fnOpt2(1, [ + 2, + 3 +], [ + 1 +], true); diff --git a/tests/baselines/reference/optionalParamInOverride.js b/tests/baselines/reference/optionalParamInOverride.js index cfdfce368d0..0a094c6534c 100644 --- a/tests/baselines/reference/optionalParamInOverride.js +++ b/tests/baselines/reference/optionalParamInOverride.js @@ -17,7 +17,8 @@ var __extends = this.__extends || function (d, b) { var Z = (function () { function Z() { } - Z.prototype.func = function () { }; + Z.prototype.func = function () { + }; return Z; })(); var Y = (function (_super) { @@ -25,6 +26,7 @@ var Y = (function (_super) { function Y() { _super.apply(this, arguments); } - Y.prototype.func = function (value) { }; + Y.prototype.func = function (value) { + }; return Y; })(Z); diff --git a/tests/baselines/reference/optionalPropertiesTest.js b/tests/baselines/reference/optionalPropertiesTest.js index 617db8d6185..3c68b90fdd8 100644 --- a/tests/baselines/reference/optionalPropertiesTest.js +++ b/tests/baselines/reference/optionalPropertiesTest.js @@ -43,10 +43,21 @@ test10_1 = test10_2; //// [optionalPropertiesTest.js] var x; var foo; -foo = { id: 1234 }; // Ok -foo = { id: 1234, name: "test" }; // Ok -foo = { name: "test" }; // Error, id missing -foo = { id: 1234, print: function () { } }; // Ok +foo = { + id: 1234 +}; // Ok +foo = { + id: 1234, + name: "test" +}; // Ok +foo = { + name: "test" +}; // Error, id missing +foo = { + id: 1234, + print: function () { + } +}; // Ok var s = foo.name || "default"; if (foo.print !== undefined) foo.print(); @@ -58,11 +69,21 @@ var test1 = {}; var test2 = {}; var test3 = {}; var test4 = {}; -var test5 = { M: function () { } }; -var test6 = { M: 5 }; -var test7 = { M: function () { } }; +var test5 = { + M: function () { + } +}; +var test6 = { + M: 5 +}; +var test7 = { + M: function () { + } +}; test7 = {}; -var test8 = { M: 5 }; +var test8 = { + M: 5 +}; test8 = {}; var test9_1; var test9_2; diff --git a/tests/baselines/reference/optionalSetterParam.js b/tests/baselines/reference/optionalSetterParam.js index 1632f33be9f..4b9b7f01360 100644 --- a/tests/baselines/reference/optionalSetterParam.js +++ b/tests/baselines/reference/optionalSetterParam.js @@ -10,7 +10,8 @@ var foo = (function () { function foo() { } Object.defineProperty(foo.prototype, "bar", { - set: function (param) { }, + set: function (param) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js index 9a04ea28fba..66129a5d0be 100644 --- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js +++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.js @@ -27,7 +27,13 @@ w({ s: "", n: 0 }).toLowerCase(); //// [orderMattersForSignatureGroupIdentity.js] var v; var v; -v({ s: "", n: 0 }).toLowerCase(); +v({ + s: "", + n: 0 +}).toLowerCase(); var w; var w; -w({ s: "", n: 0 }).toLowerCase(); +w({ + s: "", + n: 0 +}).toLowerCase(); diff --git a/tests/baselines/reference/overEagerReturnTypeSpecialization.js b/tests/baselines/reference/overEagerReturnTypeSpecialization.js index 90fcc388b76..3d91a6f2fa6 100644 --- a/tests/baselines/reference/overEagerReturnTypeSpecialization.js +++ b/tests/baselines/reference/overEagerReturnTypeSpecialization.js @@ -16,7 +16,15 @@ var r2: I1 = v1.func(num => num.toString()) // Correctly returns an I1 - .func(function (str) { return str.length; }); // should error -var r2 = v1.func(function (num) { return num.toString(); }) // Correctly returns an I1 - .func(function (str) { return str.length; }); // should be ok +var r1 = v1.func(function (num) { + return num.toString(); +}) // Correctly returns an I1 +.func(function (str) { + return str.length; +}); // should error +var r2 = v1.func(function (num) { + return num.toString(); +}) // Correctly returns an I1 +.func(function (str) { + return str.length; +}); // should be ok diff --git a/tests/baselines/reference/overloadAssignmentCompat.js b/tests/baselines/reference/overloadAssignmentCompat.js index 2d4bd931844..f6767f6f33e 100644 --- a/tests/baselines/reference/overloadAssignmentCompat.js +++ b/tests/baselines/reference/overloadAssignmentCompat.js @@ -65,5 +65,7 @@ function attr2(nameOrMap, value) { return "s"; } } -function foo() { return "a"; } +function foo() { + return "a"; +} ; diff --git a/tests/baselines/reference/overloadCallTest.js b/tests/baselines/reference/overloadCallTest.js index 38930b7aea3..f7eb97fc9eb 100644 --- a/tests/baselines/reference/overloadCallTest.js +++ b/tests/baselines/reference/overloadCallTest.js @@ -18,7 +18,9 @@ class foo { //// [overloadCallTest.js] var foo = (function () { function foo() { - function bar(foo) { return "foo"; } + function bar(foo) { + return "foo"; + } ; var test = bar("test"); var goo = bar(); diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js index 3f9f7eb1415..8cb537c4410 100644 --- a/tests/baselines/reference/overloadModifiersMustAgree.js +++ b/tests/baselines/reference/overloadModifiersMustAgree.js @@ -19,7 +19,9 @@ interface I { var baz = (function () { function baz() { } - baz.prototype.foo = function (bar) { }; // error - access modifiers do not agree + baz.prototype.foo = function (bar) { + }; // error - access modifiers do not agree return baz; })(); -function bar(s) { } +function bar(s) { +} diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.js b/tests/baselines/reference/overloadOnConstConstraintChecks1.js index eb613586118..a59ca2ceda1 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js @@ -32,7 +32,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -40,7 +41,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); var Derived2 = (function (_super) { @@ -48,7 +50,8 @@ var Derived2 = (function (_super) { function Derived2() { _super.apply(this, arguments); } - Derived2.prototype.baz = function () { }; + Derived2.prototype.baz = function () { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -56,7 +59,8 @@ var Derived3 = (function (_super) { function Derived3() { _super.apply(this, arguments); } - Derived3.prototype.biz = function () { }; + Derived3.prototype.biz = function () { + }; return Derived3; })(Base); var D = (function () { diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.js b/tests/baselines/reference/overloadOnConstConstraintChecks2.js index 25759d0a839..071b9372636 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js @@ -35,7 +35,8 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(A); function foo(name) { diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.js b/tests/baselines/reference/overloadOnConstConstraintChecks3.js index 5980c852f41..961411bf6e5 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js @@ -37,7 +37,8 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(A); function foo(name) { diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.js b/tests/baselines/reference/overloadOnConstConstraintChecks4.js index b2ae1125750..5192afc35a2 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js @@ -45,7 +45,8 @@ var C = (function (_super) { function C() { _super.apply(this, arguments); } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(A); function foo(name) { diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js index 9bd8ca3a274..4ef71de6d3b 100644 --- a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js +++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js @@ -6,4 +6,7 @@ interface I { var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error //// [overloadOnConstInObjectLiteralImplementingAnInterface.js] -var i2 = { x1: function (a, cb) { } }; // error +var i2 = { + x1: function (a, cb) { + } +}; // error diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation.js b/tests/baselines/reference/overloadOnConstNoAnyImplementation.js index 0c2f330b5ed..a17acae9354 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation.js +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation.js @@ -24,7 +24,13 @@ function x1(a, cb) { cb('uh'); cb(1); // error } -var cb = function (x) { return 1; }; +var cb = function (x) { + return 1; +}; x1(1, cb); -x1(1, function (x) { return 1; }); // error -x1(1, function (x) { return 1; }); +x1(1, function (x) { + return 1; +}); // error +x1(1, function (x) { + return 1; +}); diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js index 52f6639e352..6c66c23f1f8 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js @@ -35,7 +35,15 @@ var C = (function () { return C; })(); var c; -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); +c.x1(1, function (x) { + return 1; +}); +c.x1(1, function (x) { + return 1; +}); +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..33cc9c81b2c 100644 --- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js +++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js @@ -9,6 +9,7 @@ class C { var C = (function () { function C() { } - C.prototype.x1 = function (a) { }; + C.prototype.x1 = function (a) { + }; return C; })(); diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation.js b/tests/baselines/reference/overloadOnConstNoStringImplementation.js index 65fd6d07567..1fbf18d854d 100644 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation.js +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation.js @@ -24,7 +24,13 @@ function x2(a, cb) { cb('uh'); cb(1); } -var cb = function (x) { return 1; }; +var cb = function (x) { + return 1; +}; x2(1, cb); // error -x2(1, function (x) { return 1; }); // error -x2(1, function (x) { return 1; }); +x2(1, function (x) { + return 1; +}); // error +x2(1, function (x) { + return 1; +}); diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js index 71d7a4e4a3f..f51f84acb2a 100644 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js @@ -34,7 +34,15 @@ var C = (function () { return C; })(); var c; -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); -c.x1(1, function (x) { return 1; }); +c.x1(1, function (x) { + return 1; +}); +c.x1(1, function (x) { + return 1; +}); +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 cf9bc526b51..f4037c3f668 100644 --- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js +++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js @@ -21,7 +21,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -29,7 +30,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); var Derived2 = (function (_super) { @@ -37,7 +39,8 @@ var Derived2 = (function (_super) { function Derived2() { _super.apply(this, arguments); } - Derived2.prototype.baz = function () { }; + Derived2.prototype.baz = function () { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -45,7 +48,8 @@ var Derived3 = (function (_super) { function Derived3() { _super.apply(this, arguments); } - Derived3.prototype.biz = function () { }; + Derived3.prototype.biz = function () { + }; return Derived3; })(Base); function foo(name) { diff --git a/tests/baselines/reference/overloadResolution.js b/tests/baselines/reference/overloadResolution.js index 1ee5e077c08..db042846c77 100644 --- a/tests/baselines/reference/overloadResolution.js +++ b/tests/baselines/reference/overloadResolution.js @@ -127,12 +127,16 @@ var SomeDerived3 = (function (_super) { } return SomeDerived3; })(SomeBase); -function fn1() { return null; } +function fn1() { + return null; +} var s = fn1(undefined); var s; // No candidate overloads found fn1({}); // Error -function fn2() { return undefined; } +function fn2() { + return undefined; +} var d = fn2(0, undefined); var d; // Generic and non - generic overload where generic overload is the only candidate when called without type arguments @@ -141,7 +145,9 @@ var s = fn2(0, ''); fn2('', 0); // Error // Generic and non - generic overload where non - generic overload is the only candidate when called without type arguments fn2('', 0); // OK -function fn3() { return null; } +function fn3() { + return null; +} var s = fn3(3); var s = fn3('', 3, ''); var n = fn3(5, 5, 5); @@ -152,7 +158,8 @@ var s = fn3('', '', ''); var n = fn3('', '', 3); // Generic overloads with differing arity called with type argument count that doesn't match any overload fn3(); // Error -function fn4() { } +function fn4() { +} fn4('', 3); fn4(3, ''); // Error fn4('', 3); // Error @@ -167,6 +174,12 @@ fn4(null, null); // Error // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints fn4(true, null); // Error fn4(null, true); // Error -function fn5() { return undefined; } -var n = fn5(function (n) { return n.toFixed(); }); -var s = fn5(function (n) { return n.substr(0); }); +function fn5() { + return undefined; +} +var n = fn5(function (n) { + return n.toFixed(); +}); +var s = fn5(function (n) { + return n.substr(0); +}); diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.js b/tests/baselines/reference/overloadResolutionClassConstructors.js index 2571a0e02db..8b4e4316faf 100644 --- a/tests/baselines/reference/overloadResolutionClassConstructors.js +++ b/tests/baselines/reference/overloadResolutionClassConstructors.js @@ -198,6 +198,12 @@ var fn5 = (function () { } 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 +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 9e10215b1cb..39670160759 100644 --- a/tests/baselines/reference/overloadResolutionConstructors.js +++ b/tests/baselines/reference/overloadResolutionConstructors.js @@ -177,5 +177,9 @@ new fn4(null, null); // Error new fn4(true, null); // Error new fn4(null, true); // Error var fn5; -var n = new fn5(function (n) { return n.toFixed(); }); -var s = new fn5(function (n) { return n.substr(0); }); +var n = new fn5(function (n) { + return n.toFixed(); +}); +var s = new fn5(function (n) { + return n.substr(0); +}); diff --git a/tests/baselines/reference/overloadResolutionOverCTLambda.js b/tests/baselines/reference/overloadResolutionOverCTLambda.js index 18ad08c9c82..84e8bb56ec7 100644 --- a/tests/baselines/reference/overloadResolutionOverCTLambda.js +++ b/tests/baselines/reference/overloadResolutionOverCTLambda.js @@ -3,5 +3,8 @@ function foo(b: (item: number) => boolean) { } foo(a => a); // can not convert (number)=>bool to (number)=>number //// [overloadResolutionOverCTLambda.js] -function foo(b) { } -foo(function (a) { return a; }); // can not convert (number)=>bool to (number)=>number +function foo(b) { +} +foo(function (a) { + return a; +}); // can not convert (number)=>bool to (number)=>number diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index 170f2dd2137..86e84ced58f 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -43,14 +43,18 @@ var Bugs; rest[_i - 1] = arguments[_i]; } var index = rest[0]; - return typeof args[index] !== 'undefined' - ? args[index] - : match; + return typeof args[index] !== 'undefined' ? args[index] : match; }); return result; } })(Bugs || (Bugs = {})); -function bug3(f) { return f("s"); } -function fprime(x) { return x; } +function bug3(f) { + return f("s"); +} +function fprime(x) { + return x; +} bug3(fprime); -bug3(function (x) { return x; }); +bug3(function (x) { + return x; +}); diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js index cf125bebbf5..e2b11529c36 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js @@ -26,7 +26,17 @@ var Bugs; (function (Bugs) { function bug3() { var tokens = []; - tokens.push({ startIndex: 1, type: '', bracket: 3 }); - tokens.push(({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 })); + tokens.push({ + startIndex: 1, + type: '', + bracket: 3 + }); + tokens.push(({ + startIndex: 1, + type: '', + bracket: 3, + state: null, + length: 10 + })); } })(Bugs || (Bugs = {})); diff --git a/tests/baselines/reference/overloadResolutionTest1.js b/tests/baselines/reference/overloadResolutionTest1.js index 60b99ebf7b9..2d813e6effe 100644 --- a/tests/baselines/reference/overloadResolutionTest1.js +++ b/tests/baselines/reference/overloadResolutionTest1.js @@ -26,17 +26,47 @@ function foo4(bar:{a:any;}):any{ return bar }; var x = foo4({a:true}); // error //// [overloadResolutionTest1.js] -function foo(bar) { return bar; } +function foo(bar) { + return bar; +} ; -var x1 = foo([{ a: true }]); // works -var x11 = foo([{ a: 0 }]); // works -var x111 = foo([{ a: "s" }]); // error - does not match any signature -var x1111 = foo([{ a: null }]); // works - ambiguous call is resolved to be the first in the overload set so this returns a string -function foo2(bar) { return bar; } +var x1 = foo([ + { + a: true + } +]); // works +var x11 = foo([ + { + a: 0 + } +]); // works +var x111 = foo([ + { + a: "s" + } +]); // error - does not match any signature +var x1111 = foo([ + { + a: null + } +]); // works - ambiguous call is resolved to be the first in the overload set so this returns a string +function foo2(bar) { + return bar; +} ; -var x2 = foo2({ a: 0 }); // works -var x3 = foo2({ a: true }); // works -var x4 = foo2({ a: "s" }); // error -function foo4(bar) { return bar; } +var x2 = foo2({ + a: 0 +}); // works +var x3 = foo2({ + a: true +}); // works +var x4 = foo2({ + a: "s" +}); // error +function foo4(bar) { + return bar; +} ; -var x = foo4({ a: true }); // error +var x = foo4({ + a: true +}); // error diff --git a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.js b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.js index 03063855267..0a1a87091c1 100644 --- a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.js +++ b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.js @@ -7,6 +7,11 @@ x2((x) => 1 ); //// [overloadWithCallbacksWithDifferingOptionalityOnArgs.js] -function x2(callback) { } -x2(function () { return 1; }); -x2(function (x) { return 1; }); +function x2(callback) { +} +x2(function () { + return 1; +}); +x2(function (x) { + return 1; +}); diff --git a/tests/baselines/reference/overloadingOnConstants1.js b/tests/baselines/reference/overloadingOnConstants1.js index 7ebeeb2890f..e325e7ad8c0 100644 --- a/tests/baselines/reference/overloadingOnConstants1.js +++ b/tests/baselines/reference/overloadingOnConstants1.js @@ -35,7 +35,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -43,7 +44,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); var Derived2 = (function (_super) { @@ -51,7 +53,8 @@ var Derived2 = (function (_super) { function Derived2() { _super.apply(this, arguments); } - Derived2.prototype.baz = function () { }; + Derived2.prototype.baz = function () { + }; return Derived2; })(Base); var Derived3 = (function (_super) { @@ -59,7 +62,8 @@ var Derived3 = (function (_super) { function Derived3() { _super.apply(this, arguments); } - Derived3.prototype.biz = function () { }; + Derived3.prototype.biz = function () { + }; return Derived3; })(Base); var d2; diff --git a/tests/baselines/reference/overloadingStaticFunctionsInFunctions.js b/tests/baselines/reference/overloadingStaticFunctionsInFunctions.js index 591826725b1..7e926a6250a 100644 --- a/tests/baselines/reference/overloadingStaticFunctionsInFunctions.js +++ b/tests/baselines/reference/overloadingStaticFunctionsInFunctions.js @@ -10,5 +10,6 @@ function boo() { test(); test(name, string); test(name ? : any); - { } + { + } } diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js index 63b4a2b1e93..1eff021f569 100644 --- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js +++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js @@ -28,8 +28,12 @@ var G = (function () { } 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 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) { var y; // error that D does not satisfy constraint, y is of type G, entire call to foo is an error return y; diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js index 42c371dd218..4d0ac15c717 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js @@ -11,6 +11,7 @@ module M { //// [overloadsInDifferentContainersDisagreeOnAmbient.js] var M; (function (M) { - function f() { } + function f() { + } M.f = f; })(M || (M = {})); diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.js b/tests/baselines/reference/overloadsWithProvisionalErrors.js index c7fb4785d09..f684f1b12a9 100644 --- a/tests/baselines/reference/overloadsWithProvisionalErrors.js +++ b/tests/baselines/reference/overloadsWithProvisionalErrors.js @@ -10,6 +10,17 @@ func(s => ({ a: blah })); // Two errors here, one for blah not being defined, an //// [overloadsWithProvisionalErrors.js] var func; -func(function (s) { return ({}); }); // Error for no applicable overload (object type is missing a and b) -func(function (s) { return ({ a: blah, b: 3 }); }); // Only error inside the function, but not outside (since it would be applicable if not for the provisional error) -func(function (s) { return ({ a: blah }); }); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway +func(function (s) { + return ({}); +}); // Error for no applicable overload (object type is missing a and b) +func(function (s) { + return ({ + a: blah, + b: 3 + }); +}); // Only error inside the function, but not outside (since it would be applicable if not for the provisional error) +func(function (s) { + return ({ + a: blah + }); +}); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway diff --git a/tests/baselines/reference/overloadsWithinClasses.js b/tests/baselines/reference/overloadsWithinClasses.js index 4ac612502c7..79f3c332be5 100644 --- a/tests/baselines/reference/overloadsWithinClasses.js +++ b/tests/baselines/reference/overloadsWithinClasses.js @@ -27,14 +27,17 @@ class X { var foo = (function () { function foo() { } - foo.fnOverload = function () { }; - foo.fnOverload = function (foo) { }; // error + foo.fnOverload = function () { + }; + foo.fnOverload = function (foo) { + }; // error return foo; })(); var bar = (function () { function bar() { } - bar.fnOverload = function (foo) { }; // no error + bar.fnOverload = function (foo) { + }; // no error return bar; })(); var X = (function () { diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing.js b/tests/baselines/reference/parameterInitializersForwardReferencing.js index 188a104f3af..61b116980ae 100644 --- a/tests/baselines/reference/parameterInitializersForwardReferencing.js +++ b/tests/baselines/reference/parameterInitializersForwardReferencing.js @@ -74,11 +74,17 @@ function outside() { } } function defaultArgFunction(a, b) { - if (a === void 0) { a = function () { return b; }; } + if (a === void 0) { a = function () { + return b; + }; } if (b === void 0) { b = 1; } } function defaultArgArrow(a, b) { - if (a === void 0) { a = function () { return function () { return b; }; }; } + if (a === void 0) { a = function () { + return function () { + return b; + }; + }; } if (b === void 0) { b = 3; } } var C = (function () { @@ -101,6 +107,8 @@ var x = function (a, b, c) { }; // Should not produce errors - can reference later parameters if they occur within a function expression initializer. function f(a, b, c) { - if (b === void 0) { b = function () { return c; }; } + if (b === void 0) { b = function () { + return c; + }; } if (c === void 0) { c = b(); } } diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js index a8d06125d25..d0b48460649 100644 --- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js +++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js @@ -30,10 +30,18 @@ var b = { } //// [parametersWithNoAnnotationAreAny.js] -function foo(x) { return x; } -var f = function foo(x) { return x; }; -var f2 = function (x) { return x; }; -var f3 = function (x) { return x; }; +function foo(x) { + return x; +} +var f = function foo(x) { + return x; +}; +var f2 = function (x) { + return x; +}; +var f3 = function (x) { + return x; +}; var C = (function () { function C() { } @@ -50,5 +58,7 @@ var b = { a: function foo(x) { return x; }, - b: function (x) { return x; } + b: function (x) { + return x; + } }; diff --git a/tests/baselines/reference/parenthesizedContexualTyping1.js b/tests/baselines/reference/parenthesizedContexualTyping1.js index 2f1e9ff62fc..cd3a2937395 100644 --- a/tests/baselines/reference/parenthesizedContexualTyping1.js +++ b/tests/baselines/reference/parenthesizedContexualTyping1.js @@ -33,20 +33,82 @@ var obj2: ObjType = ({ x: x => (x, undefined), y: y => (y, undefined) }); function fun(g, x) { return g(x); } -var a = fun(function (x) { return x; }, 10); -var b = fun((function (x) { return x; }), 10); -var c = fun(((function (x) { return x; })), 10); -var d = fun((((function (x) { return x; }))), 10); -var e = fun(function (x) { return x; }, function (x) { return x; }, 10); -var f = fun((function (x) { return x; }), (function (x) { return x; }), 10); -var g = fun(((function (x) { return x; })), ((function (x) { return x; })), 10); -var h = fun((((function (x) { return x; }))), ((function (x) { return x; })), 10); +var a = fun(function (x) { + return x; +}, 10); +var b = fun((function (x) { + return x; +}), 10); +var c = fun(((function (x) { + return x; +})), 10); +var d = fun((((function (x) { + return x; +}))), 10); +var e = fun(function (x) { + return x; +}, function (x) { + return x; +}, 10); +var f = fun((function (x) { + return x; +}), (function (x) { + return x; +}), 10); +var g = fun(((function (x) { + return x; +})), ((function (x) { + return x; +})), 10); +var h = fun((((function (x) { + return x; +}))), ((function (x) { + return x; +})), 10); // Ternaries in parens -var i = fun((Math.random() < 0.5 ? function (x) { return x; } : function (x) { return undefined; }), 10); -var j = fun((Math.random() < 0.5 ? (function (x) { return x; }) : (function (x) { return undefined; })), 10); -var k = fun((Math.random() < 0.5 ? (function (x) { return x; }) : (function (x) { return undefined; })), function (x) { return x; }, 10); -var l = fun(((Math.random() < 0.5 ? ((function (x) { return x; })) : ((function (x) { return undefined; })))), ((function (x) { return x; })), 10); -var lambda1 = function (x) { return x; }; -var lambda2 = (function (x) { return x; }); -var obj1 = { x: function (x) { return (x, undefined); }, y: function (y) { return (y, undefined); } }; -var obj2 = ({ x: function (x) { return (x, undefined); }, y: function (y) { return (y, undefined); } }); +var i = fun((Math.random() < 0.5 ? function (x) { + return x; +} : function (x) { + return undefined; +}), 10); +var j = fun((Math.random() < 0.5 ? (function (x) { + return x; +}) : (function (x) { + return undefined; +})), 10); +var k = fun((Math.random() < 0.5 ? (function (x) { + return x; +}) : (function (x) { + return undefined; +})), function (x) { + return x; +}, 10); +var l = fun(((Math.random() < 0.5 ? ((function (x) { + return x; +})) : ((function (x) { + return undefined; +})))), ((function (x) { + return x; +})), 10); +var lambda1 = function (x) { + return x; +}; +var lambda2 = (function (x) { + return x; +}); +var obj1 = { + x: function (x) { + return (x, undefined); + }, + y: function (y) { + return (y, undefined); + } +}; +var obj2 = ({ + x: function (x) { + return (x, undefined); + }, + y: function (y) { + return (y, undefined); + } +}); diff --git a/tests/baselines/reference/parenthesizedContexualTyping2.js b/tests/baselines/reference/parenthesizedContexualTyping2.js index 993a10ba49c..68aa28386e9 100644 --- a/tests/baselines/reference/parenthesizedContexualTyping2.js +++ b/tests/baselines/reference/parenthesizedContexualTyping2.js @@ -49,20 +49,102 @@ function fun() { } return undefined; } -var a = fun(function (x) { x(undefined); return x; }, 10); -var b = fun((function (x) { x(undefined); return x; }), 10); -var c = fun(((function (x) { x(undefined); return x; })), 10); -var d = fun((((function (x) { x(undefined); return x; }))), 10); -var e = fun(function (x) { x(undefined); return x; }, function (x) { x(undefined); return x; }, 10); -var f = fun((function (x) { x(undefined); return x; }), (function (x) { x(undefined); return x; }), 10); -var g = fun(((function (x) { x(undefined); return x; })), ((function (x) { x(undefined); return x; })), 10); -var h = fun((((function (x) { x(undefined); return x; }))), ((function (x) { x(undefined); return x; })), 10); +var a = fun(function (x) { + x(undefined); + return x; +}, 10); +var b = fun((function (x) { + x(undefined); + return x; +}), 10); +var c = fun(((function (x) { + x(undefined); + return x; +})), 10); +var d = fun((((function (x) { + x(undefined); + return x; +}))), 10); +var e = fun(function (x) { + x(undefined); + return x; +}, function (x) { + x(undefined); + return x; +}, 10); +var f = fun((function (x) { + x(undefined); + return x; +}), (function (x) { + x(undefined); + return x; +}), 10); +var g = fun(((function (x) { + x(undefined); + return x; +})), ((function (x) { + x(undefined); + return x; +})), 10); +var h = fun((((function (x) { + x(undefined); + return x; +}))), ((function (x) { + x(undefined); + return x; +})), 10); // Ternaries in parens -var i = fun((Math.random() < 0.5 ? function (x) { x(undefined); return x; } : function (x) { return undefined; }), 10); -var j = fun((Math.random() < 0.5 ? (function (x) { x(undefined); return x; }) : (function (x) { return undefined; })), 10); -var k = fun((Math.random() < 0.5 ? (function (x) { x(undefined); return x; }) : (function (x) { return undefined; })), function (x) { x(undefined); return x; }, 10); -var l = fun(((Math.random() < 0.5 ? ((function (x) { x(undefined); return x; })) : ((function (x) { return undefined; })))), ((function (x) { x(undefined); return x; })), 10); -var lambda1 = function (x) { x(undefined); return x; }; -var lambda2 = (function (x) { x(undefined); return x; }); -var obj1 = { x: function (x) { return (x, undefined); }, y: function (y) { return (y, undefined); } }; -var obj2 = ({ x: function (x) { return (x, undefined); }, y: function (y) { return (y, undefined); } }); +var i = fun((Math.random() < 0.5 ? function (x) { + x(undefined); + return x; +} : function (x) { + return undefined; +}), 10); +var j = fun((Math.random() < 0.5 ? (function (x) { + x(undefined); + return x; +}) : (function (x) { + return undefined; +})), 10); +var k = fun((Math.random() < 0.5 ? (function (x) { + x(undefined); + return x; +}) : (function (x) { + return undefined; +})), function (x) { + x(undefined); + return x; +}, 10); +var l = fun(((Math.random() < 0.5 ? ((function (x) { + x(undefined); + return x; +})) : ((function (x) { + return undefined; +})))), ((function (x) { + x(undefined); + return x; +})), 10); +var lambda1 = function (x) { + x(undefined); + return x; +}; +var lambda2 = (function (x) { + x(undefined); + return x; +}); +var obj1 = { + x: function (x) { + return (x, undefined); + }, + y: function (y) { + return (y, undefined); + } +}; +var obj2 = ({ + x: function (x) { + return (x, undefined); + }, + y: function (y) { + return (y, undefined); + } +}); diff --git a/tests/baselines/reference/parse1.js b/tests/baselines/reference/parse1.js index 4804e31adcd..08af81bda17 100644 --- a/tests/baselines/reference/parse1.js +++ b/tests/baselines/reference/parse1.js @@ -8,6 +8,5 @@ function foo() { //// [parse1.js] var bar = 42; function foo() { - bar. - ; + bar.; } diff --git a/tests/baselines/reference/parseTypes.js b/tests/baselines/reference/parseTypes.js index 08cc9f2a6bd..193533de04a 100644 --- a/tests/baselines/reference/parseTypes.js +++ b/tests/baselines/reference/parseTypes.js @@ -18,9 +18,13 @@ var x = null; var y = null; var z = null; var w = null; -function f() { return 3; } +function f() { + return 3; +} ; -function g(s) { true; } +function g(s) { + true; +} ; y = f; y = g; diff --git a/tests/baselines/reference/parser15.4.4.14-9-2.js b/tests/baselines/reference/parser15.4.4.14-9-2.js index 0f533cd9a26..e9a29e7eead 100644 --- a/tests/baselines/reference/parser15.4.4.14-9-2.js +++ b/tests/baselines/reference/parser15.4.4.14-9-2.js @@ -37,14 +37,15 @@ runTestCase(testcase); * @description Array.prototype.indexOf must return correct index (Number) */ function testcase() { - var obj = { toString: function () { return 0; } }; + var obj = { + toString: function () { + return 0; + } + }; var one = 1; var _float = -(4 / 3); var a = new Array(false, undefined, null, "0", obj, -1.3333333333333, "str", -0, true, +0, one, 1, 0, false, _float, -(4 / 3)); - if (a.indexOf(-(4 / 3)) === 14 && - a.indexOf(0) === 7 && - a.indexOf(-0) === 7 && - a.indexOf(1) === 10) { + if (a.indexOf(-(4 / 3)) === 14 && a.indexOf(0) === 7 && a.indexOf(-0) === 7 && a.indexOf(1) === 10) { return true; } } diff --git a/tests/baselines/reference/parser509667.js b/tests/baselines/reference/parser509667.js index 0938613b295..21e0bc55ce4 100644 --- a/tests/baselines/reference/parser509667.js +++ b/tests/baselines/reference/parser509667.js @@ -16,8 +16,7 @@ var Foo = (function () { function Foo() { } Foo.prototype.f1 = function () { - if (this. - ) + if (this.) ; }; Foo.prototype.f2 = function () { diff --git a/tests/baselines/reference/parser509669.js b/tests/baselines/reference/parser509669.js index 3fa4cf696c0..e4ce2b90312 100644 --- a/tests/baselines/reference/parser509669.js +++ b/tests/baselines/reference/parser509669.js @@ -5,5 +5,6 @@ function foo():any { //// [parser509669.js] function foo() { - return function () { }; + return function () { + }; } diff --git a/tests/baselines/reference/parser512097.js b/tests/baselines/reference/parser512097.js index ce73dadf3bc..c495e68c847 100644 --- a/tests/baselines/reference/parser512097.js +++ b/tests/baselines/reference/parser512097.js @@ -5,6 +5,8 @@ if (true) { } //// [parser512097.js] -var tt = { aa: }; // After this point, no useful parsing occurs in the entire file +var tt = { + aa: +}; // After this point, no useful parsing occurs in the entire file if (true) { } diff --git a/tests/baselines/reference/parser521128.js b/tests/baselines/reference/parser521128.js index 2471f740d77..e16cbad6c33 100644 --- a/tests/baselines/reference/parser521128.js +++ b/tests/baselines/reference/parser521128.js @@ -3,4 +3,5 @@ module.module { } //// [parser521128.js] module.module; -{ } +{ +} diff --git a/tests/baselines/reference/parser536727.js b/tests/baselines/reference/parser536727.js index fe086d8d3be..39b0d66f6c8 100644 --- a/tests/baselines/reference/parser536727.js +++ b/tests/baselines/reference/parser536727.js @@ -13,8 +13,14 @@ foo(x); function foo(f) { return f(""); } -var g = function (x) { return x + "blah"; }; -var x = function () { return g; }; +var g = function (x) { + return x + "blah"; +}; +var x = function () { + return g; +}; foo(g); -foo(function () { return g; }); +foo(function () { + return g; +}); foo(x); diff --git a/tests/baselines/reference/parser553699.js b/tests/baselines/reference/parser553699.js index 8570780e74a..f245ecc3446 100644 --- a/tests/baselines/reference/parser553699.js +++ b/tests/baselines/reference/parser553699.js @@ -12,7 +12,8 @@ class Bar { var Foo = (function () { function Foo() { } - Foo.prototype.banana = function (x) { }; + Foo.prototype.banana = function (x) { + }; return Foo; })(); var Bar = (function () { diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic10.js b/tests/baselines/reference/parserAccessibilityAfterStatic10.js index 6756a57ce7e..feded66fe95 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic10.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic10.js @@ -9,6 +9,7 @@ static public intI() {} var Outer = (function () { function Outer() { } - Outer.intI = function () { }; + Outer.intI = function () { + }; return Outer; })(); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic11.js b/tests/baselines/reference/parserAccessibilityAfterStatic11.js index 8b16153b797..094202014a1 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic11.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic11.js @@ -9,6 +9,7 @@ static public() {} var Outer = (function () { function Outer() { } - Outer.public = function () { }; + Outer.public = function () { + }; return Outer; })(); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.js b/tests/baselines/reference/parserAccessibilityAfterStatic14.js index 4455936a859..b2a6be7464c 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic14.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.js @@ -9,6 +9,7 @@ static public() {} var Outer = (function () { function Outer() { } - Outer.public = function () { }; + Outer.public = function () { + }; return Outer; })(); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic7.js b/tests/baselines/reference/parserAccessibilityAfterStatic7.js index 2d94be8ea50..a2bc5c7fba3 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic7.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic7.js @@ -9,6 +9,7 @@ static public intI() {} var Outer = (function () { function Outer() { } - Outer.intI = function () { }; + Outer.intI = function () { + }; return Outer; })(); diff --git a/tests/baselines/reference/parserAccessors1.js b/tests/baselines/reference/parserAccessors1.js index 6b47a46ede1..b4cc809e7b2 100644 --- a/tests/baselines/reference/parserAccessors1.js +++ b/tests/baselines/reference/parserAccessors1.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserAccessors10.js b/tests/baselines/reference/parserAccessors10.js index d5d7e89a7d0..f1bed41edee 100644 --- a/tests/baselines/reference/parserAccessors10.js +++ b/tests/baselines/reference/parserAccessors10.js @@ -5,5 +5,6 @@ var v = { //// [parserAccessors10.js] var v = { - get foo() { } + get foo() { + } }; diff --git a/tests/baselines/reference/parserAccessors2.js b/tests/baselines/reference/parserAccessors2.js index 482daa74a64..71cbd6f466b 100644 --- a/tests/baselines/reference/parserAccessors2.js +++ b/tests/baselines/reference/parserAccessors2.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserAccessors3.js b/tests/baselines/reference/parserAccessors3.js index 287f607725a..f5f9c43fb4f 100644 --- a/tests/baselines/reference/parserAccessors3.js +++ b/tests/baselines/reference/parserAccessors3.js @@ -2,4 +2,7 @@ var v = { get Foo() { } }; //// [parserAccessors3.js] -var v = { get Foo() { } }; +var v = { + get Foo() { + } +}; diff --git a/tests/baselines/reference/parserAccessors4.js b/tests/baselines/reference/parserAccessors4.js index 0716078a8c8..24ee1bbcdcd 100644 --- a/tests/baselines/reference/parserAccessors4.js +++ b/tests/baselines/reference/parserAccessors4.js @@ -2,4 +2,7 @@ var v = { set Foo(a) { } }; //// [parserAccessors4.js] -var v = { set Foo(a) { } }; +var v = { + set Foo(a) { + } +}; diff --git a/tests/baselines/reference/parserAccessors7.js b/tests/baselines/reference/parserAccessors7.js index 4b7f2d55860..be3802979b6 100644 --- a/tests/baselines/reference/parserAccessors7.js +++ b/tests/baselines/reference/parserAccessors7.js @@ -2,4 +2,7 @@ var v = { get foo(v: number) { } }; //// [parserAccessors7.js] -var v = { get foo(v) { } }; +var v = { + get foo(v) { + } +}; diff --git a/tests/baselines/reference/parserAccessors8.js b/tests/baselines/reference/parserAccessors8.js index 18fb4454071..3bb926521e9 100644 --- a/tests/baselines/reference/parserAccessors8.js +++ b/tests/baselines/reference/parserAccessors8.js @@ -2,4 +2,7 @@ var v = { set foo() { } } //// [parserAccessors8.js] -var v = { set foo() { } }; +var v = { + set foo() { + } +}; diff --git a/tests/baselines/reference/parserAccessors9.js b/tests/baselines/reference/parserAccessors9.js index 448d93a2c01..ad52d9827b3 100644 --- a/tests/baselines/reference/parserAccessors9.js +++ b/tests/baselines/reference/parserAccessors9.js @@ -2,4 +2,7 @@ var v = { set foo(a, b) { } } //// [parserAccessors9.js] -var v = { set foo(a, b) { } }; +var v = { + set foo(a, b) { + } +}; diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.js b/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.js index 6c74814917a..18a1dee3e9f 100644 --- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.js +++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.js @@ -7,5 +7,6 @@ function f1() { //// [parserAmbiguityWithBinaryOperator1.js] function f1() { var a, b, c; - if (a < b || b > (c + 1)) { } + if (a < b || b > (c + 1)) { + } } diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.js b/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.js index 6cd6de58d47..9589d57e3af 100644 --- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.js +++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.js @@ -7,5 +7,6 @@ function f() { //// [parserAmbiguityWithBinaryOperator2.js] function f() { var a, b, c; - if (a < b && b > (c + 1)) { } + if (a < b && b > (c + 1)) { + } } diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.js b/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.js index e3df2894777..95745263c71 100644 --- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.js +++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.js @@ -8,5 +8,6 @@ function f() { //// [parserAmbiguityWithBinaryOperator3.js] function f() { var a, b, c; - if (a < b && b < (c + 1)) { } + if (a < b && b < (c + 1)) { + } } diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.js b/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.js index a6ba380112b..cdcec030ae7 100644 --- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.js +++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.js @@ -7,5 +7,6 @@ function g() { //// [parserAmbiguityWithBinaryOperator4.js] function g() { var a, b, c; - if (a(c + 1)) { } + if (a(c + 1)) { + } } diff --git a/tests/baselines/reference/parserArrayLiteralExpression10.js b/tests/baselines/reference/parserArrayLiteralExpression10.js index 986d3045dc0..5f49958b862 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression10.js +++ b/tests/baselines/reference/parserArrayLiteralExpression10.js @@ -2,4 +2,7 @@ var v = [1,1,]; //// [parserArrayLiteralExpression10.js] -var v = [1, 1,]; +var v = [ + 1, + 1, +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression11.js b/tests/baselines/reference/parserArrayLiteralExpression11.js index 24ab8968fea..79b4bf35182 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression11.js +++ b/tests/baselines/reference/parserArrayLiteralExpression11.js @@ -2,4 +2,8 @@ var v = [1,,1]; //// [parserArrayLiteralExpression11.js] -var v = [1, , 1]; +var v = [ + 1, + , + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression12.js b/tests/baselines/reference/parserArrayLiteralExpression12.js index 6795ef29908..1ad1bc40121 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression12.js +++ b/tests/baselines/reference/parserArrayLiteralExpression12.js @@ -2,4 +2,9 @@ var v = [1,,,1]; //// [parserArrayLiteralExpression12.js] -var v = [1, , , 1]; +var v = [ + 1, + , + , + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression13.js b/tests/baselines/reference/parserArrayLiteralExpression13.js index 504663e5ced..78b08548288 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression13.js +++ b/tests/baselines/reference/parserArrayLiteralExpression13.js @@ -2,4 +2,10 @@ var v = [1,,1,,1]; //// [parserArrayLiteralExpression13.js] -var v = [1, , 1, , 1]; +var v = [ + 1, + , + 1, + , + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression14.js b/tests/baselines/reference/parserArrayLiteralExpression14.js index eeb13dc53a5..188b9e734ff 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression14.js +++ b/tests/baselines/reference/parserArrayLiteralExpression14.js @@ -2,4 +2,16 @@ var v = [,,1,1,,1,,1,1,,1]; //// [parserArrayLiteralExpression14.js] -var v = [, , 1, 1, , 1, , 1, 1, , 1]; +var v = [ + , + , + 1, + 1, + , + 1, + , + 1, + 1, + , + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression15.js b/tests/baselines/reference/parserArrayLiteralExpression15.js index 84ab9dac240..4894a874bef 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression15.js +++ b/tests/baselines/reference/parserArrayLiteralExpression15.js @@ -2,4 +2,16 @@ var v = [,,1,1,,1,,1,1,,1,]; //// [parserArrayLiteralExpression15.js] -var v = [, , 1, 1, , 1, , 1, 1, , 1,]; +var v = [ + , + , + 1, + 1, + , + 1, + , + 1, + 1, + , + 1, +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression2.js b/tests/baselines/reference/parserArrayLiteralExpression2.js index 1fb26155eb5..587b4180ec6 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression2.js +++ b/tests/baselines/reference/parserArrayLiteralExpression2.js @@ -2,4 +2,6 @@ var v = [,]; //// [parserArrayLiteralExpression2.js] -var v = [,]; +var v = [ + , +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression3.js b/tests/baselines/reference/parserArrayLiteralExpression3.js index 2d7d19fc2c3..45a9c945ba8 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression3.js +++ b/tests/baselines/reference/parserArrayLiteralExpression3.js @@ -2,4 +2,7 @@ var v = [,,]; //// [parserArrayLiteralExpression3.js] -var v = [, ,]; +var v = [ + , + , +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression4.js b/tests/baselines/reference/parserArrayLiteralExpression4.js index 2287897338e..7a69500ba74 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression4.js +++ b/tests/baselines/reference/parserArrayLiteralExpression4.js @@ -2,4 +2,8 @@ var v = [,,,]; //// [parserArrayLiteralExpression4.js] -var v = [, , ,]; +var v = [ + , + , + , +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression5.js b/tests/baselines/reference/parserArrayLiteralExpression5.js index 43b784b2e5e..1affdb1ac38 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression5.js +++ b/tests/baselines/reference/parserArrayLiteralExpression5.js @@ -2,4 +2,6 @@ var v = [1]; //// [parserArrayLiteralExpression5.js] -var v = [1]; +var v = [ + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression6.js b/tests/baselines/reference/parserArrayLiteralExpression6.js index 28cd901f4ac..b5831c7345e 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression6.js +++ b/tests/baselines/reference/parserArrayLiteralExpression6.js @@ -2,4 +2,7 @@ var v = [,1]; //// [parserArrayLiteralExpression6.js] -var v = [, 1]; +var v = [ + , + 1 +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression7.js b/tests/baselines/reference/parserArrayLiteralExpression7.js index b302e87e352..e10cf021a73 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression7.js +++ b/tests/baselines/reference/parserArrayLiteralExpression7.js @@ -2,4 +2,6 @@ var v = [1,]; //// [parserArrayLiteralExpression7.js] -var v = [1,]; +var v = [ + 1, +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression8.js b/tests/baselines/reference/parserArrayLiteralExpression8.js index 223a86db229..6d8b252521d 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression8.js +++ b/tests/baselines/reference/parserArrayLiteralExpression8.js @@ -2,4 +2,7 @@ var v = [,1,]; //// [parserArrayLiteralExpression8.js] -var v = [, 1,]; +var v = [ + , + 1, +]; diff --git a/tests/baselines/reference/parserArrayLiteralExpression9.js b/tests/baselines/reference/parserArrayLiteralExpression9.js index 5043f522dde..d44d072eb57 100644 --- a/tests/baselines/reference/parserArrayLiteralExpression9.js +++ b/tests/baselines/reference/parserArrayLiteralExpression9.js @@ -2,4 +2,7 @@ var v = [1,1]; //// [parserArrayLiteralExpression9.js] -var v = [1, 1]; +var v = [ + 1, + 1 +]; diff --git a/tests/baselines/reference/parserArrowFunctionExpression1.js b/tests/baselines/reference/parserArrowFunctionExpression1.js index e4ae59fdb99..5ab29fee64c 100644 --- a/tests/baselines/reference/parserArrowFunctionExpression1.js +++ b/tests/baselines/reference/parserArrowFunctionExpression1.js @@ -2,4 +2,5 @@ var v = (public x: string) => { }; //// [parserArrowFunctionExpression1.js] -var v = function (x) { }; +var v = function (x) { +}; diff --git a/tests/baselines/reference/parserArrowFunctionExpression2.js b/tests/baselines/reference/parserArrowFunctionExpression2.js index 9004468ec76..5059cf32182 100644 --- a/tests/baselines/reference/parserArrowFunctionExpression2.js +++ b/tests/baselines/reference/parserArrowFunctionExpression2.js @@ -2,5 +2,6 @@ a = () => { } || a //// [parserArrowFunctionExpression2.js] -a = function () { }; +a = function () { +}; || a; diff --git a/tests/baselines/reference/parserArrowFunctionExpression3.js b/tests/baselines/reference/parserArrowFunctionExpression3.js index 9e6b2706108..68ea230d87b 100644 --- a/tests/baselines/reference/parserArrowFunctionExpression3.js +++ b/tests/baselines/reference/parserArrowFunctionExpression3.js @@ -2,4 +2,5 @@ a = (() => { } || a) //// [parserArrowFunctionExpression3.js] -a = (function () { }) || a; +a = (function () { +}) || a; diff --git a/tests/baselines/reference/parserArrowFunctionExpression4.js b/tests/baselines/reference/parserArrowFunctionExpression4.js index e77a42162cd..53aaee9e6ff 100644 --- a/tests/baselines/reference/parserArrowFunctionExpression4.js +++ b/tests/baselines/reference/parserArrowFunctionExpression4.js @@ -2,4 +2,5 @@ a = (() => { }, a) //// [parserArrowFunctionExpression4.js] -a = (function () { }, a); +a = (function () { +}, a); diff --git a/tests/baselines/reference/parserCastVersusArrowFunction1.js b/tests/baselines/reference/parserCastVersusArrowFunction1.js index df46753b9e4..63a19924d3e 100644 --- a/tests/baselines/reference/parserCastVersusArrowFunction1.js +++ b/tests/baselines/reference/parserCastVersusArrowFunction1.js @@ -11,10 +11,16 @@ var v = (a, b); var v = (a = 1, b = 2); //// [parserCastVersusArrowFunction1.js] -var v = function () { return 1; }; +var v = function () { + return 1; +}; var v = a; -var v = function (a) { return 1; }; -var v = function (a, b) { return 1; }; +var v = function (a) { + return 1; +}; +var v = function (a, b) { + return 1; +}; var v = function (a, b) { if (a === void 0) { a = 1; } if (b === void 0) { b = 2; } diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js index eb1d17566aa..1245da3363f 100644 --- a/tests/baselines/reference/parserClass1.js +++ b/tests/baselines/reference/parserClass1.js @@ -13,11 +13,21 @@ var NullLogger = (function () { function NullLogger() { } - NullLogger.prototype.information = function () { return false; }; - NullLogger.prototype.debug = function () { return false; }; - NullLogger.prototype.warning = function () { return false; }; - NullLogger.prototype.error = function () { return false; }; - NullLogger.prototype.fatal = function () { return false; }; + NullLogger.prototype.information = function () { + return false; + }; + NullLogger.prototype.debug = function () { + return false; + }; + NullLogger.prototype.warning = function () { + return false; + }; + NullLogger.prototype.error = function () { + return false; + }; + NullLogger.prototype.fatal = function () { + return false; + }; NullLogger.prototype.log = function (s) { }; return NullLogger; diff --git a/tests/baselines/reference/parserClassDeclaration11.js b/tests/baselines/reference/parserClassDeclaration11.js index 078d3553a43..80a27d71e6c 100644 --- a/tests/baselines/reference/parserClassDeclaration11.js +++ b/tests/baselines/reference/parserClassDeclaration11.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration13.js b/tests/baselines/reference/parserClassDeclaration13.js index 93ce76fb168..dcb704ae1d3 100644 --- a/tests/baselines/reference/parserClassDeclaration13.js +++ b/tests/baselines/reference/parserClassDeclaration13.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration16.js b/tests/baselines/reference/parserClassDeclaration16.js index a6a92d73afa..7048980597e 100644 --- a/tests/baselines/reference/parserClassDeclaration16.js +++ b/tests/baselines/reference/parserClassDeclaration16.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration19.js b/tests/baselines/reference/parserClassDeclaration19.js index 7900aa4d552..5b77e263ec9 100644 --- a/tests/baselines/reference/parserClassDeclaration19.js +++ b/tests/baselines/reference/parserClassDeclaration19.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype["foo"] = function () { }; + C.prototype["foo"] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration20.js b/tests/baselines/reference/parserClassDeclaration20.js index 7c99f2d8ee6..68d97b66bb9 100644 --- a/tests/baselines/reference/parserClassDeclaration20.js +++ b/tests/baselines/reference/parserClassDeclaration20.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype["0"] = function () { }; + C.prototype["0"] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration21.js b/tests/baselines/reference/parserClassDeclaration21.js index fa4cef46e0e..248f10e8681 100644 --- a/tests/baselines/reference/parserClassDeclaration21.js +++ b/tests/baselines/reference/parserClassDeclaration21.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype[1] = function () { }; + C.prototype[1] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserClassDeclaration22.js b/tests/baselines/reference/parserClassDeclaration22.js index 596f7a4474b..60f708d4835 100644 --- a/tests/baselines/reference/parserClassDeclaration22.js +++ b/tests/baselines/reference/parserClassDeclaration22.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype["bar"] = function () { }; + C.prototype["bar"] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserCommaInTypeMemberList2.js b/tests/baselines/reference/parserCommaInTypeMemberList2.js index fd79326b7b0..9593bdea98f 100644 --- a/tests/baselines/reference/parserCommaInTypeMemberList2.js +++ b/tests/baselines/reference/parserCommaInTypeMemberList2.js @@ -3,4 +3,6 @@ var s = $.extend< { workItem: any }, { workItem: any, width: string }>({ workIte //// [parserCommaInTypeMemberList2.js] -var s = $.extend({ workItem: this._workItem }, {}); +var s = $.extend({ + workItem: this._workItem +}, {}); diff --git a/tests/baselines/reference/parserComputedPropertyName1.js b/tests/baselines/reference/parserComputedPropertyName1.js index ee5b0a22cb6..4a42b2e97e7 100644 --- a/tests/baselines/reference/parserComputedPropertyName1.js +++ b/tests/baselines/reference/parserComputedPropertyName1.js @@ -2,4 +2,6 @@ var v = { [e] }; //// [parserComputedPropertyName1.js] -var v = { [e]: }; +var v = { + [e]: +}; diff --git a/tests/baselines/reference/parserComputedPropertyName12.js b/tests/baselines/reference/parserComputedPropertyName12.js index f879d4166dd..96e62b626e7 100644 --- a/tests/baselines/reference/parserComputedPropertyName12.js +++ b/tests/baselines/reference/parserComputedPropertyName12.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[e] = function () { }; + C.prototype[e] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserComputedPropertyName17.js b/tests/baselines/reference/parserComputedPropertyName17.js index f1fc4caacb3..cfff46e52fc 100644 --- a/tests/baselines/reference/parserComputedPropertyName17.js +++ b/tests/baselines/reference/parserComputedPropertyName17.js @@ -2,4 +2,7 @@ var v = { set [e](v) { } } //// [parserComputedPropertyName17.js] -var v = { set [e](v) { } }; +var v = { + set [e](v) { + } +}; diff --git a/tests/baselines/reference/parserComputedPropertyName2.js b/tests/baselines/reference/parserComputedPropertyName2.js index f3c41f963f5..ea8532945a1 100644 --- a/tests/baselines/reference/parserComputedPropertyName2.js +++ b/tests/baselines/reference/parserComputedPropertyName2.js @@ -2,4 +2,6 @@ var v = { [e]: 1 }; //// [parserComputedPropertyName2.js] -var v = { [e]: 1 }; +var v = { + [e]: 1 +}; diff --git a/tests/baselines/reference/parserComputedPropertyName24.js b/tests/baselines/reference/parserComputedPropertyName24.js index 13f14f2e466..0b9467fb26d 100644 --- a/tests/baselines/reference/parserComputedPropertyName24.js +++ b/tests/baselines/reference/parserComputedPropertyName24.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, e, { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserComputedPropertyName3.js b/tests/baselines/reference/parserComputedPropertyName3.js index 70273ed501d..b3c8cc27bf8 100644 --- a/tests/baselines/reference/parserComputedPropertyName3.js +++ b/tests/baselines/reference/parserComputedPropertyName3.js @@ -2,4 +2,7 @@ var v = { [e]() { } }; //// [parserComputedPropertyName3.js] -var v = { [e]() { } }; +var v = { + [e]() { + } +}; diff --git a/tests/baselines/reference/parserComputedPropertyName33.js b/tests/baselines/reference/parserComputedPropertyName33.js index 924bb872115..1cc06c06780 100644 --- a/tests/baselines/reference/parserComputedPropertyName33.js +++ b/tests/baselines/reference/parserComputedPropertyName33.js @@ -13,4 +13,5 @@ var C = (function () { } return C; })(); -{ } +{ +} diff --git a/tests/baselines/reference/parserComputedPropertyName38.js b/tests/baselines/reference/parserComputedPropertyName38.js index 6fc40f0802a..487ff4078fd 100644 --- a/tests/baselines/reference/parserComputedPropertyName38.js +++ b/tests/baselines/reference/parserComputedPropertyName38.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[public] = function () { }; + C.prototype[public] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserComputedPropertyName39.js b/tests/baselines/reference/parserComputedPropertyName39.js index 2849acd0562..c37312f0034 100644 --- a/tests/baselines/reference/parserComputedPropertyName39.js +++ b/tests/baselines/reference/parserComputedPropertyName39.js @@ -11,4 +11,5 @@ var C = (function () { } return C; })(); -(() => { }); +(() => { +}); diff --git a/tests/baselines/reference/parserComputedPropertyName4.js b/tests/baselines/reference/parserComputedPropertyName4.js index e456ca74f93..679733529a3 100644 --- a/tests/baselines/reference/parserComputedPropertyName4.js +++ b/tests/baselines/reference/parserComputedPropertyName4.js @@ -2,4 +2,7 @@ var v = { get [e]() { } }; //// [parserComputedPropertyName4.js] -var v = { get [e]() { } }; +var v = { + get [e]() { + } +}; diff --git a/tests/baselines/reference/parserComputedPropertyName40.js b/tests/baselines/reference/parserComputedPropertyName40.js index dc77466492d..5f6381360fc 100644 --- a/tests/baselines/reference/parserComputedPropertyName40.js +++ b/tests/baselines/reference/parserComputedPropertyName40.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[a ? "" : ""] = function () { }; + C.prototype[a ? "" : ""] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserComputedPropertyName5.js b/tests/baselines/reference/parserComputedPropertyName5.js index b94acd5523b..956b885bffb 100644 --- a/tests/baselines/reference/parserComputedPropertyName5.js +++ b/tests/baselines/reference/parserComputedPropertyName5.js @@ -2,4 +2,7 @@ var v = { public get [e]() { } }; //// [parserComputedPropertyName5.js] -var v = { get [e]() { } }; +var v = { + get [e]() { + } +}; diff --git a/tests/baselines/reference/parserComputedPropertyName6.js b/tests/baselines/reference/parserComputedPropertyName6.js index b60ad66a9d8..b18bb6ff305 100644 --- a/tests/baselines/reference/parserComputedPropertyName6.js +++ b/tests/baselines/reference/parserComputedPropertyName6.js @@ -2,4 +2,7 @@ var v = { [e]: 1, [e + e]: 2 }; //// [parserComputedPropertyName6.js] -var v = { [e]: 1, [e + e]: 2 }; +var v = { + [e]: 1, + [e + e]: 2 +}; diff --git a/tests/baselines/reference/parserES3Accessors1.js b/tests/baselines/reference/parserES3Accessors1.js index b4d0b9d6576..4900c1f32d9 100644 --- a/tests/baselines/reference/parserES3Accessors1.js +++ b/tests/baselines/reference/parserES3Accessors1.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserES3Accessors2.js b/tests/baselines/reference/parserES3Accessors2.js index 3d18e8ac280..08259f2655e 100644 --- a/tests/baselines/reference/parserES3Accessors2.js +++ b/tests/baselines/reference/parserES3Accessors2.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserES3Accessors3.js b/tests/baselines/reference/parserES3Accessors3.js index f623fc546fd..c7dc2e3cea6 100644 --- a/tests/baselines/reference/parserES3Accessors3.js +++ b/tests/baselines/reference/parserES3Accessors3.js @@ -2,4 +2,7 @@ var v = { get Foo() { } }; //// [parserES3Accessors3.js] -var v = { get Foo() { } }; +var v = { + get Foo() { + } +}; diff --git a/tests/baselines/reference/parserES3Accessors4.js b/tests/baselines/reference/parserES3Accessors4.js index 2bc5c9d1f78..9133c29a02a 100644 --- a/tests/baselines/reference/parserES3Accessors4.js +++ b/tests/baselines/reference/parserES3Accessors4.js @@ -2,4 +2,7 @@ var v = { set Foo(a) { } }; //// [parserES3Accessors4.js] -var v = { set Foo(a) { } }; +var v = { + set Foo(a) { + } +}; diff --git a/tests/baselines/reference/parserES5ComputedPropertyName3.js b/tests/baselines/reference/parserES5ComputedPropertyName3.js index 26067467953..85a031fdfa3 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName3.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName3.js @@ -3,6 +3,7 @@ var v = { [e]() { } }; //// [parserES5ComputedPropertyName3.js] var v = (_a = {}, - _a[e] = function () { }, + _a[e] = function () { + }, _a); var _a; diff --git a/tests/baselines/reference/parserES5ComputedPropertyName4.js b/tests/baselines/reference/parserES5ComputedPropertyName4.js index 378624af08b..5233471b6ff 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName4.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName4.js @@ -3,6 +3,11 @@ var v = { get [e]() { } }; //// [parserES5ComputedPropertyName4.js] var v = (_a = {}, - _a[e] = Object.defineProperty({ get: function () { }, enumerable: true, configurable: true }), + _a[e] = Object.defineProperty({ + get: function () { + }, + enumerable: true, + configurable: true + }), _a); var _a; diff --git a/tests/baselines/reference/parserES5ForOfStatement17.js b/tests/baselines/reference/parserES5ForOfStatement17.js index 7995c4c689e..29b4f32b912 100644 --- a/tests/baselines/reference/parserES5ForOfStatement17.js +++ b/tests/baselines/reference/parserES5ForOfStatement17.js @@ -2,4 +2,5 @@ for (var of; ;) { } //// [parserES5ForOfStatement17.js] -for (var of;;) { } +for (var of;;) { +} diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js index 1df3e0bed7b..c0d5c1f84a5 100644 --- a/tests/baselines/reference/parserES5ForOfStatement18.js +++ b/tests/baselines/reference/parserES5ForOfStatement18.js @@ -2,4 +2,5 @@ for (var of of of) { } //// [parserES5ForOfStatement18.js] -for (var of of of) { } +for (var of of of) { +} diff --git a/tests/baselines/reference/parserES5ForOfStatement19.js b/tests/baselines/reference/parserES5ForOfStatement19.js index 7ed0d5a333a..3838461a640 100644 --- a/tests/baselines/reference/parserES5ForOfStatement19.js +++ b/tests/baselines/reference/parserES5ForOfStatement19.js @@ -2,4 +2,5 @@ for (var of in of) { } //// [parserES5ForOfStatement19.js] -for (var of in of) { } +for (var of in of) { +} diff --git a/tests/baselines/reference/parserES5ForOfStatement20.js b/tests/baselines/reference/parserES5ForOfStatement20.js index c51cbbc2a3a..74fceaef68c 100644 --- a/tests/baselines/reference/parserES5ForOfStatement20.js +++ b/tests/baselines/reference/parserES5ForOfStatement20.js @@ -2,4 +2,5 @@ for (var of = 0 in of) { } //// [parserES5ForOfStatement20.js] -for (var of = 0 in of) { } +for (var of = 0 in of) { +} diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js index e02ed853cb5..36d4c4ba635 100644 --- a/tests/baselines/reference/parserES5ForOfStatement21.js +++ b/tests/baselines/reference/parserES5ForOfStatement21.js @@ -2,4 +2,5 @@ for (var of of) { } //// [parserES5ForOfStatement21.js] -for ( of of) { } +for ( of of) { +} diff --git a/tests/baselines/reference/parserES5SymbolProperty7.js b/tests/baselines/reference/parserES5SymbolProperty7.js index 102d10af417..b6096b798df 100644 --- a/tests/baselines/reference/parserES5SymbolProperty7.js +++ b/tests/baselines/reference/parserES5SymbolProperty7.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[Symbol.toStringTag] = function () { }; + C.prototype[Symbol.toStringTag] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.js b/tests/baselines/reference/parserErrantSemicolonInClass1.js index f761b04ca78..56eb3427168 100644 --- a/tests/baselines/reference/parserErrantSemicolonInClass1.js +++ b/tests/baselines/reference/parserErrantSemicolonInClass1.js @@ -39,7 +39,8 @@ class a { var a = (function () { function a(ns) { } - a.prototype.pgF = function () { }; + a.prototype.pgF = function () { + }; Object.defineProperty(a.prototype, "d", { get: function () { return 30; @@ -51,7 +52,10 @@ var a = (function () { }); Object.defineProperty(a, "p2", { get: function () { - return { x: 30, y: 40 }; + return { + x: 30, + y: 40 + }; }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js index c33dbc2a626..bea1ae993a5 100644 --- a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js +++ b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression1.js @@ -3,5 +3,12 @@ var v = [1, 2, 3 4, 5, 6, 7]; //// [parserErrorRecoveryArrayLiteralExpression1.js] -var v = [1, 2, 3, - 4, 5, 6, 7]; +var v = [ + 1, + 2, + 3, + 4, + 5, + 6, + 7 +]; diff --git a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js index 0bfe59964db..c56dcd4ad9e 100644 --- a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js +++ b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression2.js @@ -5,5 +5,13 @@ var points = [-0.6961439251899719, 1.207661509513855, 0.19374050199985504, -0 //// [parserErrorRecoveryArrayLiteralExpression2.js] -var points = [-0.6961439251899719, 1.207661509513855, 0.19374050199985504, -0, - .7042760848999023, 1.1955541372299194, 0.19600726664066315, -0.7120069861412048]; +var points = [ + -0.6961439251899719, + 1.207661509513855, + 0.19374050199985504, + -0, + .7042760848999023, + 1.1955541372299194, + 0.19600726664066315, + -0.7120069861412048 +]; diff --git a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression3.js b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression3.js index c366c750cc7..a40433ba461 100644 --- a/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression3.js +++ b/tests/baselines/reference/parserErrorRecoveryArrayLiteralExpression3.js @@ -4,6 +4,11 @@ var texCoords = [2, 2, 0.5000001192092895, 0.8749999 ; 403953552, 0.500000119209 //// [parserErrorRecoveryArrayLiteralExpression3.js] -var texCoords = [2, 2, 0.5000001192092895, 0.8749999]; +var texCoords = [ + 2, + 2, + 0.5000001192092895, + 0.8749999 +]; 403953552, 0.5000001192092895, 0.8749999403953552; ; diff --git a/tests/baselines/reference/parserErrorRecovery_Block1.js b/tests/baselines/reference/parserErrorRecovery_Block1.js index e2bc5f89a39..cdcd5856fa6 100644 --- a/tests/baselines/reference/parserErrorRecovery_Block1.js +++ b/tests/baselines/reference/parserErrorRecovery_Block1.js @@ -6,7 +6,6 @@ function f() { //// [parserErrorRecovery_Block1.js] function f() { - 1 + - ; + 1 + ; return; } diff --git a/tests/baselines/reference/parserErrorRecovery_Block3.js b/tests/baselines/reference/parserErrorRecovery_Block3.js index 55b0a4d65e7..30183fb7d8b 100644 --- a/tests/baselines/reference/parserErrorRecovery_Block3.js +++ b/tests/baselines/reference/parserErrorRecovery_Block3.js @@ -10,7 +10,8 @@ class C { var C = (function () { function C() { } - C.prototype.a = function () { }; + C.prototype.a = function () { + }; C.prototype.b = function () { }; return C; diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js index ae2509c3f49..c26b16b5a0a 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js @@ -41,7 +41,9 @@ var Shapes; this.con = "hello"; } // Instance member - Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; + Point.prototype.getDist = function () { + return Math.sqrt(this.x * this.x + this.y * this.y); + }; // Static member Point.origin = new Point(0, 0); return Point; diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js index 4936b1ea8bc..866f96a8030 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js @@ -41,7 +41,9 @@ var Shapes; this.con = "hello"; } // Instance member - Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; + Point.prototype.getDist = function () { + return Math.sqrt(this.x * this.x + this.y * this.y); + }; // Static member Point.origin = new Point(0, 0); return Point; diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral1.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral1.js index dbf89fec52b..04085a4b595 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral1.js +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral1.js @@ -2,4 +2,7 @@ var v = { a: 1 b: 2 } //// [parserErrorRecovery_ObjectLiteral1.js] -var v = { a: 1, b: 2 }; +var v = { + a: 1, + b: 2 +}; diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js index 6a703759fff..3c258ef406e 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js @@ -3,5 +3,7 @@ var v = { a return; //// [parserErrorRecovery_ObjectLiteral2.js] -var v = { a: , - return: }; +var v = { + a: , + return: +}; diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js index eecf45fea4f..49902122ac3 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js @@ -3,5 +3,7 @@ var v = { a: return; //// [parserErrorRecovery_ObjectLiteral3.js] -var v = { a: , - return: }; +var v = { + a: , + return: +}; diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js index 87a1a31437e..b0962100500 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js @@ -3,5 +3,7 @@ var v = { a: 1 return; //// [parserErrorRecovery_ObjectLiteral4.js] -var v = { a: 1, - return: }; +var v = { + a: 1, + return: +}; diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js index 97e618946a0..6b691e376ce 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js @@ -3,5 +3,7 @@ var v = { a: 1, return; //// [parserErrorRecovery_ObjectLiteral5.js] -var v = { a: 1, - return: }; +var v = { + a: 1, + return: +}; diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js index 060ad14766b..e83c045208d 100644 --- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js +++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js @@ -11,4 +11,5 @@ var Foo = (function () { return Foo; })(); break ; -{ } +{ +} diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement1.js b/tests/baselines/reference/parserErrorRecovery_SwitchStatement1.js index 4d8008639c9..63591985d1e 100644 --- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement1.js +++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement1.js @@ -10,10 +10,8 @@ switch (e) { //// [parserErrorRecovery_SwitchStatement1.js] switch (e) { case 1: - 1 + - ; + 1 + ; case 2: - 1 + - ; + 1 + ; default: } diff --git a/tests/baselines/reference/parserForOfStatement17.js b/tests/baselines/reference/parserForOfStatement17.js index a6e2aee79a4..38ee81e71fc 100644 --- a/tests/baselines/reference/parserForOfStatement17.js +++ b/tests/baselines/reference/parserForOfStatement17.js @@ -2,4 +2,5 @@ for (var of; ;) { } //// [parserForOfStatement17.js] -for (var of;;) { } +for (var of;;) { +} diff --git a/tests/baselines/reference/parserForOfStatement18.js b/tests/baselines/reference/parserForOfStatement18.js index c30fbb60857..519d92f3357 100644 --- a/tests/baselines/reference/parserForOfStatement18.js +++ b/tests/baselines/reference/parserForOfStatement18.js @@ -2,4 +2,5 @@ for (var of of of) { } //// [parserForOfStatement18.js] -for (var of of of) { } +for (var of of of) { +} diff --git a/tests/baselines/reference/parserForOfStatement19.js b/tests/baselines/reference/parserForOfStatement19.js index c838e8c71e0..9b6a5c8da27 100644 --- a/tests/baselines/reference/parserForOfStatement19.js +++ b/tests/baselines/reference/parserForOfStatement19.js @@ -2,4 +2,5 @@ for (var of in of) { } //// [parserForOfStatement19.js] -for (var of in of) { } +for (var of in of) { +} diff --git a/tests/baselines/reference/parserForOfStatement20.js b/tests/baselines/reference/parserForOfStatement20.js index 8599238d853..7190bbeb1d2 100644 --- a/tests/baselines/reference/parserForOfStatement20.js +++ b/tests/baselines/reference/parserForOfStatement20.js @@ -2,4 +2,5 @@ for (var of = 0 in of) { } //// [parserForOfStatement20.js] -for (var of = 0 in of) { } +for (var of = 0 in of) { +} diff --git a/tests/baselines/reference/parserForOfStatement21.js b/tests/baselines/reference/parserForOfStatement21.js index 5db883e18a0..593582e035a 100644 --- a/tests/baselines/reference/parserForOfStatement21.js +++ b/tests/baselines/reference/parserForOfStatement21.js @@ -2,4 +2,5 @@ for (var of of) { } //// [parserForOfStatement21.js] -for ( of of) { } +for ( of of) { +} diff --git a/tests/baselines/reference/parserFunctionDeclaration4.js b/tests/baselines/reference/parserFunctionDeclaration4.js index a36a41e0809..285f36e6838 100644 --- a/tests/baselines/reference/parserFunctionDeclaration4.js +++ b/tests/baselines/reference/parserFunctionDeclaration4.js @@ -3,4 +3,5 @@ function foo(); function bar() { } //// [parserFunctionDeclaration4.js] -function bar() { } +function bar() { +} diff --git a/tests/baselines/reference/parserFunctionDeclaration5.js b/tests/baselines/reference/parserFunctionDeclaration5.js index fd35c14675e..1c80f842c0d 100644 --- a/tests/baselines/reference/parserFunctionDeclaration5.js +++ b/tests/baselines/reference/parserFunctionDeclaration5.js @@ -3,4 +3,5 @@ function foo(); function foo() { } //// [parserFunctionDeclaration5.js] -function foo() { } +function foo() { +} diff --git a/tests/baselines/reference/parserFunctionDeclaration6.js b/tests/baselines/reference/parserFunctionDeclaration6.js index 05afe2d33a8..6f877b07b14 100644 --- a/tests/baselines/reference/parserFunctionDeclaration6.js +++ b/tests/baselines/reference/parserFunctionDeclaration6.js @@ -6,5 +6,6 @@ //// [parserFunctionDeclaration6.js] { - function bar() { } + function bar() { + } } diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment1.js b/tests/baselines/reference/parserFunctionPropertyAssignment1.js index ea7b20f05d5..c66c134ac48 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment1.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment1.js @@ -2,4 +2,7 @@ var v = { foo() { } }; //// [parserFunctionPropertyAssignment1.js] -var v = { foo: function () { } }; +var v = { + foo: function () { + } +}; diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.js b/tests/baselines/reference/parserFunctionPropertyAssignment2.js index 668e8df2cfc..7f6b3001c9b 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment2.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment2.js @@ -2,4 +2,7 @@ var v = { 0() { } }; //// [parserFunctionPropertyAssignment2.js] -var v = { 0: function () { } }; +var v = { + 0: function () { + } +}; diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.js b/tests/baselines/reference/parserFunctionPropertyAssignment3.js index 87a98ac402c..2ed2152ae19 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment3.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.js @@ -2,4 +2,7 @@ var v = { "foo"() { } }; //// [parserFunctionPropertyAssignment3.js] -var v = { "foo": function () { } }; +var v = { + "foo": function () { + } +}; diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.js b/tests/baselines/reference/parserFunctionPropertyAssignment4.js index e9b41e754e6..eb95d79ac40 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment4.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.js @@ -2,4 +2,7 @@ var v = { 0() { } }; //// [parserFunctionPropertyAssignment4.js] -var v = { 0: function () { } }; +var v = { + 0: function () { + } +}; diff --git a/tests/baselines/reference/parserFuzz1.js b/tests/baselines/reference/parserFuzz1.js index b9ffb540049..969c07c1659 100644 --- a/tests/baselines/reference/parserFuzz1.js +++ b/tests/baselines/reference/parserFuzz1.js @@ -6,6 +6,8 @@ cla >> 2; +1 >>> 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity14.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity14.js index b2eba6d5873..5cc8bb3b88e 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity14.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity14.js @@ -3,6 +3,5 @@ = 2; //// [parserGreaterThanTokenAmbiguity14.js] -1 >> -; +1 >> ; 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js index 7b44da35688..df9e55b7e3c 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js @@ -5,5 +5,4 @@ 2; //// [parserGreaterThanTokenAmbiguity15.js] -1 - >>= 2; +1 >>= 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity19.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity19.js index d0671d8649f..52035691c84 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity19.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity19.js @@ -3,6 +3,5 @@ = 2; //// [parserGreaterThanTokenAmbiguity19.js] -1 >>> -; +1 >>> ; 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js index 7a3650fdfd5..e6043febcd1 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js @@ -5,5 +5,4 @@ 2; //// [parserGreaterThanTokenAmbiguity20.js] -1 - >>>= 2; +1 >>>= 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js index dcfb51575e4..5ef065681dc 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.js @@ -3,5 +3,4 @@ > 2; //// [parserGreaterThanTokenAmbiguity4.js] -1 > - > 2; +1 > > 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js index baa3af48e9d..a707e808b4a 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js @@ -5,5 +5,4 @@ 2; //// [parserGreaterThanTokenAmbiguity5.js] -1 - >> 2; +1 >> 2; diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js index 96be8d0749c..25c5ed53a7c 100644 --- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js +++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity9.js @@ -3,5 +3,4 @@ > 2; //// [parserGreaterThanTokenAmbiguity9.js] -1 >> - > 2; +1 >> > 2; diff --git a/tests/baselines/reference/parserInExpression1.js b/tests/baselines/reference/parserInExpression1.js index d6100b9b57f..21538288049 100644 --- a/tests/baselines/reference/parserInExpression1.js +++ b/tests/baselines/reference/parserInExpression1.js @@ -2,4 +2,6 @@ console.log("a" in { "a": true }); //// [parserInExpression1.js] -console.log("a" in { "a": true }); +console.log("a" in { + "a": true +}); diff --git a/tests/baselines/reference/parserMemberAccessor1.js b/tests/baselines/reference/parserMemberAccessor1.js index 866a171bc43..3d4690d58e9 100644 --- a/tests/baselines/reference/parserMemberAccessor1.js +++ b/tests/baselines/reference/parserMemberAccessor1.js @@ -9,8 +9,10 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "foo", { - get: function () { }, - set: function (a) { }, + get: function () { + }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.js b/tests/baselines/reference/parserMemberAccessorDeclaration1.js index 30534735cfc..1f0b5eb3bd9 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration1.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "a", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.js b/tests/baselines/reference/parserMemberAccessorDeclaration10.js index d778b192279..dba06544963 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration10.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { } + get: function () { + } exports.Foo = Foo;, enumerable: true, configurable: true diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.js b/tests/baselines/reference/parserMemberAccessorDeclaration11.js index da8d7fc6425..2a286b8ca6b 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration11.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration11.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.js b/tests/baselines/reference/parserMemberAccessorDeclaration12.js index 72923e060c4..aea6eccfbc2 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration12.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function (a) { }, + get: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration13.js b/tests/baselines/reference/parserMemberAccessorDeclaration13.js index 14b0f1b0a05..f6ca4ee6a02 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration13.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration13.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function () { }, + set: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration14.js b/tests/baselines/reference/parserMemberAccessorDeclaration14.js index 21b11219ca1..62877d402d1 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration14.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration14.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a, b) { }, + set: function (a, b) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration15.js b/tests/baselines/reference/parserMemberAccessorDeclaration15.js index 0d01c75840c..59ff360d432 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration15.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration15.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration17.js b/tests/baselines/reference/parserMemberAccessorDeclaration17.js index d61fa2e8409..6c99c7ddae6 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration17.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration17.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - set: function (a) { }, + set: function (a) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.js b/tests/baselines/reference/parserMemberAccessorDeclaration2.js index f29efc846ee..00cc2812014 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration2.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "b", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js index 9c64bf02522..86fc2c3e532 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration3.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "0", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.js b/tests/baselines/reference/parserMemberAccessorDeclaration4.js index e65f6431a7c..552c2c1d27a 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration4.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "a", { - set: function (i) { }, + set: function (i) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.js b/tests/baselines/reference/parserMemberAccessorDeclaration5.js index d304a44d64d..309df8b68ec 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration5.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "a", { - set: function (i) { }, + set: function (i) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js index 9c6f3ce8a55..0b44673f146 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration6.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "0", { - set: function (i) { }, + set: function (i) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.js b/tests/baselines/reference/parserMemberAccessorDeclaration7.js index ce103accf61..0d2d24092e5 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration7.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.js b/tests/baselines/reference/parserMemberAccessorDeclaration8.js index 07f12acae40..dd93fa4852e 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration8.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.js b/tests/baselines/reference/parserMemberAccessorDeclaration9.js index 02183d46ef1..5fca86f689b 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration9.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C, "Foo", { - get: function () { }, + get: function () { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration1.js b/tests/baselines/reference/parserMemberFunctionDeclaration1.js index 1d40fa94700..564245157b0 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration1.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration1.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.Foo = function () { }; + C.prototype.Foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration2.js b/tests/baselines/reference/parserMemberFunctionDeclaration2.js index fed1a6a0743..0f103c90b7d 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration2.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration2.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.Foo = function () { }; + C.Foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration3.js b/tests/baselines/reference/parserMemberFunctionDeclaration3.js index 18bbec7ba5f..46243f08dad 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration3.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration3.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.Foo = function () { }; + C.Foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration4.js b/tests/baselines/reference/parserMemberFunctionDeclaration4.js index cd12f23442c..bcf00aeb1bc 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration4.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration4.js @@ -7,7 +7,8 @@ class C { var C = (function () { function C() { } - C.prototype.Foo = 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..da2d2281999 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration5.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration5.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.Foo = function () { }; + C.prototype.Foo = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js index e0a0f7860cc..59017d97fe2 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js +++ b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js @@ -17,13 +17,21 @@ class C { var C = (function () { function C() { } - C.prototype.public = function () { }; - C.prototype.static = function () { }; - C.prototype.public = function () { }; - C.prototype.static = function () { }; - C.public = function () { }; - C.static = function () { }; - C.public = function () { }; - C.static = function () { }; + C.prototype.public = function () { + }; + C.prototype.static = function () { + }; + C.prototype.public = function () { + }; + C.prototype.static = function () { + }; + C.public = function () { + }; + C.static = function () { + }; + C.public = function () { + }; + C.static = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js index 8280d8dc9b2..1c532f3d4b4 100644 --- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js +++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js @@ -16,7 +16,9 @@ var C = (function () { var _this = this; return fromDoWhile(function (test) { var index = 0; - return _this.doWhile(function (item, i) { return filter(item, i) ? test(item, index++) : true; }); + return _this.doWhile(function (item, i) { + return filter(item, i) ? test(item, index++) : true; + }); }); }; return C; diff --git a/tests/baselines/reference/parserMissingToken1.js b/tests/baselines/reference/parserMissingToken1.js index 7017d9d0b17..506e628fa38 100644 --- a/tests/baselines/reference/parserMissingToken1.js +++ b/tests/baselines/reference/parserMissingToken1.js @@ -3,5 +3,7 @@ a / finally //// [parserMissingToken1.js] a / ; -try { } -finally { } +try { +} +finally { +} diff --git a/tests/baselines/reference/parserNoASIOnCallAfterFunctionExpression1.js b/tests/baselines/reference/parserNoASIOnCallAfterFunctionExpression1.js index 51581b1c74f..83df05206ce 100644 --- a/tests/baselines/reference/parserNoASIOnCallAfterFunctionExpression1.js +++ b/tests/baselines/reference/parserNoASIOnCallAfterFunctionExpression1.js @@ -4,4 +4,5 @@ var x = function () { } //// [parserNoASIOnCallAfterFunctionExpression1.js] -var x = function () { }(window).foo; +var x = function () { +}(window).foo; diff --git a/tests/baselines/reference/parserNotHexLiteral1.js b/tests/baselines/reference/parserNotHexLiteral1.js index 89b978fcaa8..eadbf8da275 100644 --- a/tests/baselines/reference/parserNotHexLiteral1.js +++ b/tests/baselines/reference/parserNotHexLiteral1.js @@ -7,7 +7,10 @@ console.info (x.e0); //// [parserNotHexLiteral1.js] -var x = { e0: 'cat', x0: 'dog' }; +var x = { + e0: 'cat', + x0: 'dog' +}; console.info(x.x0); // tsc dies on this next line with "bug.ts (5,16): Expected ')'" // tsc seems to be parsing the e0 as a hex constant. diff --git a/tests/baselines/reference/parserObjectLiterals1.js b/tests/baselines/reference/parserObjectLiterals1.js index 426b8107d3b..2224809474b 100644 --- a/tests/baselines/reference/parserObjectLiterals1.js +++ b/tests/baselines/reference/parserObjectLiterals1.js @@ -2,4 +2,7 @@ var v = { a: 1, b: 2 }; //// [parserObjectLiterals1.js] -var v = { a: 1, b: 2 }; +var v = { + a: 1, + b: 2 +}; diff --git a/tests/baselines/reference/parserParameterList1.js b/tests/baselines/reference/parserParameterList1.js index 86b0690728d..49af7780b1f 100644 --- a/tests/baselines/reference/parserParameterList1.js +++ b/tests/baselines/reference/parserParameterList1.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.F = function (A, B) { }; + C.prototype.F = function (A, B) { + }; return C; })(); diff --git a/tests/baselines/reference/parserParameterList15.js b/tests/baselines/reference/parserParameterList15.js index 83216f12568..289c65c88c2 100644 --- a/tests/baselines/reference/parserParameterList15.js +++ b/tests/baselines/reference/parserParameterList15.js @@ -3,4 +3,5 @@ function foo(a = 4); function foo(a, b) {} //// [parserParameterList15.js] -function foo(a, b) { } +function foo(a, b) { +} diff --git a/tests/baselines/reference/parserParameterList16.js b/tests/baselines/reference/parserParameterList16.js index 50c58215478..368939bbcdc 100644 --- a/tests/baselines/reference/parserParameterList16.js +++ b/tests/baselines/reference/parserParameterList16.js @@ -8,6 +8,7 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function (a, b) { }; + C.prototype.foo = function (a, b) { + }; return C; })(); diff --git a/tests/baselines/reference/parserParameterList3.js b/tests/baselines/reference/parserParameterList3.js index 3992dc548ef..01135f0ceff 100644 --- a/tests/baselines/reference/parserParameterList3.js +++ b/tests/baselines/reference/parserParameterList3.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype.F = function (A, B) { }; + C.prototype.F = function (A, B) { + }; return C; })(); diff --git a/tests/baselines/reference/parserRealSource1.js b/tests/baselines/reference/parserRealSource1.js index d19c2242f0b..c62897c9aff 100644 --- a/tests/baselines/reference/parserRealSource1.js +++ b/tests/baselines/reference/parserRealSource1.js @@ -189,11 +189,21 @@ var TypeScript; var NullLogger = (function () { function NullLogger() { } - NullLogger.prototype.information = function () { return false; }; - NullLogger.prototype.debug = function () { return false; }; - NullLogger.prototype.warning = function () { return false; }; - NullLogger.prototype.error = function () { return false; }; - NullLogger.prototype.fatal = function () { return false; }; + NullLogger.prototype.information = function () { + return false; + }; + NullLogger.prototype.debug = function () { + return false; + }; + NullLogger.prototype.warning = function () { + return false; + }; + NullLogger.prototype.error = function () { + return false; + }; + NullLogger.prototype.fatal = function () { + return false; + }; NullLogger.prototype.log = function (s) { }; return NullLogger; @@ -208,11 +218,21 @@ var TypeScript; this._error = this.logger.error(); this._fatal = this.logger.fatal(); } - LoggerAdapter.prototype.information = function () { return this._information; }; - LoggerAdapter.prototype.debug = function () { return this._debug; }; - LoggerAdapter.prototype.warning = function () { return this._warning; }; - LoggerAdapter.prototype.error = function () { return this._error; }; - LoggerAdapter.prototype.fatal = function () { return this._fatal; }; + LoggerAdapter.prototype.information = function () { + return this._information; + }; + LoggerAdapter.prototype.debug = function () { + return this._debug; + }; + LoggerAdapter.prototype.warning = function () { + return this._warning; + }; + LoggerAdapter.prototype.error = function () { + return this._error; + }; + LoggerAdapter.prototype.fatal = function () { + return this._fatal; + }; LoggerAdapter.prototype.log = function (s) { this.logger.log(s); }; @@ -223,11 +243,21 @@ var TypeScript; function BufferedLogger() { this.logContents = []; } - BufferedLogger.prototype.information = function () { return false; }; - BufferedLogger.prototype.debug = function () { return false; }; - BufferedLogger.prototype.warning = function () { return false; }; - BufferedLogger.prototype.error = function () { return false; }; - BufferedLogger.prototype.fatal = function () { return false; }; + BufferedLogger.prototype.information = function () { + return false; + }; + BufferedLogger.prototype.debug = function () { + return false; + }; + BufferedLogger.prototype.warning = function () { + return false; + }; + BufferedLogger.prototype.error = function () { + return false; + }; + BufferedLogger.prototype.fatal = function () { + return false; + }; BufferedLogger.prototype.log = function (s) { this.logContents.push(s); }; diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js index 768e35c1a3b..0dd944a7721 100644 --- a/tests/baselines/reference/parserRealSource10.js +++ b/tests/baselines/reference/parserRealSource10.js @@ -813,8 +813,7 @@ var TypeScript; else { var tokenInfo = lookupToken(this.tokenId); if (tokenInfo != undefined) { - if ((tokenInfo.unopNodeType != NodeType.None) || - (tokenInfo.binopNodeType != NodeType.None)) { + if ((tokenInfo.unopNodeType != NodeType.None) || (tokenInfo.binopNodeType != NodeType.None)) { return 2 /* Operator */; } } diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js index 72fec692184..89c38a96fdf 100644 --- a/tests/baselines/reference/parserRealSource11.js +++ b/tests/baselines/reference/parserRealSource11.js @@ -2397,10 +2397,18 @@ var TypeScript; this.postComments = null; this.isParenthesized = false; } - AST.prototype.isExpression = function () { return false; }; - AST.prototype.isStatementOrExpression = function () { return false; }; - AST.prototype.isCompoundStatement = function () { return false; }; - AST.prototype.isLeaf = function () { return this.isStatementOrExpression() && (!this.isCompoundStatement()); }; + AST.prototype.isExpression = function () { + return false; + }; + AST.prototype.isStatementOrExpression = function () { + return false; + }; + AST.prototype.isCompoundStatement = function () { + return false; + }; + AST.prototype.isLeaf = function () { + return this.isStatementOrExpression() && (!this.isCompoundStatement()); + }; AST.prototype.typeCheck = function (typeFlow) { switch (this.nodeType) { case NodeType.Error: @@ -2483,13 +2491,18 @@ var TypeScript; }; AST.prototype.print = function (context) { context.startLine(); - var lineCol = { line: -1, col: -1 }; - var limLineCol = { line: -1, col: -1 }; + var lineCol = { + line: -1, + col: -1 + }; + var limLineCol = { + line: -1, + col: -1 + }; if (context.parser !== null) { context.parser.getSourceLineCol(lineCol, this.minChar); context.parser.getSourceLineCol(limLineCol, this.limChar); - context.write("(" + lineCol.line + "," + lineCol.col + ")--" + - "(" + limLineCol.line + "," + limLineCol.col + "): "); + context.write("(" + lineCol.line + "," + lineCol.col + ")--" + "(" + limLineCol.line + "," + limLineCol.col + "): "); } var lab = this.printLabel(); if (hasFlag(this.flags, ASTFlags.Error)) { @@ -2636,8 +2649,12 @@ var TypeScript; this.text = actualText; } }; - Identifier.prototype.isMissing = function () { return false; }; - Identifier.prototype.isLeaf = function () { return true; }; + Identifier.prototype.isMissing = function () { + return false; + }; + Identifier.prototype.isLeaf = function () { + return true; + }; Identifier.prototype.treeViewLabel = function () { return "id: " + this.actualText; }; @@ -2681,7 +2698,9 @@ var TypeScript; _super.call(this, NodeType.Label); this.id = id; } - Label.prototype.printLabel = function () { return this.id.actualText + ":"; }; + Label.prototype.printLabel = function () { + return this.id.actualText + ":"; + }; Label.prototype.typeCheck = function (typeFlow) { this.type = typeFlow.voidType; return this; @@ -2704,8 +2723,12 @@ var TypeScript; function Expression(nodeType) { _super.call(this, nodeType); } - Expression.prototype.isExpression = function () { return true; }; - Expression.prototype.isStatementOrExpression = function () { return true; }; + Expression.prototype.isExpression = function () { + return true; + }; + Expression.prototype.isStatementOrExpression = function () { + return true; + }; return Expression; })(AST); TypeScript.Expression = Expression; @@ -3166,7 +3189,9 @@ var TypeScript; this.varFlags = VarFlags.None; this.isDynamicImport = false; } - ImportDeclaration.prototype.isStatementOrExpression = function () { return true; }; + ImportDeclaration.prototype.isStatementOrExpression = function () { + return true; + }; ImportDeclaration.prototype.emit = function (emitter, tokenId, startLine) { var mod = this.alias.type; // REVIEW: Only modules may be aliased for now, though there's no real @@ -3227,10 +3252,18 @@ var TypeScript; this.varFlags = VarFlags.None; this.sym = null; } - BoundDecl.prototype.isStatementOrExpression = function () { return true; }; - BoundDecl.prototype.isPrivate = function () { return hasFlag(this.varFlags, VarFlags.Private); }; - BoundDecl.prototype.isPublic = function () { return hasFlag(this.varFlags, VarFlags.Public); }; - BoundDecl.prototype.isProperty = function () { return hasFlag(this.varFlags, VarFlags.Property); }; + BoundDecl.prototype.isStatementOrExpression = function () { + return true; + }; + BoundDecl.prototype.isPrivate = function () { + return hasFlag(this.varFlags, VarFlags.Private); + }; + BoundDecl.prototype.isPublic = function () { + return hasFlag(this.varFlags, VarFlags.Public); + }; + BoundDecl.prototype.isProperty = function () { + return hasFlag(this.varFlags, VarFlags.Property); + }; BoundDecl.prototype.typeCheck = function (typeFlow) { return typeFlow.typeCheckBoundDecl(this); }; @@ -3245,9 +3278,15 @@ var TypeScript; function VarDecl(id, nest) { _super.call(this, id, NodeType.VarDecl, nest); } - VarDecl.prototype.isAmbient = function () { return hasFlag(this.varFlags, VarFlags.Ambient); }; - VarDecl.prototype.isExported = function () { return hasFlag(this.varFlags, VarFlags.Exported); }; - VarDecl.prototype.isStatic = function () { return hasFlag(this.varFlags, VarFlags.Static); }; + VarDecl.prototype.isAmbient = function () { + return hasFlag(this.varFlags, VarFlags.Ambient); + }; + VarDecl.prototype.isExported = function () { + return hasFlag(this.varFlags, VarFlags.Exported); + }; + VarDecl.prototype.isStatic = function () { + return hasFlag(this.varFlags, VarFlags.Static); + }; VarDecl.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitJavascriptVarDecl(this, tokenId); }; @@ -3264,7 +3303,9 @@ var TypeScript; this.isOptional = false; this.parameterPropertySym = null; } - ArgDecl.prototype.isOptionalArg = function () { return this.isOptional || this.init; }; + ArgDecl.prototype.isOptionalArg = function () { + return this.isOptional || this.init; + }; ArgDecl.prototype.treeViewLabel = function () { return "arg: " + this.id.actualText; }; @@ -3325,8 +3366,12 @@ var TypeScript; } return this.internalNameCache; }; - FuncDecl.prototype.hasSelfReference = function () { return hasFlag(this.fncFlags, FncFlags.HasSelfReference); }; - FuncDecl.prototype.setHasSelfReference = function () { this.fncFlags |= FncFlags.HasSelfReference; }; + FuncDecl.prototype.hasSelfReference = function () { + return hasFlag(this.fncFlags, FncFlags.HasSelfReference); + }; + FuncDecl.prototype.setHasSelfReference = function () { + this.fncFlags |= FncFlags.HasSelfReference; + }; FuncDecl.prototype.addCloRef = function (id, sym) { if (this.envids == null) { this.envids = new Identifier[]; @@ -3380,19 +3425,45 @@ var TypeScript; FuncDecl.prototype.isMethod = function () { return (this.fncFlags & FncFlags.Method) != FncFlags.None; }; - FuncDecl.prototype.isCallMember = function () { return hasFlag(this.fncFlags, FncFlags.CallMember); }; - FuncDecl.prototype.isConstructMember = function () { return hasFlag(this.fncFlags, FncFlags.ConstructMember); }; - FuncDecl.prototype.isIndexerMember = function () { return hasFlag(this.fncFlags, FncFlags.IndexerMember); }; - FuncDecl.prototype.isSpecialFn = function () { return this.isCallMember() || this.isIndexerMember() || this.isConstructMember(); }; - FuncDecl.prototype.isAnonymousFn = function () { return this.name === null; }; - FuncDecl.prototype.isAccessor = function () { return hasFlag(this.fncFlags, FncFlags.GetAccessor) || hasFlag(this.fncFlags, FncFlags.SetAccessor); }; - FuncDecl.prototype.isGetAccessor = function () { return hasFlag(this.fncFlags, FncFlags.GetAccessor); }; - FuncDecl.prototype.isSetAccessor = function () { return hasFlag(this.fncFlags, FncFlags.SetAccessor); }; - FuncDecl.prototype.isAmbient = function () { return hasFlag(this.fncFlags, FncFlags.Ambient); }; - FuncDecl.prototype.isExported = function () { return hasFlag(this.fncFlags, FncFlags.Exported); }; - FuncDecl.prototype.isPrivate = function () { return hasFlag(this.fncFlags, FncFlags.Private); }; - FuncDecl.prototype.isPublic = function () { return hasFlag(this.fncFlags, FncFlags.Public); }; - FuncDecl.prototype.isStatic = function () { return hasFlag(this.fncFlags, FncFlags.Static); }; + FuncDecl.prototype.isCallMember = function () { + return hasFlag(this.fncFlags, FncFlags.CallMember); + }; + FuncDecl.prototype.isConstructMember = function () { + return hasFlag(this.fncFlags, FncFlags.ConstructMember); + }; + FuncDecl.prototype.isIndexerMember = function () { + return hasFlag(this.fncFlags, FncFlags.IndexerMember); + }; + FuncDecl.prototype.isSpecialFn = function () { + return this.isCallMember() || this.isIndexerMember() || this.isConstructMember(); + }; + FuncDecl.prototype.isAnonymousFn = function () { + return this.name === null; + }; + FuncDecl.prototype.isAccessor = function () { + return hasFlag(this.fncFlags, FncFlags.GetAccessor) || hasFlag(this.fncFlags, FncFlags.SetAccessor); + }; + FuncDecl.prototype.isGetAccessor = function () { + return hasFlag(this.fncFlags, FncFlags.GetAccessor); + }; + FuncDecl.prototype.isSetAccessor = function () { + return hasFlag(this.fncFlags, FncFlags.SetAccessor); + }; + FuncDecl.prototype.isAmbient = function () { + return hasFlag(this.fncFlags, FncFlags.Ambient); + }; + FuncDecl.prototype.isExported = function () { + return hasFlag(this.fncFlags, FncFlags.Exported); + }; + FuncDecl.prototype.isPrivate = function () { + return hasFlag(this.fncFlags, FncFlags.Private); + }; + FuncDecl.prototype.isPublic = function () { + return hasFlag(this.fncFlags, FncFlags.Public); + }; + FuncDecl.prototype.isStatic = function () { + return hasFlag(this.fncFlags, FncFlags.Static); + }; FuncDecl.prototype.treeViewLabel = function () { if (this.name == null) { return "funcExpr"; @@ -3404,8 +3475,12 @@ var TypeScript; FuncDecl.prototype.ClearFlags = function () { this.fncFlags = FncFlags.None; }; - 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)); }; + 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); TypeScript.FuncDecl = FuncDecl; @@ -3514,9 +3589,15 @@ var TypeScript; this.scopes = scopes; this.prettyName = this.name.actualText; } - ModuleDeclaration.prototype.isExported = function () { return hasFlag(this.modFlags, ModuleFlags.Exported); }; - ModuleDeclaration.prototype.isAmbient = function () { return hasFlag(this.modFlags, ModuleFlags.Ambient); }; - ModuleDeclaration.prototype.isEnum = function () { return hasFlag(this.modFlags, ModuleFlags.IsEnum); }; + ModuleDeclaration.prototype.isExported = function () { + return hasFlag(this.modFlags, ModuleFlags.Exported); + }; + ModuleDeclaration.prototype.isAmbient = function () { + return hasFlag(this.modFlags, ModuleFlags.Ambient); + }; + ModuleDeclaration.prototype.isEnum = function () { + return hasFlag(this.modFlags, ModuleFlags.IsEnum); + }; ModuleDeclaration.prototype.recordNonInterface = function () { this.modFlags &= ~ModuleFlags.ShouldEmitModuleDecl; }; @@ -3589,9 +3670,15 @@ var TypeScript; _super.call(this, nodeType); this.flags |= ASTFlags.IsStatement; } - Statement.prototype.isLoop = function () { return false; }; - Statement.prototype.isStatementOrExpression = function () { return true; }; - Statement.prototype.isCompoundStatement = function () { return this.isLoop(); }; + Statement.prototype.isLoop = function () { + return false; + }; + Statement.prototype.isStatementOrExpression = function () { + return true; + }; + Statement.prototype.isCompoundStatement = function () { + return this.isLoop(); + }; Statement.prototype.typeCheck = function (typeFlow) { this.type = typeFlow.voidType; return this; @@ -3695,7 +3782,9 @@ var TypeScript; this.target = null; this.resolvedTarget = null; } - Jump.prototype.hasExplicitTarget = function () { return (this.target); }; + Jump.prototype.hasExplicitTarget = function () { + return (this.target); + }; Jump.prototype.setResolvedTarget = function (parser, stmt) { if (stmt.isLoop()) { this.resolvedTarget = stmt; @@ -3746,7 +3835,9 @@ var TypeScript; this.cond = cond; this.body = null; } - WhileStatement.prototype.isLoop = function () { return true; }; + WhileStatement.prototype.isLoop = function () { + return true; + }; WhileStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -3799,7 +3890,9 @@ var TypeScript; this.whileAST = null; this.cond = null; } - DoWhileStatement.prototype.isLoop = function () { return true; }; + DoWhileStatement.prototype.isLoop = function () { + return true; + }; DoWhileStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -3855,7 +3948,9 @@ var TypeScript; this.elseBod = null; this.statement = new ASTSpan(); } - IfStatement.prototype.isCompoundStatement = function () { return true; }; + IfStatement.prototype.isCompoundStatement = function () { + return true; + }; IfStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -3975,7 +4070,9 @@ var TypeScript; this.lval.varFlags |= VarFlags.AutoInit; } } - ForInStatement.prototype.isLoop = function () { return true; }; + ForInStatement.prototype.isLoop = function () { + return true; + }; ForInStatement.prototype.isFiltered = function () { if (this.body) { var singleItem = null; @@ -4002,16 +4099,13 @@ var TypeScript; var target = cond.target; if (target.nodeType == NodeType.Dot) { var binex = target; - if ((binex.operand1.nodeType == NodeType.Name) && - (this.obj.nodeType == NodeType.Name) && - (binex.operand1.actualText == this.obj.actualText)) { + if ((binex.operand1.nodeType == NodeType.Name) && (this.obj.nodeType == NodeType.Name) && (binex.operand1.actualText == this.obj.actualText)) { var prop = binex.operand2; if (prop.actualText == "hasOwnProperty") { var args = cond.arguments; if ((args !== null) && (args.members.length == 1)) { var arg = args.members[0]; - if ((arg.nodeType == NodeType.Name) && - (this.lval.nodeType == NodeType.Name)) { + if ((arg.nodeType == NodeType.Name) && (this.lval.nodeType == NodeType.Name)) { if ((this.lval.actualText) == arg.actualText) { return true; } @@ -4085,7 +4179,9 @@ var TypeScript; _super.call(this, NodeType.For); this.init = init; } - ForStatement.prototype.isLoop = function () { return true; }; + ForStatement.prototype.isLoop = function () { + return true; + }; ForStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -4177,7 +4273,9 @@ var TypeScript; this.expr = expr; this.withSym = null; } - WithStatement.prototype.isCompoundStatement = function () { return true; }; + WithStatement.prototype.isCompoundStatement = function () { + return true; + }; WithStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -4204,7 +4302,9 @@ var TypeScript; this.defaultCase = null; this.statement = new ASTSpan(); } - SwitchStatement.prototype.isCompoundStatement = function () { return true; }; + SwitchStatement.prototype.isCompoundStatement = function () { + return true; + }; SwitchStatement.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -4358,7 +4458,9 @@ var TypeScript; this.tryNode = tryNode; this.finallyNode = finallyNode; } - TryFinally.prototype.isCompoundStatement = function () { return true; }; + TryFinally.prototype.isCompoundStatement = function () { + return true; + }; TryFinally.prototype.emit = function (emitter, tokenId, startLine) { emitter.recordSourceMappingStart(this); emitter.emitJavascript(this.tryNode, TokenID.Try, false); @@ -4403,7 +4505,9 @@ var TypeScript; this.tryNode = tryNode; this.catchNode = catchNode; } - TryCatch.prototype.isCompoundStatement = function () { return true; }; + TryCatch.prototype.isCompoundStatement = function () { + return true; + }; TryCatch.prototype.emit = function (emitter, tokenId, startLine) { emitter.emitParensAndCommentsInPlace(this, true); emitter.recordSourceMappingStart(this); @@ -4593,7 +4697,9 @@ var TypeScript; } } else { - this.text = [(this.content.replace(/^\s+|\s+$/g, ''))]; + this.text = [ + (this.content.replace(/^\s+|\s+$/g, '')) + ]; } } return this.text; diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index 8deae79f5e2..9b9ee2bcf84 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -607,7 +607,9 @@ var TypeScript; }; AstPath.prototype.clone = function () { var clone = new AstPath(); - clone.asts = this.asts.map(function (value) { return value; }); + clone.asts = this.asts.map(function (value) { + return value; + }); clone.top = this.top; return clone; }; @@ -656,288 +658,167 @@ var TypeScript; AstPath.prototype.isNameOfClass = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.ClassDeclaration) && - (this.parent().name === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.ClassDeclaration) && (this.parent().name === this.ast()); }; AstPath.prototype.isNameOfInterface = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.InterfaceDeclaration) && - (this.parent().name === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.InterfaceDeclaration) && (this.parent().name === this.ast()); }; AstPath.prototype.isNameOfArgument = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.ArgDecl) && - (this.parent().id === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.ArgDecl) && (this.parent().id === this.ast()); }; AstPath.prototype.isNameOfVariable = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.VarDecl) && - (this.parent().id === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.VarDecl) && (this.parent().id === this.ast()); }; AstPath.prototype.isNameOfModule = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.ModuleDeclaration) && - (this.parent().name === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.ModuleDeclaration) && (this.parent().name === this.ast()); }; AstPath.prototype.isNameOfFunction = function () { if (this.ast() === null || this.parent() === null) return false; - return (this.ast().nodeType === TypeScript.NodeType.Name) && - (this.parent().nodeType === TypeScript.NodeType.FuncDecl) && - (this.parent().name === this.ast()); + return (this.ast().nodeType === TypeScript.NodeType.Name) && (this.parent().nodeType === TypeScript.NodeType.FuncDecl) && (this.parent().name === this.ast()); }; AstPath.prototype.isChildOfScript = function () { var ast = lastOf(this.asts); - return this.count() >= 3 && - this.asts[this.top] === ast && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.Script; + return this.count() >= 3 && this.asts[this.top] === ast && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.Script; }; AstPath.prototype.isChildOfModule = function () { var ast = lastOf(this.asts); - return this.count() >= 3 && - this.asts[this.top] === ast && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.ModuleDeclaration; + return this.count() >= 3 && this.asts[this.top] === ast && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.ModuleDeclaration; }; AstPath.prototype.isChildOfClass = function () { var ast = lastOf(this.asts); - return this.count() >= 3 && - this.asts[this.top] === ast && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.ClassDeclaration; + return this.count() >= 3 && this.asts[this.top] === ast && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.ClassDeclaration; }; AstPath.prototype.isArgumentOfClassConstructor = function () { var ast = lastOf(this.asts); - return this.count() >= 5 && - this.asts[this.top] === ast && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.FuncDecl && - this.asts[this.top - 3].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 4].nodeType === TypeScript.NodeType.ClassDeclaration && - (this.asts[this.top - 2].isConstructor) && - (this.asts[this.top - 2].arguments === this.asts[this.top - 1]) && - (this.asts[this.top - 4].constructorDecl === this.asts[this.top - 2]); + return this.count() >= 5 && this.asts[this.top] === ast && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.FuncDecl && this.asts[this.top - 3].nodeType === TypeScript.NodeType.List && this.asts[this.top - 4].nodeType === TypeScript.NodeType.ClassDeclaration && (this.asts[this.top - 2].isConstructor) && (this.asts[this.top - 2].arguments === this.asts[this.top - 1]) && (this.asts[this.top - 4].constructorDecl === this.asts[this.top - 2]); }; AstPath.prototype.isChildOfInterface = function () { var ast = lastOf(this.asts); - return this.count() >= 3 && - this.asts[this.top] === ast && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.InterfaceDeclaration; + return this.count() >= 3 && this.asts[this.top] === ast && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.InterfaceDeclaration; }; AstPath.prototype.isTopLevelImplicitModule = function () { - return this.count() >= 1 && - this.asts[this.top].nodeType === TypeScript.NodeType.ModuleDeclaration && - TypeScript.hasFlag(this.asts[this.top].modFlags, TypeScript.ModuleFlags.IsWholeFile); + return this.count() >= 1 && this.asts[this.top].nodeType === TypeScript.NodeType.ModuleDeclaration && TypeScript.hasFlag(this.asts[this.top].modFlags, TypeScript.ModuleFlags.IsWholeFile); }; AstPath.prototype.isBodyOfTopLevelImplicitModule = function () { - return this.count() >= 2 && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ModuleDeclaration && - this.asts[this.top - 1].members == this.asts[this.top - 0] && - TypeScript.hasFlag(this.asts[this.top - 1].modFlags, TypeScript.ModuleFlags.IsWholeFile); + return this.count() >= 2 && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ModuleDeclaration && this.asts[this.top - 1].members == this.asts[this.top - 0] && TypeScript.hasFlag(this.asts[this.top - 1].modFlags, TypeScript.ModuleFlags.IsWholeFile); }; AstPath.prototype.isBodyOfScript = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Script && - this.asts[this.top - 1].bod == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Script && this.asts[this.top - 1].bod == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfSwitch = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Switch && - this.asts[this.top - 1].caseList == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Switch && this.asts[this.top - 1].caseList == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfModule = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ModuleDeclaration && - this.asts[this.top - 1].members == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ModuleDeclaration && this.asts[this.top - 1].members == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfClass = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ClassDeclaration && - this.asts[this.top - 1].members == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ClassDeclaration && this.asts[this.top - 1].members == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfFunction = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.FuncDecl && - this.asts[this.top - 1].bod == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.FuncDecl && this.asts[this.top - 1].bod == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfInterface = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.InterfaceDeclaration && - this.asts[this.top - 1].members == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.InterfaceDeclaration && this.asts[this.top - 1].members == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfBlock = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Block && - this.asts[this.top - 1].statements == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Block && this.asts[this.top - 1].statements == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfFor = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.For && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.For && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfCase = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Case && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Case && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfTry = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Try && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Try && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfCatch = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Catch && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Catch && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfDoWhile = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.DoWhile && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.DoWhile && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfWhile = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.While && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.While && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfForIn = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfWith = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.With && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.With && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfFinally = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Finally && - this.asts[this.top - 1].body == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Finally && this.asts[this.top - 1].body == this.asts[this.top - 0]; }; AstPath.prototype.isCaseOfSwitch = function () { - return this.count() >= 3 && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.Switch && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].caseList == this.asts[this.top - 1]; + return this.count() >= 3 && this.asts[this.top - 2].nodeType === TypeScript.NodeType.Switch && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].caseList == this.asts[this.top - 1]; }; AstPath.prototype.isDefaultCaseOfSwitch = function () { - return this.count() >= 3 && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.Switch && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].caseList == this.asts[this.top - 1] && - this.asts[this.top - 2].defaultCase == this.asts[this.top - 0]; + return this.count() >= 3 && this.asts[this.top - 2].nodeType === TypeScript.NodeType.Switch && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].caseList == this.asts[this.top - 1] && this.asts[this.top - 2].defaultCase == this.asts[this.top - 0]; }; AstPath.prototype.isListOfObjectLit = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ObjectLit && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].operand == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ObjectLit && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].operand == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfObjectLit = function () { return this.isListOfObjectLit(); }; AstPath.prototype.isEmptyListOfObjectLit = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ObjectLit && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].operand == this.asts[this.top - 0] && - this.asts[this.top - 0].members.length == 0; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ObjectLit && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].operand == this.asts[this.top - 0] && this.asts[this.top - 0].members.length == 0; }; AstPath.prototype.isMemberOfObjectLit = function () { - return this.count() >= 3 && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.ObjectLit && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.Member && - this.asts[this.top - 2].operand == this.asts[this.top - 1]; + return this.count() >= 3 && this.asts[this.top - 2].nodeType === TypeScript.NodeType.ObjectLit && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 0].nodeType === TypeScript.NodeType.Member && this.asts[this.top - 2].operand == this.asts[this.top - 1]; }; AstPath.prototype.isNameOfMemberOfObjectLit = function () { - return this.count() >= 4 && - this.asts[this.top - 3].nodeType === TypeScript.NodeType.ObjectLit && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.Name && - this.asts[this.top - 3].operand == this.asts[this.top - 2]; + return this.count() >= 4 && this.asts[this.top - 3].nodeType === TypeScript.NodeType.ObjectLit && this.asts[this.top - 2].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && this.asts[this.top - 0].nodeType === TypeScript.NodeType.Name && this.asts[this.top - 3].operand == this.asts[this.top - 2]; }; AstPath.prototype.isListOfArrayLit = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ArrayLit && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].operand == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ArrayLit && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].operand == this.asts[this.top - 0]; }; AstPath.prototype.isTargetOfMember = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && - this.asts[this.top - 1].operand1 === this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && this.asts[this.top - 1].operand1 === this.asts[this.top - 0]; }; AstPath.prototype.isMemberOfMember = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && - this.asts[this.top - 1].operand2 === this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Member && this.asts[this.top - 1].operand2 === this.asts[this.top - 0]; }; AstPath.prototype.isItemOfList = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List; //(this.asts[this.top - 1]).operand2 === this.asts[this.top - 0]; }; AstPath.prototype.isThenOfIf = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.If && - this.asts[this.top - 1].thenBod == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.If && this.asts[this.top - 1].thenBod == this.asts[this.top - 0]; }; AstPath.prototype.isElseOfIf = function () { - return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.If && - this.asts[this.top - 1].elseBod == this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.If && this.asts[this.top - 1].elseBod == this.asts[this.top - 0]; }; AstPath.prototype.isBodyOfDefaultCase = function () { return this.isBodyOfCase(); }; AstPath.prototype.isSingleStatementList = function () { - return this.count() >= 1 && - this.asts[this.top].nodeType === TypeScript.NodeType.List && - this.asts[this.top].members.length === 1; + return this.count() >= 1 && this.asts[this.top].nodeType === TypeScript.NodeType.List && this.asts[this.top].members.length === 1; }; AstPath.prototype.isArgumentListOfFunction = function () { - return this.count() >= 2 && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.FuncDecl && - this.asts[this.top - 1].arguments === this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].nodeType === TypeScript.NodeType.FuncDecl && this.asts[this.top - 1].arguments === this.asts[this.top - 0]; }; AstPath.prototype.isArgumentOfFunction = function () { - return this.count() >= 3 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 2].nodeType === TypeScript.NodeType.FuncDecl && - this.asts[this.top - 2].arguments === this.asts[this.top - 1]; + return this.count() >= 3 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.List && this.asts[this.top - 2].nodeType === TypeScript.NodeType.FuncDecl && this.asts[this.top - 2].arguments === this.asts[this.top - 1]; }; AstPath.prototype.isArgumentListOfCall = function () { - return this.count() >= 2 && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.Call && - this.asts[this.top - 1].arguments === this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].nodeType === TypeScript.NodeType.Call && this.asts[this.top - 1].arguments === this.asts[this.top - 0]; }; AstPath.prototype.isArgumentListOfNew = function () { - return this.count() >= 2 && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.New && - this.asts[this.top - 1].arguments === this.asts[this.top - 0]; + return this.count() >= 2 && this.asts[this.top - 0].nodeType === TypeScript.NodeType.List && this.asts[this.top - 1].nodeType === TypeScript.NodeType.New && this.asts[this.top - 1].arguments === this.asts[this.top - 0]; }; AstPath.prototype.isSynthesizedBlock = function () { - return this.count() >= 1 && - this.asts[this.top - 0].nodeType === TypeScript.NodeType.Block && - this.asts[this.top - 0].isStatementBlock === false; + return this.count() >= 1 && this.asts[this.top - 0].nodeType === TypeScript.NodeType.Block && this.asts[this.top - 0].isStatementBlock === false; }; return AstPath; })(); @@ -998,9 +879,7 @@ var TypeScript; // bar // 0123 // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid - var inclusive = hasFlag(options, 1 /* EdgeInclusive */) || - cur.nodeType === TypeScript.NodeType.Name || - pos === script.limChar; // Special "EOF" case + var inclusive = hasFlag(options, 1 /* EdgeInclusive */) || cur.nodeType === TypeScript.NodeType.Name || pos === script.limChar; // Special "EOF" case var minChar = cur.minChar; var limChar = cur.limChar + (inclusive ? 1 : 0); if (pos >= minChar && pos < limChar) { diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js index 563e9e92a08..1d6ed0aaf13 100644 --- a/tests/baselines/reference/parserRealSource4.js +++ b/tests/baselines/reference/parserRealSource4.js @@ -377,7 +377,9 @@ var TypeScript; } return false; }; - StringHashTable.prototype.count = function () { return this.itemCount; }; + StringHashTable.prototype.count = function () { + return this.itemCount; + }; StringHashTable.prototype.lookup = function (key) { var data = this.table[key]; if (data != undefined) { @@ -513,7 +515,9 @@ var TypeScript; } return result; }; - HashTable.prototype.count = function () { return this.itemCount; }; + HashTable.prototype.count = function () { + return this.itemCount; + }; HashTable.prototype.lookup = function (key) { var current; var val = this.hashFn(key); diff --git a/tests/baselines/reference/parserRealSource6.js b/tests/baselines/reference/parserRealSource6.js index d65207b8c77..e747b95e610 100644 --- a/tests/baselines/reference/parserRealSource6.js +++ b/tests/baselines/reference/parserRealSource6.js @@ -329,8 +329,7 @@ var TypeScript; // is has not been fully re-parsed yet. if (ast.nodeType == NodeType.Script && context.pos > limChar) limChar = context.pos; - if ((minChar <= context.pos) && - (limChar >= context.pos)) { + if ((minChar <= context.pos) && (limChar >= context.pos)) { switch (ast.nodeType) { case NodeType.Script: var script = ast; diff --git a/tests/baselines/reference/parserRealSource7.js b/tests/baselines/reference/parserRealSource7.js index 5073c33febd..73b9aab5017 100644 --- a/tests/baselines/reference/parserRealSource7.js +++ b/tests/baselines/reference/parserRealSource7.js @@ -962,7 +962,11 @@ var TypeScript; var importDecl = ast; var isExported = hasFlag(importDecl.varFlags, VarFlags.Exported); // REVIEW: technically, this call isn't strictly necessary, since we'll find the type during the call to resolveTypeMembers - var aliasedModSymbol = findSymbolFromAlias(importDecl.alias, { topLevelScope: scopeChain, members: null, tcContext: context }); + var aliasedModSymbol = findSymbolFromAlias(importDecl.alias, { + topLevelScope: scopeChain, + members: null, + tcContext: context + }); var isGlobal = context.scopeChain.container == context.checker.gloMod; if (aliasedModSymbol) { var aliasedModType = aliasedModSymbol.getType(); @@ -1053,8 +1057,7 @@ var TypeScript; if (isExported) { typeSymbol.flags |= SymbolFlags.Exported; } - if ((context.scopeChain.moduleDecl) || - (context.scopeChain.container == context.checker.gloMod)) { + if ((context.scopeChain.moduleDecl) || (context.scopeChain.container == context.checker.gloMod)) { typeSymbol.flags |= SymbolFlags.ModuleMember; } moduleDecl.mod = modType; @@ -1080,11 +1083,7 @@ var TypeScript; // REVIEW-CLASSES if (!typeSymbol) { var valTypeSymbol = scopeChain.scope.findLocal(className, false, false); - if (valTypeSymbol && - valTypeSymbol.isType() && - valTypeSymbol.declAST && - valTypeSymbol.declAST.nodeType == NodeType.FuncDecl && - valTypeSymbol.declAST.isSignature()) { + if (valTypeSymbol && valTypeSymbol.isType() && valTypeSymbol.declAST && valTypeSymbol.declAST.nodeType == NodeType.FuncDecl && valTypeSymbol.declAST.isSignature()) { typeSymbol = valTypeSymbol; foundValSymbol = true; if (isExported) { @@ -1238,10 +1237,7 @@ var TypeScript; if (context.scopeChain.moduleDecl) { context.scopeChain.moduleDecl.recordNonInterface(); } - if (isProperty || - isExported || - (context.scopeChain.container == context.checker.gloMod) || - context.scopeChain.moduleDecl) { + if (isProperty || isExported || (context.scopeChain.container == context.checker.gloMod) || context.scopeChain.moduleDecl) { if (isAmbient) { var existingSym = scopeChain.scope.findLocal(varDecl.id.text, false, false); if (existingSym) { @@ -1262,8 +1258,7 @@ var TypeScript; } field.symbol = fieldSymbol; fieldSymbol.declAST = ast; - if ((context.scopeChain.moduleDecl) || - (context.scopeChain.container == context.checker.gloMod)) { + if ((context.scopeChain.moduleDecl) || (context.scopeChain.container == context.checker.gloMod)) { fieldSymbol.flags |= SymbolFlags.ModuleMember; fieldSymbol.declModule = context.scopeChain.moduleDecl; } @@ -1314,12 +1309,7 @@ var TypeScript; // If the parent is the constructor, and this isn't an instance method, skip it. // That way, we'll set the type during scope assignment, and can be sure that the // function will be placed in the constructor-local scope - if (!funcDecl.isConstructor && - containerSym && - containerSym.declAST && - containerSym.declAST.nodeType == NodeType.FuncDecl && - containerSym.declAST.isConstructor && - !funcDecl.isMethod()) { + if (!funcDecl.isConstructor && containerSym && containerSym.declAST && containerSym.declAST.nodeType == NodeType.FuncDecl && containerSym.declAST.isConstructor && !funcDecl.isMethod()) { return go; } // Interfaces and overloads @@ -1408,14 +1398,7 @@ var TypeScript; } } // REVIEW: Move this check into the typecheck phase? It's only being run over properties... - if (fgSym && - !fgSym.isAccessor() && - fgSym.type && - fgSym.type.construct && - fgSym.type.construct.signatures != [] && - (fgSym.type.construct.signatures[0].declAST == null || - !hasFlag(fgSym.type.construct.signatures[0].declAST.fncFlags, FncFlags.Ambient)) && - !funcDecl.isConstructor) { + if (fgSym && !fgSym.isAccessor() && fgSym.type && fgSym.type.construct && fgSym.type.construct.signatures != [] && (fgSym.type.construct.signatures[0].declAST == null || !hasFlag(fgSym.type.construct.signatures[0].declAST.fncFlags, FncFlags.Ambient)) && !funcDecl.isConstructor) { context.checker.errorReporter.simpleError(funcDecl, "Functions may not have class overloads"); } if (fgSym && !(fgSym.kind() == SymbolKind.Type) && funcDecl.isMethod() && !funcDecl.isAccessor() && !funcDecl.isConstructor) { diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js index 8a667ad6dbe..fcdb170ae12 100644 --- a/tests/baselines/reference/parserRealSource8.js +++ b/tests/baselines/reference/parserRealSource8.js @@ -632,8 +632,7 @@ var TypeScript; // the enclosing scope // REVIEW: Some twisted logic here - this needs to be cleaned up once old classes are removed // - if it's a new class, always use the contained scope, since we initialize the constructor scope below - if (context.scopeChain.thisType && - (!funcDecl.isConstructor || hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod))) { + if (context.scopeChain.thisType && (!funcDecl.isConstructor || hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod))) { var instType = context.scopeChain.thisType; if (!(instType.typeFlags & TypeFlags.IsClass) && !hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) { if (!funcDecl.isMethod() || isStatic) { @@ -645,10 +644,7 @@ var TypeScript; } } else { - if (context.scopeChain.previous.scope.container && - context.scopeChain.previous.scope.container.declAST && - context.scopeChain.previous.scope.container.declAST.nodeType == NodeType.FuncDecl && - context.scopeChain.previous.scope.container.declAST.isConstructor) { + if (context.scopeChain.previous.scope.container && context.scopeChain.previous.scope.container.declAST && context.scopeChain.previous.scope.container.declAST.nodeType == NodeType.FuncDecl && context.scopeChain.previous.scope.container.declAST.isConstructor) { // if the parent is the class constructor, use the constructor scope parentScope = instType.constructorScope; } @@ -685,12 +681,7 @@ var TypeScript; outerFnc.innerStaticFuncs[outerFnc.innerStaticFuncs.length] = funcDecl; } else { - if (!funcDecl.isConstructor && - container && - container.declAST && - container.declAST.nodeType == NodeType.FuncDecl && - container.declAST.isConstructor && - !funcDecl.isMethod()) { + if (!funcDecl.isConstructor && container && container.declAST && container.declAST.nodeType == NodeType.FuncDecl && container.declAST.isConstructor && !funcDecl.isMethod()) { funcScope = context.scopeChain.thisType.constructorScope; //locals; } else { @@ -711,11 +702,7 @@ var TypeScript; } context.typeFlow.checker.createFunctionSignature(funcDecl, container, funcScope, fgSym, fgSym == null); // it's a getter or setter for a class property - if (!funcDecl.accessorSymbol && - (funcDecl.fncFlags & FncFlags.ClassMethod) && - container && - ((!fgSym || fgSym.declAST.nodeType != NodeType.FuncDecl) && funcDecl.isAccessor()) || - (fgSym && fgSym.isAccessor())) { + if (!funcDecl.accessorSymbol && (funcDecl.fncFlags & FncFlags.ClassMethod) && container && ((!fgSym || fgSym.declAST.nodeType != NodeType.FuncDecl) && funcDecl.isAccessor()) || (fgSym && fgSym.isAccessor())) { funcDecl.accessorSymbol = context.typeFlow.checker.createAccessorSymbol(funcDecl, fgSym, container.getType(), (funcDecl.isMethod() && isStatic), true, funcScope, container); } funcDecl.type.symbol.flags |= SymbolFlags.TypeSetDuringScopeAssignment; diff --git a/tests/baselines/reference/parserRealSource9.js b/tests/baselines/reference/parserRealSource9.js index dba28c4f295..5b1423bff39 100644 --- a/tests/baselines/reference/parserRealSource9.js +++ b/tests/baselines/reference/parserRealSource9.js @@ -364,7 +364,9 @@ var TypeScript; // context of a given module (E.g., an outer import statement) if (typeSymbol.aliasLink && !typeSymbol.type && typeSymbol.aliasLink.alias.nodeType == NodeType.Name) { var modPath = typeSymbol.aliasLink.alias.text; - var modSym = this.checker.findSymbolForDynamicModule(modPath, this.checker.locationInfo.filename, function (id) { return scope.find(id, false, true); }); + var modSym = this.checker.findSymbolForDynamicModule(modPath, this.checker.locationInfo.filename, function (id) { + return scope.find(id, false, true); + }); if (modSym) { typeSymbol.type = modSym.getType(); } diff --git a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js index c3e61545c2c..79e0c04d409 100644 --- a/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js +++ b/tests/baselines/reference/parserRegularExpressionDivideAmbiguity1.js @@ -3,5 +3,4 @@ /notregexp/a.foo(); //// [parserRegularExpressionDivideAmbiguity1.js] -1 - / notregexp / a.foo(); +1 / notregexp / a.foo(); diff --git a/tests/baselines/reference/parserReturnStatement4.js b/tests/baselines/reference/parserReturnStatement4.js index f6800cbb8fd..aab5215ba07 100644 --- a/tests/baselines/reference/parserReturnStatement4.js +++ b/tests/baselines/reference/parserReturnStatement4.js @@ -2,4 +2,8 @@ var v = { get foo() { return } }; //// [parserReturnStatement4.js] -var v = { get foo() { return; } }; +var v = { + get foo() { + return; + } +}; diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js index 651640c6466..a19675167c8 100644 --- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js +++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js @@ -8,7 +8,8 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "foo", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment1.js b/tests/baselines/reference/parserShorthandPropertyAssignment1.js index 0ef3c50d78f..2aabfc906ae 100644 --- a/tests/baselines/reference/parserShorthandPropertyAssignment1.js +++ b/tests/baselines/reference/parserShorthandPropertyAssignment1.js @@ -4,6 +4,10 @@ var name:any, id: any; foo({ name?, id? }); //// [parserShorthandPropertyAssignment1.js] -function foo(obj) { } +function foo(obj) { +} var name, id; -foo({ name: name, id: id }); +foo({ + name: name, + id: id +}); diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment2.js b/tests/baselines/reference/parserShorthandPropertyAssignment2.js index 0de0fa3829f..f05c9b08b33 100644 --- a/tests/baselines/reference/parserShorthandPropertyAssignment2.js +++ b/tests/baselines/reference/parserShorthandPropertyAssignment2.js @@ -2,4 +2,6 @@ var v = { class }; //// [parserShorthandPropertyAssignment2.js] -var v = { class: }; +var v = { + class: +}; diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment3.js b/tests/baselines/reference/parserShorthandPropertyAssignment3.js index 814a725dcba..a1d5ad3e646 100644 --- a/tests/baselines/reference/parserShorthandPropertyAssignment3.js +++ b/tests/baselines/reference/parserShorthandPropertyAssignment3.js @@ -2,4 +2,6 @@ var v = { "" }; //// [parserShorthandPropertyAssignment3.js] -var v = { "": }; +var v = { + "": +}; diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment4.js b/tests/baselines/reference/parserShorthandPropertyAssignment4.js index e10928ae2ab..b0f05e2d9e3 100644 --- a/tests/baselines/reference/parserShorthandPropertyAssignment4.js +++ b/tests/baselines/reference/parserShorthandPropertyAssignment4.js @@ -2,4 +2,6 @@ var v = { 0 }; //// [parserShorthandPropertyAssignment4.js] -var v = { 0: }; +var v = { + 0: +}; diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment5.js b/tests/baselines/reference/parserShorthandPropertyAssignment5.js index 90d74722a99..9dc4c781123 100644 --- a/tests/baselines/reference/parserShorthandPropertyAssignment5.js +++ b/tests/baselines/reference/parserShorthandPropertyAssignment5.js @@ -4,4 +4,6 @@ var obj = { greet? }; //// [parserShorthandPropertyAssignment5.js] var greet = "hello"; -var obj = { greet: greet }; +var obj = { + greet: greet +}; diff --git a/tests/baselines/reference/parserSkippedTokens16.js b/tests/baselines/reference/parserSkippedTokens16.js index dfbd8a4277a..a31d0e7e248 100644 --- a/tests/baselines/reference/parserSkippedTokens16.js +++ b/tests/baselines/reference/parserSkippedTokens16.js @@ -11,12 +11,15 @@ var x = //// [parserSkippedTokens16.js] foo(); Bar; -{ } -{ } +{ +} +{ +} 4 + ; 5; var M; (function (M) { - function a(T) { } + function a(T) { + } })(M || (M = {})); var x = ; diff --git a/tests/baselines/reference/parserStrictMode12.js b/tests/baselines/reference/parserStrictMode12.js index ce97b2a91cb..199ed43cc97 100644 --- a/tests/baselines/reference/parserStrictMode12.js +++ b/tests/baselines/reference/parserStrictMode12.js @@ -4,4 +4,7 @@ var v = { set foo(eval) { } } //// [parserStrictMode12.js] "use strict"; -var v = { set foo(eval) { } }; +var v = { + set foo(eval) { + } +}; diff --git a/tests/baselines/reference/parserSymbolIndexer5.js b/tests/baselines/reference/parserSymbolIndexer5.js index 3aa046e2114..43c456b64aa 100644 --- a/tests/baselines/reference/parserSymbolIndexer5.js +++ b/tests/baselines/reference/parserSymbolIndexer5.js @@ -5,5 +5,6 @@ var x = { //// [parserSymbolIndexer5.js] var x = { - [s]: symbol, "": + [s]: symbol, + "": }; diff --git a/tests/baselines/reference/parserSymbolProperty7.js b/tests/baselines/reference/parserSymbolProperty7.js index 9368fd12855..9d34b9e3bce 100644 --- a/tests/baselines/reference/parserSymbolProperty7.js +++ b/tests/baselines/reference/parserSymbolProperty7.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.prototype[Symbol.toStringTag] = function () { }; + C.prototype[Symbol.toStringTag] = function () { + }; return C; })(); diff --git a/tests/baselines/reference/parserUnaryExpression2.js b/tests/baselines/reference/parserUnaryExpression2.js index 2d1fa8eef56..97b17b2b800 100644 --- a/tests/baselines/reference/parserUnaryExpression2.js +++ b/tests/baselines/reference/parserUnaryExpression2.js @@ -2,4 +2,5 @@ ++function(e) { } //// [parserUnaryExpression2.js] -++function (e) { }; +++function (e) { +}; diff --git a/tests/baselines/reference/parserUnaryExpression3.js b/tests/baselines/reference/parserUnaryExpression3.js index 37a9f72e7b2..f075032a7c9 100644 --- a/tests/baselines/reference/parserUnaryExpression3.js +++ b/tests/baselines/reference/parserUnaryExpression3.js @@ -2,4 +2,6 @@ ++[0]; //// [parserUnaryExpression3.js] -++[0]; +++[ + 0 +]; diff --git a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.js b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.js index dfd9b807053..e6f7a2374e5 100644 --- a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.js +++ b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.js @@ -3,4 +3,5 @@ function foo(){　} //// [parserUnicodeWhitespaceCharacter1.js] -function foo() { } +function foo() { +} diff --git a/tests/baselines/reference/parserUsingConstructorAsIdentifier.js b/tests/baselines/reference/parserUsingConstructorAsIdentifier.js index ebf5663573c..c239bbe3c31 100644 --- a/tests/baselines/reference/parserUsingConstructorAsIdentifier.js +++ b/tests/baselines/reference/parserUsingConstructorAsIdentifier.js @@ -41,7 +41,8 @@ //// [parserUsingConstructorAsIdentifier.js] function define(constructor, instanceMembers, staticMembers) { - constructor = constructor || function () { }; + constructor = constructor || function () { + }; PluginUtilities.Utilities.markSupportedForProcessing(constructor); if (instanceMembers) { initializeProperties(constructor.prototype, instanceMembers); @@ -53,11 +54,17 @@ function define(constructor, instanceMembers, staticMembers) { } function derive(baseClass, constructor, instanceMembers, staticMembers) { if (baseClass) { - constructor = constructor || function () { }; + constructor = constructor || function () { + }; var basePrototype = baseClass.prototype; constructor.prototype = Object.create(basePrototype); PluginUtilities.Utilities.markSupportedForProcessing(constructor); - Object.defineProperty(constructor.prototype, "constructor", { value: constructor, writable: true, configurable: true, enumerable: true }); + Object.defineProperty(constructor.prototype, "constructor", { + value: constructor, + writable: true, + configurable: true, + enumerable: true + }); if (instanceMembers) { initializeProperties(constructor.prototype, instanceMembers); } @@ -71,7 +78,8 @@ function derive(baseClass, constructor, instanceMembers, staticMembers) { } } function mix(constructor) { - constructor = constructor || function () { }; + constructor = constructor || function () { + }; var i, len; for (i = 1, len = arguments.length; i < len; i++) { initializeProperties(constructor.prototype, arguments[i]); diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js index 02304380013..3645f21e5ce 100644 --- a/tests/baselines/reference/parserharness.js +++ b/tests/baselines/reference/parserharness.js @@ -2151,7 +2151,9 @@ var Harness; function bugs(content) { var bugs = content.match(/\bbug (\d+)/i); if (bugs) { - bugs.forEach(function (bug) { return assert.bug(bug); }); + bugs.forEach(function (bug) { + return assert.bug(bug); + }); } } Assert.bugs = bugs; @@ -2164,7 +2166,9 @@ var Harness; function arrayLengthIs(arr, length) { if (arr.length != length) { var actual = ''; - arr.forEach(function (n) { return actual = actual + '\n ' + n.toString(); }); + arr.forEach(function (n) { + return actual = actual + '\n ' + n.toString(); + }); Assert.throwAssertError(new Error('Expected array to have ' + length + ' elements. Actual elements were:' + actual)); } } @@ -2271,17 +2275,28 @@ var Harness; var Logger = (function () { function Logger() { } - Logger.prototype.start = function (fileName, priority) { }; - Logger.prototype.end = function (fileName) { }; - Logger.prototype.scenarioStart = function (scenario) { }; - Logger.prototype.scenarioEnd = function (scenario, error) { }; - Logger.prototype.testStart = function (test) { }; - Logger.prototype.pass = function (test) { }; - Logger.prototype.bug = function (test) { }; - Logger.prototype.fail = function (test) { }; - Logger.prototype.error = function (test, error) { }; - Logger.prototype.comment = function (comment) { }; - Logger.prototype.verify = function (test, passed, actual, expected, message) { }; + Logger.prototype.start = function (fileName, priority) { + }; + Logger.prototype.end = function (fileName) { + }; + Logger.prototype.scenarioStart = function (scenario) { + }; + Logger.prototype.scenarioEnd = function (scenario, error) { + }; + Logger.prototype.testStart = function (test) { + }; + Logger.prototype.pass = function (test) { + }; + Logger.prototype.bug = function (test) { + }; + Logger.prototype.fail = function (test) { + }; + Logger.prototype.error = function (test, error) { + }; + Logger.prototype.comment = function (comment) { + }; + Logger.prototype.verify = function (test, passed, actual, expected, message) { + }; return Logger; })(); Harness.Logger = Logger; @@ -2348,13 +2363,16 @@ var Harness; return false; } }; - Runnable.prototype.run = function (done) { }; + Runnable.prototype.run = function (done) { + }; Runnable.prototype.runBlock = function (done) { return this.call(this.block, done); }; Runnable.prototype.runChild = function (index, done) { var _this = this; - return this.call((function (done) { return _this.children[index].run(done); }), done); + return this.call((function (done) { + return _this.children[index].run(done); + }), done); }; Runnable.pushGlobalErrorHandler = function (done) { errorHandlerStack.push(function (e) { @@ -2392,17 +2410,25 @@ var Harness; TestCase.prototype.run = function (done) { var that = this; Runnable.currentStack.push(this); - emitLog('testStart', { desc: this.description }); + emitLog('testStart', { + desc: this.description + }); if (this.block) { var async = this.runBlock(function (e) { if (e) { that.passed = false; that.error = e; - emitLog('error', { desc: this.description, pass: false }, e); + emitLog('error', { + desc: this.description, + pass: false + }, e); } else { that.passed = true; - emitLog('pass', { desc: this.description, pass: true }); + emitLog('pass', { + desc: this.description, + pass: true + }); } Runnable.currentStack.pop(); done(); @@ -2423,15 +2449,24 @@ var Harness; Scenario.prototype.run = function (done) { var that = this; Runnable.currentStack.push(this); - emitLog('scenarioStart', { desc: this.description }); + emitLog('scenarioStart', { + desc: this.description + }); var async = this.runBlock(function (e) { Runnable.currentStack.pop(); if (e) { that.passed = false; that.error = e; - var metadata = { id: undefined, desc: this.description, pass: false, bugs: assert.bugIds }; + var metadata = { + id: undefined, + desc: this.description, + pass: false, + bugs: assert.bugIds + }; // Report all bugs affecting this scenario - assert.bugIds.forEach(function (desc) { return emitLog('bug', metadata, desc); }); + assert.bugIds.forEach(function (desc) { + return emitLog('bug', metadata, desc); + }); emitLog('scenarioEnd', metadata, e); done(); } @@ -2458,9 +2493,16 @@ var Harness; if (async) return; } - var metadata = { id: undefined, desc: this.description, pass: this.passed, bugs: assert.bugIds }; + var metadata = { + id: undefined, + desc: this.description, + pass: this.passed, + bugs: assert.bugIds + }; // Report all bugs affecting this scenario - assert.bugIds.forEach(function (desc) { return emitLog('bug', metadata, desc); }); + assert.bugIds.forEach(function (desc) { + return emitLog('bug', metadata, desc); + }); emitLog('scenarioEnd', metadata); done(); }; @@ -2585,11 +2627,16 @@ var Harness; this.description = ""; this.results = {}; } - Benchmark.prototype.bench = function (subBench) { }; - Benchmark.prototype.before = function () { }; - Benchmark.prototype.beforeEach = function () { }; - Benchmark.prototype.after = function () { }; - Benchmark.prototype.afterEach = function () { }; + Benchmark.prototype.bench = function (subBench) { + }; + Benchmark.prototype.before = function () { + }; + Benchmark.prototype.beforeEach = function () { + }; + Benchmark.prototype.after = function () { + }; + Benchmark.prototype.afterEach = function () { + }; Benchmark.prototype.addTimingFor = function (name, timing) { this.results[name] = this.results[name] || new Dataset(); this.results[name].add(timing); @@ -2625,9 +2672,13 @@ var Harness; b.after(); for (var prop in b.results) { var description = b.description + (prop ? ": " + prop : ''); - emitLog('testStart', { desc: description }); + emitLog('testStart', { + desc: description + }); emitLog('pass', { - desc: description, pass: true, perfResults: { + desc: description, + pass: true, + perfResults: { mean: b.results[prop].mean(), min: b.results[prop].min(), max: b.results[prop].max(), @@ -2692,10 +2743,18 @@ var Harness; this.fileCollection[s] = writer; return writer; }; - EmitterIOHost.prototype.directoryExists = function (s) { return false; }; - EmitterIOHost.prototype.fileExists = function (s) { return typeof this.fileCollection[s] !== 'undefined'; }; - EmitterIOHost.prototype.resolvePath = function (s) { return s; }; - EmitterIOHost.prototype.reset = function () { this.fileCollection = {}; }; + EmitterIOHost.prototype.directoryExists = function (s) { + return false; + }; + EmitterIOHost.prototype.fileExists = function (s) { + return typeof this.fileCollection[s] !== 'undefined'; + }; + EmitterIOHost.prototype.resolvePath = function (s) { + return s; + }; + EmitterIOHost.prototype.reset = function () { + this.fileCollection = {}; + }; EmitterIOHost.prototype.toArray = function () { var result = []; for (var p in this.fileCollection) { @@ -2705,7 +2764,10 @@ var Harness; if (p !== '0.js') { current.lines.unshift('////[' + p + ']'); } - result.push({ filename: p, file: this.fileCollection[p] }); + result.push({ + filename: p, + file: this.fileCollection[p] + }); } } } @@ -2769,7 +2831,9 @@ var Harness; Type.prototype.normalizeToArray = function (arg) { if ((Array.isArray && Array.isArray(arg)) || arg instanceof Array) return arg; - return [arg]; + return [ + arg + ]; }; Type.prototype.compilesOk = function (testCode) { var errors = null; @@ -2927,7 +2991,9 @@ var Harness; var tyInfo = compiler.pullGetTypeInfoAtPosition(targetPosition, script2); var name = this.getTypeInfoName(tyInfo.ast); var foundValue = new Type(tyInfo.typeInfo, code, name); - if (!matchingIdentifiers.some(function (value) { return (value.identifier === foundValue.identifier) && (value.code === foundValue.code) && (value.type === foundValue.type); })) { + if (!matchingIdentifiers.some(function (value) { + return (value.identifier === foundValue.identifier) && (value.code === foundValue.code) && (value.type === foundValue.type); + })) { matchingIdentifiers.push(foundValue); } } @@ -2937,7 +3003,9 @@ var Harness; var name = this.getTypeInfoName(tyInfo.ast); if (name === targetIdentifier) { var foundValue = new Type(tyInfo.typeInfo, code, targetIdentifier); - if (!matchingIdentifiers.some(function (value) { return (value.identifier === foundValue.identifier) && (value.code === foundValue.code) && (value.type === foundValue.type); })) { + if (!matchingIdentifiers.some(function (value) { + return (value.identifier === foundValue.identifier) && (value.code === foundValue.code) && (value.type === foundValue.type); + })) { matchingIdentifiers.push(foundValue); } } @@ -3043,9 +3111,15 @@ var Harness; outputs[fn] = new Harness.Compiler.WriterAggregator(); return outputs[fn]; }, - directoryExists: function (path) { return true; }, - fileExists: function (path) { return true; }, - resolvePath: function (path) { return path; } + directoryExists: function (path) { + return true; + }, + fileExists: function (path) { + return true; + }, + resolvePath: function (path) { + return path; + } }); compiler.emitDeclarations(); var results = null; @@ -3086,7 +3160,9 @@ var Harness; this.fileResults = fileResults; this.scripts = scripts; var lines = []; - fileResults.forEach(function (v) { return lines = lines.concat(v.file.lines); }); + fileResults.forEach(function (v) { + return lines = lines.concat(v.file.lines); + }); this.code = lines.join("\n"); this.errors = []; for (var i = 0; i < errorLines.length; i++) { @@ -3143,7 +3219,9 @@ var Harness; function reset() { stdout.reset(); stderr.reset(); - var files = compiler.units.map(function (value) { return value.filename; }); + var files = compiler.units.map(function (value) { + return value.filename; + }); for (var i = 0; i < files.length; i++) { var fname = files[i]; if (fname !== 'lib.d.ts') { @@ -3304,12 +3382,24 @@ var Harness; (function (TestCaseParser) { optionRegex = /^[\/]{2}\s*@(\w+):\s*(\S*)/gm; // multiple matches on multiple lines // List of allowed metadata names - var fileMetadataNames = ["filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out"]; + var fileMetadataNames = [ + "filename", + "comments", + "declaration", + "module", + "nolib", + "sourcemap", + "target", + "out" + ]; function extractCompilerSettings(content) { var opts = []; var match; while ((match = optionRegex.exec(content)) != null) { - opts.push({ flag: match[1], value: match[2] }); + opts.push({ + flag: match[1], + value: match[2] + }); } return opts; } @@ -3402,7 +3492,10 @@ var Harness; references: refs }; files.push(newTestFile); - return { settings: settings, testUnitData: files }; + return { + settings: settings, + testUnitData: files + }; } TestCaseParser.makeUnitsFromTest = makeUnitsFromTest; })(TestCaseParser = Harness.TestCaseParser || (Harness.TestCaseParser = {})); @@ -3449,9 +3542,21 @@ var Harness; return TypeScript.ScriptEditRange.unknown(); } var entries = this.editRanges.slice(initialEditRangeIndex); - var minDistFromStart = entries.map(function (x) { return x.editRange.minChar; }).reduce(function (prev, current) { return Math.min(prev, current); }); - var minDistFromEnd = entries.map(function (x) { return x.length - x.editRange.limChar; }).reduce(function (prev, current) { return Math.min(prev, current); }); - var aggDelta = entries.map(function (x) { return x.editRange.delta; }).reduce(function (prev, current) { return prev + current; }); + var minDistFromStart = entries.map(function (x) { + return x.editRange.minChar; + }).reduce(function (prev, current) { + return Math.min(prev, current); + }); + var minDistFromEnd = entries.map(function (x) { + return x.length - x.editRange.limChar; + }).reduce(function (prev, current) { + return Math.min(prev, current); + }); + var aggDelta = entries.map(function (x) { + return x.editRange.delta; + }).reduce(function (prev, current) { + return prev + current; + }); return new TypeScript.ScriptEditRange(minDistFromStart, entries[0].length - minDistFromEnd, aggDelta); }; return ScriptInfo; @@ -3501,11 +3606,21 @@ var Harness; ////////////////////////////////////////////////////////////////////// // ILogger implementation // - TypeScriptLS.prototype.information = function () { return false; }; - TypeScriptLS.prototype.debug = function () { return true; }; - TypeScriptLS.prototype.warning = function () { return true; }; - TypeScriptLS.prototype.error = function () { return true; }; - TypeScriptLS.prototype.fatal = function () { return true; }; + TypeScriptLS.prototype.information = function () { + return false; + }; + TypeScriptLS.prototype.debug = function () { + return true; + }; + TypeScriptLS.prototype.warning = function () { + return true; + }; + TypeScriptLS.prototype.error = function () { + return true; + }; + TypeScriptLS.prototype.fatal = function () { + return true; + }; TypeScriptLS.prototype.log = function (s) { // For debugging... //IO.printLine("TypeScriptLS:" + s); @@ -3552,7 +3667,8 @@ var Harness; TypeScriptLS.prototype.parseSourceText = function (fileName, sourceText) { var parser = new TypeScript.Parser(); parser.setErrorRecovery(null); - parser.errorCallback = function (a, b, c, d) { }; + parser.errorCallback = function (a, b, c, d) { + }; var script = parser.parse(sourceText, fileName, 0); return script; }; @@ -3612,7 +3728,10 @@ var Harness; function mapEdits(edits) { var result = []; for (var i = 0; i < edits.length; i++) { - result.push({ edit: edits[i], index: i }); + result.push({ + edit: edits[i], + index: i + }); } return result; } @@ -3654,7 +3773,9 @@ var Harness; return result; }; TypeScriptLS.prototype.getHostSettings = function () { - return JSON.stringify({ usePullLanguageService: Harness.usePull }); + return JSON.stringify({ + usePullLanguageService: Harness.usePull + }); }; return TypeScriptLS; })(); @@ -3691,7 +3812,9 @@ var Harness; Runner.runCollateral = runCollateral; function runJSString(code, callback) { // List of names that get overriden by various test code we eval - var dangerNames = ['Array']; + var dangerNames = [ + 'Array' + ]; var globalBackup = {}; var n = null; for (n in dangerNames) { @@ -3809,7 +3932,10 @@ var Harness; expected = expected.replace(/\r\n?/g, '\n'); actual = actual.replace(/\r\n?/g, '\n'); } - return { expected: expected, actual: actual }; + return { + expected: expected, + actual: actual + }; } function writeComparison(expected, actual, relativeFilename, actualFilename, descriptionForDescribe) { if (expected != actual) { diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js index 511e75ea135..514a24afcf6 100644 --- a/tests/baselines/reference/parserindenter.js +++ b/tests/baselines/reference/parserindenter.js @@ -778,10 +778,7 @@ var Formatting; } Indenter.prototype.GetIndentationEdits = function (token, nextToken, node, sameLineIndent) { if (this.logger.information()) { - this.logger.log("GetIndentationEdits(" + - "t1=[" + token.Span.startPosition() + "," + token.Span.endPosition() + "], " + - "t2=[" + (nextToken == null ? "null" : (nextToken.Span.startPosition() + "," + nextToken.Span.endPosition())) + "]" + - ")"); + this.logger.log("GetIndentationEdits(" + "t1=[" + token.Span.startPosition() + "," + token.Span.endPosition() + "], " + "t2=[" + (nextToken == null ? "null" : (nextToken.Span.startPosition() + "," + nextToken.Span.endPosition())) + "]" + ")"); } var result = this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent); if (this.logger.information()) { @@ -941,8 +938,7 @@ var Formatting; }; Indenter.prototype.GetSpecialCaseIndentationForLCurly = function (node) { var indentationInfo = null; - if (node.AuthorNode.Details.Kind == AuthorParseNodeKind.apnkFncDecl || - node.AuthorNode.EdgeLabel == AuthorParseNodeEdge.apneThen || node.AuthorNode.EdgeLabel == AuthorParseNodeEdge.apneElse) { + if (node.AuthorNode.Details.Kind == AuthorParseNodeKind.apnkFncDecl || node.AuthorNode.EdgeLabel == AuthorParseNodeEdge.apneThen || node.AuthorNode.EdgeLabel == AuthorParseNodeEdge.apneElse) { // flushed with the node (function & if) indentationInfo = node.GetNodeStartLineIndentation(this); return indentationInfo; @@ -1237,8 +1233,7 @@ var Formatting; // Get the parent that is really on a different line from the self node var startNodeLineNumber = this.snapshot.GetLineNumberFromPosition(tree.StartNodeSelf.AuthorNode.Details.StartOffset); parent = tree.StartNodeSelf.Parent; - while (parent != null && - startNodeLineNumber == this.snapshot.GetLineNumberFromPosition(parent.AuthorNode.Details.StartOffset)) { + while (parent != null && startNodeLineNumber == this.snapshot.GetLineNumberFromPosition(parent.AuthorNode.Details.StartOffset)) { parent = parent.Parent; } } @@ -1336,8 +1331,7 @@ var Formatting; } }; Indenter.prototype.IsMultiLineString = function (token) { - return token.tokenID === TypeScript.TokenID.StringLiteral && - this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition()); + return token.tokenID === TypeScript.TokenID.StringLiteral && this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition()); }; return Indenter; })(); diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js index 8b197fd35a4..add4e3a69f3 100644 --- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js +++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js @@ -9,6 +9,7 @@ class C { var C = (function () { function C() { } - C.prototype.f = function () { }; + C.prototype.f = function () { + }; return C; })(); diff --git a/tests/baselines/reference/partiallyAmbientFundule.js b/tests/baselines/reference/partiallyAmbientFundule.js index 9b52ca2147f..21cb5179aef 100644 --- a/tests/baselines/reference/partiallyAmbientFundule.js +++ b/tests/baselines/reference/partiallyAmbientFundule.js @@ -5,4 +5,5 @@ declare module foo { function foo () { } // Legal, because module is ambient //// [partiallyAmbientFundule.js] -function foo() { } // Legal, because module is ambient +function foo() { +} // Legal, because module is ambient diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js index 33ac4ebb144..5a30af7e9f6 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js @@ -60,9 +60,17 @@ var ResultIsNumber19 = +(undefined + undefined); // + operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: function (s) { }, y: function (s1) { } }; +var obj1 = { + x: function (s) { + }, + y: function (s1) { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js index 5af1a8fb903..81c62222805 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.js +++ b/tests/baselines/reference/plusOperatorWithBooleanType.js @@ -38,11 +38,15 @@ var ResultIsNumber7 = +A.foo(); //// [plusOperatorWithBooleanType.js] // + operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -54,7 +58,10 @@ var objA = new A(); var ResultIsNumber1 = +BOOLEAN; // boolean type literal var ResultIsNumber2 = +true; -var ResultIsNumber3 = +{ x: true, y: false }; +var ResultIsNumber3 = +{ + x: true, + y: false +}; // boolean type expressions var ResultIsNumber4 = +objA.a; var ResultIsNumber5 = +M.n; diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js index a0adaa5dec2..a42147e0a30 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.js +++ b/tests/baselines/reference/plusOperatorWithNumberType.js @@ -44,12 +44,19 @@ var ResultIsNumber11 = +(NUMBER + NUMBER); //// [plusOperatorWithNumberType.js] // + operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -62,8 +69,16 @@ var ResultIsNumber1 = +NUMBER; var ResultIsNumber2 = +NUMBER1; // number type literal var ResultIsNumber3 = +1; -var ResultIsNumber4 = +{ x: 1, y: 2 }; -var ResultIsNumber5 = +{ x: 1, y: function (n) { return n; } }; +var ResultIsNumber4 = +{ + x: 1, + y: 2 +}; +var ResultIsNumber5 = +{ + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsNumber6 = +objA.a; var ResultIsNumber7 = +M.n; diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js index ed2c60111b3..b725f62adbe 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.js +++ b/tests/baselines/reference/plusOperatorWithStringType.js @@ -43,12 +43,19 @@ var ResultIsNumber12 = +STRING.charAt(0); //// [plusOperatorWithStringType.js] // + operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -61,8 +68,16 @@ var ResultIsNumber1 = +STRING; var ResultIsNumber2 = +STRING1; // string type literal var ResultIsNumber3 = +""; -var ResultIsNumber4 = +{ x: "", y: "" }; -var ResultIsNumber5 = +{ x: "", y: function (s) { return s; } }; +var ResultIsNumber4 = +{ + x: "", + y: "" +}; +var ResultIsNumber5 = +{ + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsNumber6 = +objA.a; var ResultIsNumber7 = +M.n; diff --git a/tests/baselines/reference/primitiveConstraints1.js b/tests/baselines/reference/primitiveConstraints1.js index 9ee39d74e80..7d697e57dfa 100644 --- a/tests/baselines/reference/primitiveConstraints1.js +++ b/tests/baselines/reference/primitiveConstraints1.js @@ -7,7 +7,9 @@ foo2(1, 'hm'); // error //// [primitiveConstraints1.js] -function foo1(t, u) { } +function foo1(t, u) { +} foo1('hm', 1); // no error -function foo2(t, u) { } +function foo2(t, u) { +} foo2(1, 'hm'); // error diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js index bf3f1a17105..18ade7ca775 100644 --- a/tests/baselines/reference/primitiveMembers.js +++ b/tests/baselines/reference/primitiveMembers.js @@ -48,7 +48,9 @@ var N; n = N; // should not work, as 'number' has a different brand N = n; // should work var o = {}; -var f = function (x) { return x.length; }; +var f = function (x) { + return x.length; +}; var r2 = /./g; var n2 = 34; var s = "yo"; @@ -57,7 +59,8 @@ var n3 = 5 || {}; var baz = (function () { function baz() { } - baz.prototype.bar = function () { }; + baz.prototype.bar = function () { + }; return baz; })(); var foo = (function (_super) { @@ -65,6 +68,8 @@ var foo = (function (_super) { function foo() { _super.apply(this, arguments); } - foo.prototype.bar = function () { return undefined; }; + foo.prototype.bar = function () { + return undefined; + }; return foo; })(baz); diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.js b/tests/baselines/reference/primtiveTypesAreIdentical.js index 19bdadb4cee..00a77fac917 100644 --- a/tests/baselines/reference/primtiveTypesAreIdentical.js +++ b/tests/baselines/reference/primtiveTypesAreIdentical.js @@ -33,14 +33,21 @@ function foo7(x: any) { } //// [primtiveTypesAreIdentical.js] // primitive types are identical to themselves so these overloads will all cause errors -function foo1(x) { } -function foo2(x) { } -function foo3(x) { } -function foo4(x) { } -function foo5(x) { } +function foo1(x) { +} +function foo2(x) { +} +function foo3(x) { +} +function foo4(x) { +} +function foo5(x) { +} var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function foo6(x) { } -function foo7(x) { } +function foo6(x) { +} +function foo7(x) { +} diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js index 116b255a921..e754d49280c 100644 --- a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js +++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js @@ -37,20 +37,34 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { return this.foo; }; + C.prototype.foo = function () { + return this.foo; + }; Object.defineProperty(C, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.foo = function () { return this.foo; }; - C.bar = function () { this.foo(); }; + C.foo = function () { + return this.foo; + }; + C.bar = function () { + this.foo(); + }; return C; })(); // added level of function nesting @@ -60,40 +74,54 @@ var C2 = (function () { Object.defineProperty(C2.prototype, "y", { get: function () { var _this = this; - (function () { return _this.x; }); + (function () { + return _this.x; + }); return null; }, set: function (x) { var _this = this; - (function () { _this.y = _this.x; }); + (function () { + _this.y = _this.x; + }); }, enumerable: true, configurable: true }); C2.prototype.foo = function () { var _this = this; - (function () { return _this.foo; }); + (function () { + return _this.foo; + }); }; Object.defineProperty(C2, "y", { get: function () { var _this = this; - (function () { return _this.x; }); + (function () { + return _this.x; + }); return null; }, set: function (x) { var _this = this; - (function () { _this.y = _this.x; }); + (function () { + _this.y = _this.x; + }); }, enumerable: true, configurable: true }); C2.foo = function () { var _this = this; - (function () { return _this.foo; }); + (function () { + return _this.foo; + }); }; C2.bar = function () { var _this = this; - (function () { return _this.foo(); }); + (function () { + return _this.foo(); + }); }; return C2; })(); diff --git a/tests/baselines/reference/privateInstanceVisibility.js b/tests/baselines/reference/privateInstanceVisibility.js index b730a763e1e..e1ccb287515 100644 --- a/tests/baselines/reference/privateInstanceVisibility.js +++ b/tests/baselines/reference/privateInstanceVisibility.js @@ -57,7 +57,9 @@ var Test; var C = (function () { function C() { } - C.prototype.getX = function () { return this.x; }; + C.prototype.getX = function () { + return this.x; + }; C.prototype.clone = function (other) { this.x = other.x; }; diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.js b/tests/baselines/reference/privateStaticMemberAccessibility.js index fdcb2663299..dd022d8646a 100644 --- a/tests/baselines/reference/privateStaticMemberAccessibility.js +++ b/tests/baselines/reference/privateStaticMemberAccessibility.js @@ -24,7 +24,9 @@ var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); - this.bing = function () { return Base.foo; }; // error + this.bing = function () { + return Base.foo; + }; // error } Derived.bar = Base.foo; // error return Derived; diff --git a/tests/baselines/reference/privateVisibility.js b/tests/baselines/reference/privateVisibility.js index d70d7b4756f..80e0bf51a1b 100644 --- a/tests/baselines/reference/privateVisibility.js +++ b/tests/baselines/reference/privateVisibility.js @@ -32,8 +32,11 @@ var Foo = (function () { this.pubProp = 0; this.privProp = 0; } - Foo.prototype.pubMeth = function () { this.privMeth(); }; - Foo.prototype.privMeth = function () { }; + Foo.prototype.pubMeth = function () { + this.privMeth(); + }; + Foo.prototype.privMeth = function () { + }; return Foo; })(); var f = new Foo(); diff --git a/tests/baselines/reference/privateVisibles.js b/tests/baselines/reference/privateVisibles.js index b2cb673c681..c9206964f80 100644 --- a/tests/baselines/reference/privateVisibles.js +++ b/tests/baselines/reference/privateVisibles.js @@ -15,6 +15,8 @@ var Foo = (function () { this.pvar = 0; var n = this.pvar; } - Foo.prototype.meth = function () { var q = this.pvar; }; + Foo.prototype.meth = function () { + var q = this.pvar; + }; return Foo; })(); diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js index ed53ca816db..96eaed7142c 100644 --- a/tests/baselines/reference/project/baseline/amd/decl.js +++ b/tests/baselines/reference/project/baseline/amd/decl.js @@ -1,7 +1,10 @@ define(["require", "exports"], function (require, exports) { ; function point(x, y) { - return { x: x, y: y }; + return { + x: x, + y: y + }; } exports.point = point; }); diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js index eb0c46dd93e..50cca2c0f42 100644 --- a/tests/baselines/reference/project/baseline/node/decl.js +++ b/tests/baselines/reference/project/baseline/node/decl.js @@ -1,5 +1,8 @@ ; function point(x, y) { - return { x: x, y: y }; + return { + x: x, + y: y + }; } exports.point = point; diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js index ed53ca816db..96eaed7142c 100644 --- a/tests/baselines/reference/project/baseline2/amd/decl.js +++ b/tests/baselines/reference/project/baseline2/amd/decl.js @@ -1,7 +1,10 @@ define(["require", "exports"], function (require, exports) { ; function point(x, y) { - return { x: x, y: y }; + return { + x: x, + y: y + }; } exports.point = point; }); diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js index d3e9e871c2d..6b45d747c1c 100644 --- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js @@ -1,3 +1,6 @@ define(["require", "exports"], function (require, exports) { - var p = { x: 10, y: 20 }; + var p = { + x: 10, + y: 20 + }; }); diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js index eb0c46dd93e..50cca2c0f42 100644 --- a/tests/baselines/reference/project/baseline2/node/decl.js +++ b/tests/baselines/reference/project/baseline2/node/decl.js @@ -1,5 +1,8 @@ ; function point(x, y) { - return { x: x, y: y }; + return { + x: x, + y: y + }; } exports.point = point; diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js index b6239b1295d..4322b9c60b6 100644 --- a/tests/baselines/reference/project/baseline2/node/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js @@ -1 +1,4 @@ -var p = { x: 10, y: 20 }; +var p = { + x: 10, + y: 20 +}; diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js index 6ffe8c53445..5351258111e 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { - function hello() { } + function hello() { + } exports.hello = hello; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js index 6ffe8c53445..5351258111e 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { - function hello() { } + function hello() { + } exports.hello = hello; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js index 6ffe8c53445..5351258111e 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { - function hello() { } + function hello() { + } exports.hello = hello; }); diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js index 58114de3a4d..3bc8930ed53 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js @@ -1,2 +1,3 @@ -function hello() { } +function hello() { +} exports.hello = hello; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js index 58114de3a4d..3bc8930ed53 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js @@ -1,2 +1,3 @@ -function hello() { } +function hello() { +} exports.hello = hello; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js index 58114de3a4d..3bc8930ed53 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js @@ -1,2 +1,3 @@ -function hello() { } +function hello() { +} exports.hello = hello; diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js index b19a07f6490..f311ea7ba24 100644 --- a/tests/baselines/reference/project/prologueEmit/amd/out.js +++ b/tests/baselines/reference/project/prologueEmit/amd/out.js @@ -1,6 +1,8 @@ var _this = this; // Add a lambda to ensure global 'this' capture is triggered -(function () { return _this.window; }); +(function () { + return _this.window; +}); var __extends = this.__extends || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js index b19a07f6490..f311ea7ba24 100644 --- a/tests/baselines/reference/project/prologueEmit/node/out.js +++ b/tests/baselines/reference/project/prologueEmit/node/out.js @@ -1,6 +1,8 @@ var _this = this; // Add a lambda to ensure global 'this' capture is triggered -(function () { return _this.window; }); +(function () { + return _this.window; +}); var __extends = this.__extends || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } 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..649db9a606d 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 @@ -3,7 +3,8 @@ var test; var ClassA = (function () { function ClassA() { } - ClassA.prototype.method = function () { }; + ClassA.prototype.method = function () { + }; return ClassA; })(); test.ClassA = ClassA; 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..649db9a606d 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 @@ -3,7 +3,8 @@ var test; var ClassA = (function () { function ClassA() { } - ClassA.prototype.method = function () { }; + ClassA.prototype.method = function () { + }; return ClassA; })(); test.ClassA = ClassA; diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js index ce15e2d44c1..acf6b715175 100644 --- a/tests/baselines/reference/promiseChaining.js +++ b/tests/baselines/reference/promiseChaining.js @@ -19,7 +19,13 @@ var Chain = (function () { Chain.prototype.then = function (cb) { var result = cb(this.value); // should get a fresh type parameter which each then call - var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*string*/.then(function (x) { return x.length; }); // No error + var z = this.then(function (x) { + return result; + }) /*S*/.then(function (x) { + return "abc"; + }) /*string*/.then(function (x) { + return x.length; + }); // No error return new Chain(result); }; return Chain; diff --git a/tests/baselines/reference/promiseChaining1.js b/tests/baselines/reference/promiseChaining1.js index 001f1ffc1a6..54e5064809e 100644 --- a/tests/baselines/reference/promiseChaining1.js +++ b/tests/baselines/reference/promiseChaining1.js @@ -19,7 +19,13 @@ var Chain2 = (function () { Chain2.prototype.then = function (cb) { var result = cb(this.value); // should get a fresh type parameter which each then call - var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*Function*/.then(function (x) { return x.length; }); // Should error on "abc" because it is not a Function + var z = this.then(function (x) { + return result; + }) /*S*/.then(function (x) { + return "abc"; + }) /*Function*/.then(function (x) { + return x.length; + }); // Should error on "abc" because it is not a Function return new Chain2(result); }; return Chain2; diff --git a/tests/baselines/reference/promiseChaining2.js b/tests/baselines/reference/promiseChaining2.js index ed03ab2c97a..88b601aad82 100644 --- a/tests/baselines/reference/promiseChaining2.js +++ b/tests/baselines/reference/promiseChaining2.js @@ -19,7 +19,13 @@ var Chain2 = (function () { Chain2.prototype.then = function (cb) { var result = cb(this.value); // should get a fresh type parameter which each then call - var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }); + var z = this.then(function (x) { + return result; + }).then(function (x) { + return "abc"; + }).then(function (x) { + return x.length; + }); return new Chain2(result); }; return Chain2; diff --git a/tests/baselines/reference/promisePermutations.js b/tests/baselines/reference/promisePermutations.js index e59e49d6f8c..83b1f251e61 100644 --- a/tests/baselines/reference/promisePermutations.js +++ b/tests/baselines/reference/promisePermutations.js @@ -251,13 +251,17 @@ var s9d = s9.then(sPromise, sPromise, sPromise); // ok var s9e = s9.then(nPromise, nPromise, nPromise); // ok var s9f = s9.then(testFunction, sIPromise, nIPromise); // error var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var r10 = testFunction10(function (x) { return x; }); +var r10 = testFunction10(function (x) { + return x; +}); var r10a = r10.then(testFunction10, testFunction10, testFunction10); // ok var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok var r10d = r10.then(testFunction, sIPromise, nIPromise); // ok var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var s10 = testFunction10P(function (x) { return x; }); +var s10 = testFunction10P(function (x) { + return x; +}); var s10a = s10.then(testFunction10, testFunction10, testFunction10); // ok var s10b = s10.then(testFunction10P, testFunction10P, testFunction10P); // ok var s10c = s10.then(testFunction10P, testFunction10, testFunction10); // ok @@ -271,9 +275,13 @@ var s11; var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error -var r12 = testFunction12(function (x) { return x; }); +var r12 = testFunction12(function (x) { + return x; +}); var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok -var s12 = testFunction12(function (x) { return x; }); +var s12 = testFunction12(function (x) { + return x; +}); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/promisePermutations2.js b/tests/baselines/reference/promisePermutations2.js index a7b5d8cf835..9a321e03667 100644 --- a/tests/baselines/reference/promisePermutations2.js +++ b/tests/baselines/reference/promisePermutations2.js @@ -251,13 +251,17 @@ var s9d = s9.then(sPromise, sPromise, sPromise); // ok var s9e = s9.then(nPromise, nPromise, nPromise); // ok var s9f = s9.then(testFunction, sIPromise, nIPromise); // error var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var r10 = testFunction10(function (x) { return x; }); +var r10 = testFunction10(function (x) { + return x; +}); var r10a = r10.then(testFunction10, testFunction10, testFunction10); // ok var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok var r10d = r10.then(testFunction, sIPromise, nIPromise); // error var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var s10 = testFunction10P(function (x) { return x; }); +var s10 = testFunction10P(function (x) { + return x; +}); var s10a = s10.then(testFunction10, testFunction10, testFunction10); // ok var s10b = s10.then(testFunction10P, testFunction10P, testFunction10P); // ok var s10c = s10.then(testFunction10P, testFunction10, testFunction10); // ok @@ -271,9 +275,13 @@ var s11; var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // ok var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // ok -var r12 = testFunction12(function (x) { return x; }); +var r12 = testFunction12(function (x) { + return x; +}); var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok -var s12 = testFunction12(function (x) { return x; }); +var s12 = testFunction12(function (x) { + return x; +}); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/promisePermutations3.js b/tests/baselines/reference/promisePermutations3.js index eb9c882b971..cbee4093a65 100644 --- a/tests/baselines/reference/promisePermutations3.js +++ b/tests/baselines/reference/promisePermutations3.js @@ -251,13 +251,17 @@ var s9d = s9.then(sPromise, sPromise, sPromise); // ok var s9e = s9.then(nPromise, nPromise, nPromise); // ok var s9f = s9.then(testFunction, sIPromise, nIPromise); // error var s9g = s9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var r10 = testFunction10(function (x) { return x; }); +var r10 = testFunction10(function (x) { + return x; +}); var r10a = r10.then(testFunction10, testFunction10, testFunction10); // ok var r10b = r10.then(sIPromise, sIPromise, sIPromise); // ok var r10c = r10.then(nIPromise, nIPromise, nIPromise); // ok var r10d = r10.then(testFunction, sIPromise, nIPromise); // error var r10e = r10.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok -var s10 = testFunction10P(function (x) { return x; }); +var s10 = testFunction10P(function (x) { + return x; +}); var s10a = s10.then(testFunction10, testFunction10, testFunction10); // ok var s10b = s10.then(testFunction10P, testFunction10P, testFunction10P); // ok var s10c = s10.then(testFunction10P, testFunction10, testFunction10); // ok @@ -271,9 +275,13 @@ var s11; var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok var s11b = s11.then(testFunction11P, testFunction11P, testFunction11P); // error var s11c = s11.then(testFunction11P, testFunction11, testFunction11); // error -var r12 = testFunction12(function (x) { return x; }); +var r12 = testFunction12(function (x) { + return x; +}); var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok -var s12 = testFunction12(function (x) { return x; }); +var s12 = testFunction12(function (x) { + return x; +}); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/promiseTypeInference.js b/tests/baselines/reference/promiseTypeInference.js index 6faf131438a..8124c4b03a8 100644 --- a/tests/baselines/reference/promiseTypeInference.js +++ b/tests/baselines/reference/promiseTypeInference.js @@ -12,4 +12,6 @@ var $$x = load("something").then(s => convert(s)); //// [promiseTypeInference.js] -var $$x = load("something").then(function (s) { return convert(s); }); +var $$x = load("something").then(function (s) { + return convert(s); +}); diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js index 735c8d3908f..f47b850a954 100644 --- a/tests/baselines/reference/propertyAccess.js +++ b/tests/baselines/reference/propertyAccess.js @@ -176,15 +176,28 @@ var Compass; Compass[Compass["East"] = 2] = "East"; Compass[Compass["West"] = 3] = "West"; })(Compass || (Compass = {})); -var numIndex = { 3: 'three', 'three': 'three' }; -var strIndex = { 'N': 0 /* North */, 'E': 2 /* East */ }; +var numIndex = { + 3: 'three', + 'three': 'three' +}; +var strIndex = { + 'N': 0 /* North */, + 'E': 2 /* East */ +}; var bothIndex; -function noIndex() { } +function noIndex() { +} var obj = { 10: 'ten', x: 'hello', y: 32, - z: { n: 'world', m: 15, o: function () { return false; } }, + z: { + n: 'world', + m: 15, + o: function () { + return false; + } + }, 'literal property': 100 }; var anyVar = {}; diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js index 88baee7752e..81cdcec5434 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js @@ -92,7 +92,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ''; }; + A.prototype.foo = function () { + return ''; + }; return A; })(); var B = (function (_super) { diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js index 941adc7ab43..eb3770bc0b3 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js @@ -67,7 +67,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ''; }; + A.prototype.foo = function () { + return ''; + }; return A; })(); var B = (function (_super) { diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js index fe3c9433796..3a88ec832f7 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js @@ -54,7 +54,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ''; }; + A.prototype.foo = function () { + return ''; + }; return A; })(); var B = (function (_super) { diff --git a/tests/baselines/reference/propertyAndAccessorWithSameName.js b/tests/baselines/reference/propertyAndAccessorWithSameName.js index f8978ac4d18..f466483cede 100644 --- a/tests/baselines/reference/propertyAndAccessorWithSameName.js +++ b/tests/baselines/reference/propertyAndAccessorWithSameName.js @@ -36,7 +36,8 @@ var D = (function () { function D() { } Object.defineProperty(D.prototype, "x", { - set: function (v) { } // error + set: function (v) { + } // error , enumerable: true, configurable: true @@ -50,7 +51,8 @@ var E = (function () { get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/propertyAndFunctionWithSameName.js b/tests/baselines/reference/propertyAndFunctionWithSameName.js index eb0b437fd5c..ec5f1903e8a 100644 --- a/tests/baselines/reference/propertyAndFunctionWithSameName.js +++ b/tests/baselines/reference/propertyAndFunctionWithSameName.js @@ -23,6 +23,7 @@ var C = (function () { var D = (function () { function D() { } - D.prototype.x = function (v) { }; // error + D.prototype.x = function (v) { + }; // error return D; })(); diff --git a/tests/baselines/reference/propertyOrdering.js b/tests/baselines/reference/propertyOrdering.js index f0f4644a983..1dc930f93a1 100644 --- a/tests/baselines/reference/propertyOrdering.js +++ b/tests/baselines/reference/propertyOrdering.js @@ -31,7 +31,9 @@ var Foo = (function () { Foo.prototype.foo = function () { return this._store.length; // shouldn't be an error }; - Foo.prototype.bar = function () { return this.store; }; // should be an error + Foo.prototype.bar = function () { + return this.store; + }; // should be an error return Foo; })(); var Bar = (function () { diff --git a/tests/baselines/reference/propertyWrappedInTry.js b/tests/baselines/reference/propertyWrappedInTry.js index e7f8a28d688..459e35f91ae 100644 --- a/tests/baselines/reference/propertyWrappedInTry.js +++ b/tests/baselines/reference/propertyWrappedInTry.js @@ -28,7 +28,8 @@ var Foo = (function () { try { bar = someInitThatMightFail(); } -catch (e) { } +catch (e) { +} baz(); { return this.bar; // doesn't get rewritten to Foo.bar. diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js index 19ec9f50d27..63c6929e8b7 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js @@ -37,20 +37,34 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { return this.foo; }; + C.prototype.foo = function () { + return this.foo; + }; Object.defineProperty(C, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.foo = function () { return this.foo; }; - C.bar = function () { this.foo(); }; + C.foo = function () { + return this.foo; + }; + C.bar = function () { + this.foo(); + }; return C; })(); // added level of function nesting @@ -60,40 +74,54 @@ var C2 = (function () { Object.defineProperty(C2.prototype, "y", { get: function () { var _this = this; - (function () { return _this.x; }); + (function () { + return _this.x; + }); return null; }, set: function (x) { var _this = this; - (function () { _this.y = _this.x; }); + (function () { + _this.y = _this.x; + }); }, enumerable: true, configurable: true }); C2.prototype.foo = function () { var _this = this; - (function () { return _this.foo; }); + (function () { + return _this.foo; + }); }; Object.defineProperty(C2, "y", { get: function () { var _this = this; - (function () { return _this.x; }); + (function () { + return _this.x; + }); return null; }, set: function (x) { var _this = this; - (function () { _this.y = _this.x; }); + (function () { + _this.y = _this.x; + }); }, enumerable: true, configurable: true }); C2.foo = function () { var _this = this; - (function () { return _this.foo; }); + (function () { + return _this.foo; + }); }; C2.bar = function () { var _this = this; - (function () { return _this.foo(); }); + (function () { + return _this.foo(); + }); }; return C2; })(); diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js index 28a1da5ffec..381d10f43ea 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js @@ -38,20 +38,36 @@ var C = (function (_super) { _super.apply(this, arguments); } Object.defineProperty(C.prototype, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.prototype.foo = function () { return this.x; }; - C.prototype.bar = function () { return this.foo(); }; + C.prototype.foo = function () { + return this.x; + }; + C.prototype.bar = function () { + return this.foo(); + }; Object.defineProperty(C, "y", { - get: function () { return this.x; }, - set: function (x) { this.y = this.x; }, + get: function () { + return this.x; + }, + set: function (x) { + this.y = this.x; + }, enumerable: true, configurable: true }); - C.foo = function () { return this.x; }; - C.bar = function () { this.foo(); }; + C.foo = function () { + return this.x; + }; + C.bar = function () { + this.foo(); + }; return C; })(B); diff --git a/tests/baselines/reference/prototypes.js b/tests/baselines/reference/prototypes.js index 4d7ddc4a4d5..4ecdafb3dc4 100644 --- a/tests/baselines/reference/prototypes.js +++ b/tests/baselines/reference/prototypes.js @@ -7,5 +7,6 @@ f.prototype; //// [prototypes.js] Object.prototype; // ok new Object().prototype; // error -function f() { } +function f() { +} f.prototype; diff --git a/tests/baselines/reference/qualifiedModuleLocals.js b/tests/baselines/reference/qualifiedModuleLocals.js index b7ba5b70e81..2909be7639d 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.js +++ b/tests/baselines/reference/qualifiedModuleLocals.js @@ -13,8 +13,11 @@ A.a(); //// [qualifiedModuleLocals.js] var A; (function (A) { - function b() { } - function a() { A.b(); } + function b() { + } + function a() { + A.b(); + } A.a = a; // A.b should be an unresolved symbol error })(A || (A = {})); A.a(); diff --git a/tests/baselines/reference/quotedAccessorName1.js b/tests/baselines/reference/quotedAccessorName1.js index 69e0fdb2c8e..93fd5b8dd6b 100644 --- a/tests/baselines/reference/quotedAccessorName1.js +++ b/tests/baselines/reference/quotedAccessorName1.js @@ -8,7 +8,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "foo", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/quotedAccessorName2.js b/tests/baselines/reference/quotedAccessorName2.js index 5d2d4861550..43041a29bf4 100644 --- a/tests/baselines/reference/quotedAccessorName2.js +++ b/tests/baselines/reference/quotedAccessorName2.js @@ -8,7 +8,9 @@ var C = (function () { function C() { } Object.defineProperty(C, "foo", { - get: function () { return 0; }, + get: function () { + return 0; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/quotedFunctionName1.js b/tests/baselines/reference/quotedFunctionName1.js index 69f4f2cfaa3..28d75186474 100644 --- a/tests/baselines/reference/quotedFunctionName1.js +++ b/tests/baselines/reference/quotedFunctionName1.js @@ -7,6 +7,7 @@ class Test1 { var Test1 = (function () { function Test1() { } - Test1.prototype["prop1"] = function () { }; + Test1.prototype["prop1"] = function () { + }; return Test1; })(); diff --git a/tests/baselines/reference/quotedFunctionName2.js b/tests/baselines/reference/quotedFunctionName2.js index 3173ec29f13..46d8d9bae9d 100644 --- a/tests/baselines/reference/quotedFunctionName2.js +++ b/tests/baselines/reference/quotedFunctionName2.js @@ -7,6 +7,7 @@ class Test1 { var Test1 = (function () { function Test1() { } - Test1["prop1"] = function () { }; + Test1["prop1"] = function () { + }; return Test1; })(); diff --git a/tests/baselines/reference/quotedPropertyName3.js b/tests/baselines/reference/quotedPropertyName3.js index 4191418e42a..8e6342e1ba3 100644 --- a/tests/baselines/reference/quotedPropertyName3.js +++ b/tests/baselines/reference/quotedPropertyName3.js @@ -13,7 +13,9 @@ var Test = (function () { } Test.prototype.foo = function () { var _this = this; - var x = function () { return _this["prop1"]; }; + var x = function () { + return _this["prop1"]; + }; var y = x(); }; return Test; diff --git a/tests/baselines/reference/rectype.js b/tests/baselines/reference/rectype.js index 15c5d9861f4..ed303b6b26e 100644 --- a/tests/baselines/reference/rectype.js +++ b/tests/baselines/reference/rectype.js @@ -16,7 +16,9 @@ module M { //// [rectype.js] var M; (function (M) { - function f(p) { return f; } + function f(p) { + return f; + } M.f = f; ; var i; diff --git a/tests/baselines/reference/recur1.js b/tests/baselines/reference/recur1.js index 37a8b6eb3f2..3dd0e14ad97 100644 --- a/tests/baselines/reference/recur1.js +++ b/tests/baselines/reference/recur1.js @@ -9,6 +9,8 @@ cobalt.pitch = function() {} //// [recur1.js] var salt = new salt.pepper(); -salt.pepper = function () { }; +salt.pepper = function () { +}; var cobalt = new cobalt.pitch(); -cobalt.pitch = function () { }; +cobalt.pitch = function () { +}; diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.js b/tests/baselines/reference/recursiveBaseConstructorCreation1.js index c475f604b14..69a71a4f79c 100644 --- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js +++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js @@ -16,7 +16,8 @@ var __extends = this.__extends || function (d, b) { var C1 = (function () { function C1() { } - C1.prototype.func = function (param) { }; + C1.prototype.func = function (param) { + }; return C1; })(); var C2 = (function (_super) { diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js index 4b115d3e722..f565f8f23d0 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js +++ b/tests/baselines/reference/recursiveClassReferenceTest.js @@ -122,7 +122,9 @@ var Sample; var StartFindAction = (function () { function StartFindAction() { } - StartFindAction.prototype.getId = function () { return "yo"; }; + StartFindAction.prototype.getId = function () { + return "yo"; + }; StartFindAction.prototype.run = function (Thing) { return true; }; @@ -146,9 +148,11 @@ var Sample; // scenario 1 codeThing.addWidget("addWidget", this); } - FindWidget.prototype.gar = function (runner) { if (true) { - return runner(this); - } }; + FindWidget.prototype.gar = function (runner) { + if (true) { + return runner(this); + } + }; FindWidget.prototype.getDomNode = function () { return domNode; }; @@ -163,7 +167,9 @@ var Sample; var AbstractMode = (function () { function AbstractMode() { } - AbstractMode.prototype.getInitialState = function () { return null; }; + AbstractMode.prototype.getInitialState = function () { + return null; + }; return AbstractMode; })(); var Sample; @@ -184,7 +190,9 @@ var Sample; State.prototype.equals = function (other) { return this === other; }; - State.prototype.getMode = function () { return mode; }; + State.prototype.getMode = function () { + return mode; + }; return State; })(); PlainText.State = State; diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index f9314fb2f6e..d77875f10e4 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":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,QAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA,cAAiBE,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,aAAIA,KAAJA,aAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA,IAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;gBAAAA,CAACA,CAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAe;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA,cAAmCE,MAAMA,CAACA,IAAIA,CAACA,CAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA,cAA0BI,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,QAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA;wBAAiBE,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,aAAIA,KAAJA,aAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA;oBAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;wBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;oBAAAA,CAACA;gBAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAe;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA;QAAmCE,MAAMA,CAACA,IAAIA,CAACA;IAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA;wBAA0BI,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,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 1aa9ad4342d..47bb3f2d18a 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -229,7 +229,7 @@ sourceFile:recursiveClassReferenceTest.ts >>> } 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class StartFindAction implements Sample.Thing.IAction { > > public getId() { return "yo"; } @@ -243,56 +243,61 @@ sourceFile:recursiveClassReferenceTest.ts 1->Emitted(19, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) 2 >Emitted(19, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) --- ->>> StartFindAction.prototype.getId = function () { return "yo"; }; +>>> StartFindAction.prototype.getId = function () { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^ -6 > ^ -7 > ^^^^ -8 > ^ -9 > ^ -10> ^ 1-> 2 > getId 3 > -4 > public getId() { -5 > return -6 > -7 > "yo" -8 > ; -9 > -10> } 1->Emitted(20, 21) Source(35, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) 2 >Emitted(20, 52) Source(35, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) 3 >Emitted(20, 55) Source(35, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -4 >Emitted(20, 69) Source(35, 20) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -5 >Emitted(20, 75) Source(35, 26) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -6 >Emitted(20, 76) Source(35, 27) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -7 >Emitted(20, 80) Source(35, 31) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -8 >Emitted(20, 81) Source(35, 32) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -9 >Emitted(20, 82) Source(35, 33) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -10>Emitted(20, 83) Source(35, 34) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +--- +>>> return "yo"; +1 >^^^^^^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +1 >public getId() { +2 > return +3 > +4 > "yo" +5 > ; +1 >Emitted(21, 25) Source(35, 20) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +2 >Emitted(21, 31) Source(35, 26) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +3 >Emitted(21, 32) Source(35, 27) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +4 >Emitted(21, 36) Source(35, 31) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +5 >Emitted(21, 37) Source(35, 32) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 > } +1 >Emitted(22, 21) Source(35, 33) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +2 >Emitted(22, 22) Source(35, 34) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) --- >>> StartFindAction.prototype.run = function (Thing) { -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ 4 > ^^^^^^^^^^ 5 > ^^^^^ -1 > +1-> > > public 2 > run 3 > 4 > public run( 5 > Thing:Sample.Thing.ICodeThing -1 >Emitted(21, 21) Source(37, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(21, 50) Source(37, 13) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(21, 53) Source(37, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -4 >Emitted(21, 63) Source(37, 14) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -5 >Emitted(21, 68) Source(37, 43) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +1->Emitted(23, 21) Source(37, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +2 >Emitted(23, 50) Source(37, 13) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +3 >Emitted(23, 53) Source(37, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +4 >Emitted(23, 63) Source(37, 14) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +5 >Emitted(23, 68) Source(37, 43) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) --- >>> return true; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -307,11 +312,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > true 5 > ; -1 >Emitted(22, 25) Source(39, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -2 >Emitted(22, 31) Source(39, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -3 >Emitted(22, 32) Source(39, 11) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -4 >Emitted(22, 36) Source(39, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -5 >Emitted(22, 37) Source(39, 16) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +1 >Emitted(24, 25) Source(39, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +2 >Emitted(24, 31) Source(39, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +3 >Emitted(24, 32) Source(39, 11) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +4 >Emitted(24, 36) Source(39, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +5 >Emitted(24, 37) Source(39, 16) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -320,8 +325,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(23, 21) Source(40, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -2 >Emitted(23, 22) Source(40, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +1 >Emitted(25, 21) Source(40, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +2 >Emitted(25, 22) Source(40, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) --- >>> return StartFindAction; 1->^^^^^^^^^^^^^^^^^^^^ @@ -329,8 +334,8 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > 2 > } -1->Emitted(24, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(24, 43) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +1->Emitted(26, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +2 >Emitted(26, 43) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -350,10 +355,10 @@ sourceFile:recursiveClassReferenceTest.ts > return true; > } > } -1 >Emitted(25, 17) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(25, 18) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(25, 18) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) -4 >Emitted(25, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +1 >Emitted(27, 17) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +2 >Emitted(27, 18) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +3 >Emitted(27, 18) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) +4 >Emitted(27, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) --- >>> Find.StartFindAction = StartFindAction; 1->^^^^^^^^^^^^^^^^ @@ -373,10 +378,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > } 4 > -1->Emitted(26, 17) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) -2 >Emitted(26, 37) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(26, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) -4 >Emitted(26, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +1->Emitted(28, 17) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) +2 >Emitted(28, 37) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find) +3 >Emitted(28, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +4 >Emitted(28, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) --- >>> })(Find = _Thing_1.Find || (_Thing_1.Find = {})); 1->^^^^^^^^^^^^ @@ -408,15 +413,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1->Emitted(27, 13) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing.Find) -2 >Emitted(27, 14) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(27, 16) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -4 >Emitted(27, 20) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -5 >Emitted(27, 23) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -6 >Emitted(27, 36) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -7 >Emitted(27, 41) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -8 >Emitted(27, 54) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -9 >Emitted(27, 62) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) +1->Emitted(29, 13) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing.Find) +2 >Emitted(29, 14) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) +3 >Emitted(29, 16) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) +4 >Emitted(29, 20) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) +5 >Emitted(29, 23) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) +6 >Emitted(29, 36) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) +7 >Emitted(29, 41) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) +8 >Emitted(29, 54) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) +9 >Emitted(29, 62) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) --- >>> })(Thing = Actions.Thing || (Actions.Thing = {})); 1 >^^^^^^^^ @@ -448,15 +453,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(28, 9) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing) -2 >Emitted(28, 10) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) -3 >Emitted(28, 12) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -4 >Emitted(28, 17) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -5 >Emitted(28, 20) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -6 >Emitted(28, 33) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -7 >Emitted(28, 38) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -8 >Emitted(28, 51) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -9 >Emitted(28, 59) Source(42, 2) + SourceIndex(0) name (Sample.Actions) +1 >Emitted(30, 9) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing) +2 >Emitted(30, 10) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) +3 >Emitted(30, 12) Source(32, 23) + SourceIndex(0) name (Sample.Actions) +4 >Emitted(30, 17) Source(32, 28) + SourceIndex(0) name (Sample.Actions) +5 >Emitted(30, 20) Source(32, 23) + SourceIndex(0) name (Sample.Actions) +6 >Emitted(30, 33) Source(32, 28) + SourceIndex(0) name (Sample.Actions) +7 >Emitted(30, 38) Source(32, 23) + SourceIndex(0) name (Sample.Actions) +8 >Emitted(30, 51) Source(32, 28) + SourceIndex(0) name (Sample.Actions) +9 >Emitted(30, 59) Source(42, 2) + SourceIndex(0) name (Sample.Actions) --- >>> })(Actions = Sample.Actions || (Sample.Actions = {})); 1->^^^^ @@ -487,15 +492,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1->Emitted(29, 5) Source(42, 1) + SourceIndex(0) name (Sample.Actions) -2 >Emitted(29, 6) Source(42, 2) + SourceIndex(0) name (Sample.Actions) -3 >Emitted(29, 8) Source(32, 15) + SourceIndex(0) name (Sample) -4 >Emitted(29, 15) Source(32, 22) + SourceIndex(0) name (Sample) -5 >Emitted(29, 18) Source(32, 15) + SourceIndex(0) name (Sample) -6 >Emitted(29, 32) Source(32, 22) + SourceIndex(0) name (Sample) -7 >Emitted(29, 37) Source(32, 15) + SourceIndex(0) name (Sample) -8 >Emitted(29, 51) Source(32, 22) + SourceIndex(0) name (Sample) -9 >Emitted(29, 59) Source(42, 2) + SourceIndex(0) name (Sample) +1->Emitted(31, 5) Source(42, 1) + SourceIndex(0) name (Sample.Actions) +2 >Emitted(31, 6) Source(42, 2) + SourceIndex(0) name (Sample.Actions) +3 >Emitted(31, 8) Source(32, 15) + SourceIndex(0) name (Sample) +4 >Emitted(31, 15) Source(32, 22) + SourceIndex(0) name (Sample) +5 >Emitted(31, 18) Source(32, 15) + SourceIndex(0) name (Sample) +6 >Emitted(31, 32) Source(32, 22) + SourceIndex(0) name (Sample) +7 >Emitted(31, 37) Source(32, 15) + SourceIndex(0) name (Sample) +8 >Emitted(31, 51) Source(32, 22) + SourceIndex(0) name (Sample) +9 >Emitted(31, 59) Source(42, 2) + SourceIndex(0) name (Sample) --- >>>})(Sample || (Sample = {})); 1 > @@ -522,13 +527,13 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(30, 1) Source(42, 1) + SourceIndex(0) name (Sample) -2 >Emitted(30, 2) Source(42, 2) + SourceIndex(0) name (Sample) -3 >Emitted(30, 4) Source(32, 8) + SourceIndex(0) -4 >Emitted(30, 10) Source(32, 14) + SourceIndex(0) -5 >Emitted(30, 15) Source(32, 8) + SourceIndex(0) -6 >Emitted(30, 21) Source(32, 14) + SourceIndex(0) -7 >Emitted(30, 29) Source(42, 2) + SourceIndex(0) +1 >Emitted(32, 1) Source(42, 1) + SourceIndex(0) name (Sample) +2 >Emitted(32, 2) Source(42, 2) + SourceIndex(0) name (Sample) +3 >Emitted(32, 4) Source(32, 8) + SourceIndex(0) +4 >Emitted(32, 10) Source(32, 14) + SourceIndex(0) +5 >Emitted(32, 15) Source(32, 8) + SourceIndex(0) +6 >Emitted(32, 21) Source(32, 14) + SourceIndex(0) +7 >Emitted(32, 29) Source(42, 2) + SourceIndex(0) --- >>>var Sample; 1 > @@ -562,10 +567,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(31, 1) Source(44, 1) + SourceIndex(0) -2 >Emitted(31, 5) Source(44, 8) + SourceIndex(0) -3 >Emitted(31, 11) Source(44, 14) + SourceIndex(0) -4 >Emitted(31, 12) Source(64, 2) + SourceIndex(0) +1 >Emitted(33, 1) Source(44, 1) + SourceIndex(0) +2 >Emitted(33, 5) Source(44, 8) + SourceIndex(0) +3 >Emitted(33, 11) Source(44, 14) + SourceIndex(0) +4 >Emitted(33, 12) Source(64, 2) + SourceIndex(0) --- >>>(function (Sample) { 1-> @@ -574,9 +579,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 >module 3 > Sample -1->Emitted(32, 1) Source(44, 1) + SourceIndex(0) -2 >Emitted(32, 12) Source(44, 8) + SourceIndex(0) -3 >Emitted(32, 18) Source(44, 14) + SourceIndex(0) +1->Emitted(34, 1) Source(44, 1) + SourceIndex(0) +2 >Emitted(34, 12) Source(44, 8) + SourceIndex(0) +3 >Emitted(34, 18) Source(44, 14) + SourceIndex(0) --- >>> var Thing; 1 >^^^^ @@ -608,10 +613,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(33, 5) Source(44, 15) + SourceIndex(0) name (Sample) -2 >Emitted(33, 9) Source(44, 15) + SourceIndex(0) name (Sample) -3 >Emitted(33, 14) Source(44, 20) + SourceIndex(0) name (Sample) -4 >Emitted(33, 15) Source(64, 2) + SourceIndex(0) name (Sample) +1 >Emitted(35, 5) Source(44, 15) + SourceIndex(0) name (Sample) +2 >Emitted(35, 9) Source(44, 15) + SourceIndex(0) name (Sample) +3 >Emitted(35, 14) Source(44, 20) + SourceIndex(0) name (Sample) +4 >Emitted(35, 15) Source(64, 2) + SourceIndex(0) name (Sample) --- >>> (function (Thing) { 1->^^^^ @@ -621,9 +626,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(34, 5) Source(44, 15) + SourceIndex(0) name (Sample) -2 >Emitted(34, 16) Source(44, 15) + SourceIndex(0) name (Sample) -3 >Emitted(34, 21) Source(44, 20) + SourceIndex(0) name (Sample) +1->Emitted(36, 5) Source(44, 15) + SourceIndex(0) name (Sample) +2 >Emitted(36, 16) Source(44, 15) + SourceIndex(0) name (Sample) +3 >Emitted(36, 21) Source(44, 20) + SourceIndex(0) name (Sample) --- >>> var Widgets; 1->^^^^^^^^ @@ -655,10 +660,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(35, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(35, 13) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(35, 20) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(35, 21) Source(64, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(37, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(37, 13) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(37, 20) Source(44, 28) + SourceIndex(0) name (Sample.Thing) +4 >Emitted(37, 21) Source(64, 2) + SourceIndex(0) name (Sample.Thing) --- >>> (function (Widgets) { 1->^^^^^^^^ @@ -672,18 +677,18 @@ sourceFile:recursiveClassReferenceTest.ts 3 > Widgets 4 > 5 > { -1->Emitted(36, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(36, 20) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(36, 27) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(36, 29) Source(44, 29) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(36, 30) Source(44, 30) + SourceIndex(0) name (Sample.Thing) +1->Emitted(38, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(38, 20) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(38, 27) Source(44, 28) + SourceIndex(0) name (Sample.Thing) +4 >Emitted(38, 29) Source(44, 29) + SourceIndex(0) name (Sample.Thing) +5 >Emitted(38, 30) Source(44, 30) + SourceIndex(0) name (Sample.Thing) --- >>> var FindWidget = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(37, 13) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) +1->Emitted(39, 13) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) --- >>> function FindWidget(codeThing) { 1->^^^^^^^^^^^^^^^^ @@ -698,9 +703,9 @@ sourceFile:recursiveClassReferenceTest.ts > 2 > constructor(private 3 > codeThing: Sample.Thing.ICodeThing -1->Emitted(38, 17) Source(50, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(38, 37) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(38, 46) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(40, 17) Source(50, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(40, 37) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(40, 46) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- >>> this.codeThing = codeThing; 1->^^^^^^^^^^^^^^^^^^^^ @@ -713,11 +718,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > codeThing 5 > : Sample.Thing.ICodeThing -1->Emitted(39, 21) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(39, 35) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(39, 38) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(39, 47) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(39, 48) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1->Emitted(41, 21) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +2 >Emitted(41, 35) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +3 >Emitted(41, 38) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +4 >Emitted(41, 47) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +5 >Emitted(41, 48) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) --- >>> this.domNode = null; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -730,11 +735,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > :any = 4 > null 5 > ; -1 >Emitted(40, 21) Source(49, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(40, 33) Source(49, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(40, 36) Source(49, 25) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(40, 40) Source(49, 29) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(40, 41) Source(49, 30) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(42, 21) Source(49, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +2 >Emitted(42, 33) Source(49, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +3 >Emitted(42, 36) Source(49, 25) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +4 >Emitted(42, 40) Source(49, 29) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +5 >Emitted(42, 41) Source(49, 30) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) --- >>> // scenario 1 1 >^^^^^^^^^^^^^^^^^^^^ @@ -747,9 +752,9 @@ sourceFile:recursiveClassReferenceTest.ts > 2 > 3 > // scenario 1 -1 >Emitted(41, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(41, 21) Source(51, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(41, 34) Source(51, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(43, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +2 >Emitted(43, 21) Source(51, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +3 >Emitted(43, 34) Source(51, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) --- >>> codeThing.addWidget("addWidget", this); 1->^^^^^^^^^^^^^^^^^^^^ @@ -773,108 +778,113 @@ sourceFile:recursiveClassReferenceTest.ts 8 > this 9 > ) 10> ; -1->Emitted(42, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(42, 30) Source(52, 16) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(42, 31) Source(52, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(42, 40) Source(52, 26) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(42, 41) Source(52, 27) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -6 >Emitted(42, 52) Source(52, 38) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -7 >Emitted(42, 54) Source(52, 40) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -8 >Emitted(42, 58) Source(52, 44) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -9 >Emitted(42, 59) Source(52, 45) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -10>Emitted(42, 60) Source(52, 46) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1->Emitted(44, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +2 >Emitted(44, 30) Source(52, 16) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +3 >Emitted(44, 31) Source(52, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +4 >Emitted(44, 40) Source(52, 26) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +5 >Emitted(44, 41) Source(52, 27) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +6 >Emitted(44, 52) Source(52, 38) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +7 >Emitted(44, 54) Source(52, 40) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +8 >Emitted(44, 58) Source(52, 44) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +9 >Emitted(44, 59) Source(52, 45) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +10>Emitted(44, 60) Source(52, 46) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) --- >>> } 1 >^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 > } -1 >Emitted(43, 17) Source(53, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(43, 18) Source(53, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(45, 17) Source(53, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +2 >Emitted(45, 18) Source(53, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) --- ->>> FindWidget.prototype.gar = function (runner) { if (true) { +>>> FindWidget.prototype.gar = function (runner) { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ 4 > ^^^^^^^^^^ 5 > ^^^^^^ -6 > ^^^^ -7 > ^^ -8 > ^ -9 > ^ -10> ^^^^ -11> ^ -12> ^ -13> ^ 1-> 2 > gar 3 > 4 > public gar( 5 > runner:(widget:Sample.Thing.IWidget)=>any -6 > ) { -7 > if -8 > -9 > ( -10> true -11> ) -12> -13> { -1->Emitted(44, 17) Source(47, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(44, 41) Source(47, 13) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(44, 44) Source(47, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -4 >Emitted(44, 54) Source(47, 14) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -5 >Emitted(44, 60) Source(47, 55) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -6 >Emitted(44, 64) Source(47, 59) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -7 >Emitted(44, 66) Source(47, 61) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -8 >Emitted(44, 67) Source(47, 62) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -9 >Emitted(44, 68) Source(47, 63) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -10>Emitted(44, 72) Source(47, 67) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -11>Emitted(44, 73) Source(47, 68) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -12>Emitted(44, 74) Source(47, 69) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -13>Emitted(44, 75) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +1->Emitted(46, 17) Source(47, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(46, 41) Source(47, 13) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(46, 44) Source(47, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +4 >Emitted(46, 54) Source(47, 14) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +5 >Emitted(46, 60) Source(47, 55) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- ->>> return runner(this); +>>> if (true) { 1 >^^^^^^^^^^^^^^^^^^^^ -2 > ^^^^^^ -3 > ^ -4 > ^^^^^^ -5 > ^ -6 > ^^^^ -7 > ^ -8 > ^ -1 > -2 > return -3 > -4 > runner -5 > ( -6 > this -7 > ) -8 > ; -1 >Emitted(45, 21) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -2 >Emitted(45, 27) Source(47, 76) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -3 >Emitted(45, 28) Source(47, 77) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -4 >Emitted(45, 34) Source(47, 83) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -5 >Emitted(45, 35) Source(47, 84) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -6 >Emitted(45, 39) Source(47, 88) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -7 >Emitted(45, 40) Source(47, 89) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -8 >Emitted(45, 41) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +2 > ^^ +3 > ^ +4 > ^ +5 > ^^^^ +6 > ^ +7 > ^ +8 > ^ +9 > ^^^^^^^^^^^^^^-> +1 >) { +2 > if +3 > +4 > ( +5 > true +6 > ) +7 > +8 > { +1 >Emitted(47, 21) Source(47, 59) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +2 >Emitted(47, 23) Source(47, 61) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +3 >Emitted(47, 24) Source(47, 62) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +4 >Emitted(47, 25) Source(47, 63) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +5 >Emitted(47, 29) Source(47, 67) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +6 >Emitted(47, 30) Source(47, 68) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +7 >Emitted(47, 31) Source(47, 69) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +8 >Emitted(47, 32) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) --- ->>> } }; +>>> return runner(this); +1->^^^^^^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^^^ +5 > ^ +6 > ^^^^ +7 > ^ +8 > ^ +1-> +2 > return +3 > +4 > runner +5 > ( +6 > this +7 > ) +8 > ; +1->Emitted(48, 25) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +2 >Emitted(48, 31) Source(47, 76) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +3 >Emitted(48, 32) Source(47, 77) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +4 >Emitted(48, 38) Source(47, 83) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +5 >Emitted(48, 39) Source(47, 84) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +6 >Emitted(48, 43) Source(47, 88) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +7 >Emitted(48, 44) Source(47, 89) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +8 >Emitted(48, 45) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +--- +>>> } +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +1 > +2 > } +1 >Emitted(49, 21) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +2 >Emitted(49, 22) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +--- +>>> }; 1 >^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 > } -3 > -4 > } -1 >Emitted(46, 17) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -2 >Emitted(46, 18) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -3 >Emitted(46, 19) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -4 >Emitted(46, 20) Source(47, 92) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +1 >Emitted(50, 17) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +2 >Emitted(50, 18) Source(47, 92) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) --- >>> FindWidget.prototype.getDomNode = function () { 1->^^^^^^^^^^^^^^^^ @@ -891,9 +901,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > getDomNode 3 > -1->Emitted(47, 17) Source(55, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(47, 48) Source(55, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(47, 51) Source(55, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(51, 17) Source(55, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(51, 48) Source(55, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(51, 51) Source(55, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- >>> return domNode; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -907,11 +917,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > domNode 5 > ; -1 >Emitted(48, 21) Source(56, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -2 >Emitted(48, 27) Source(56, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -3 >Emitted(48, 28) Source(56, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -4 >Emitted(48, 35) Source(56, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -5 >Emitted(48, 36) Source(56, 19) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +1 >Emitted(52, 21) Source(56, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +2 >Emitted(52, 27) Source(56, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +3 >Emitted(52, 28) Source(56, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +4 >Emitted(52, 35) Source(56, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +5 >Emitted(52, 36) Source(56, 19) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) --- >>> }; 1 >^^^^^^^^^^^^^^^^ @@ -920,8 +930,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(49, 17) Source(57, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -2 >Emitted(49, 18) Source(57, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +1 >Emitted(53, 17) Source(57, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +2 >Emitted(53, 18) Source(57, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) --- >>> FindWidget.prototype.destroy = function () { 1->^^^^^^^^^^^^^^^^ @@ -932,9 +942,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > destroy 3 > -1->Emitted(50, 17) Source(59, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(50, 45) Source(59, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(50, 48) Source(59, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(54, 17) Source(59, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(54, 45) Source(59, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(54, 48) Source(59, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- >>> }; 1 >^^^^^^^^^^^^^^^^ @@ -944,8 +954,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1 >Emitted(51, 17) Source(61, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) -2 >Emitted(51, 18) Source(61, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) +1 >Emitted(55, 17) Source(61, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) +2 >Emitted(55, 18) Source(61, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) --- >>> return FindWidget; 1->^^^^^^^^^^^^^^^^ @@ -954,8 +964,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1->Emitted(52, 17) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(52, 34) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(56, 17) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(56, 34) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -985,10 +995,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > > } -1 >Emitted(53, 13) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(53, 14) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(53, 14) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) -4 >Emitted(53, 18) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +1 >Emitted(57, 13) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +2 >Emitted(57, 14) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +3 >Emitted(57, 14) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) +4 >Emitted(57, 18) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) --- >>> Widgets.FindWidget = FindWidget; 1->^^^^^^^^^^^^ @@ -1018,10 +1028,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } 4 > -1->Emitted(54, 13) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) -2 >Emitted(54, 31) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(54, 44) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) -4 >Emitted(54, 45) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +1->Emitted(58, 13) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) +2 >Emitted(58, 31) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets) +3 >Emitted(58, 44) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +4 >Emitted(58, 45) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) --- >>> })(Widgets = Thing.Widgets || (Thing.Widgets = {})); 1->^^^^^^^^ @@ -1063,15 +1073,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(55, 9) Source(64, 1) + SourceIndex(0) name (Sample.Thing.Widgets) -2 >Emitted(55, 10) Source(64, 2) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(55, 12) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(55, 19) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(55, 22) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -6 >Emitted(55, 35) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -7 >Emitted(55, 40) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -8 >Emitted(55, 53) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -9 >Emitted(55, 61) Source(64, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(59, 9) Source(64, 1) + SourceIndex(0) name (Sample.Thing.Widgets) +2 >Emitted(59, 10) Source(64, 2) + SourceIndex(0) name (Sample.Thing.Widgets) +3 >Emitted(59, 12) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +4 >Emitted(59, 19) Source(44, 28) + SourceIndex(0) name (Sample.Thing) +5 >Emitted(59, 22) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +6 >Emitted(59, 35) Source(44, 28) + SourceIndex(0) name (Sample.Thing) +7 >Emitted(59, 40) Source(44, 21) + SourceIndex(0) name (Sample.Thing) +8 >Emitted(59, 53) Source(44, 28) + SourceIndex(0) name (Sample.Thing) +9 >Emitted(59, 61) Source(64, 2) + SourceIndex(0) name (Sample.Thing) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); 1 >^^^^ @@ -1112,15 +1122,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(56, 5) Source(64, 1) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(56, 6) Source(64, 2) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(56, 8) Source(44, 15) + SourceIndex(0) name (Sample) -4 >Emitted(56, 13) Source(44, 20) + SourceIndex(0) name (Sample) -5 >Emitted(56, 16) Source(44, 15) + SourceIndex(0) name (Sample) -6 >Emitted(56, 28) Source(44, 20) + SourceIndex(0) name (Sample) -7 >Emitted(56, 33) Source(44, 15) + SourceIndex(0) name (Sample) -8 >Emitted(56, 45) Source(44, 20) + SourceIndex(0) name (Sample) -9 >Emitted(56, 53) Source(64, 2) + SourceIndex(0) name (Sample) +1 >Emitted(60, 5) Source(64, 1) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(60, 6) Source(64, 2) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(60, 8) Source(44, 15) + SourceIndex(0) name (Sample) +4 >Emitted(60, 13) Source(44, 20) + SourceIndex(0) name (Sample) +5 >Emitted(60, 16) Source(44, 15) + SourceIndex(0) name (Sample) +6 >Emitted(60, 28) Source(44, 20) + SourceIndex(0) name (Sample) +7 >Emitted(60, 33) Source(44, 15) + SourceIndex(0) name (Sample) +8 >Emitted(60, 45) Source(44, 20) + SourceIndex(0) name (Sample) +9 >Emitted(60, 53) Source(64, 2) + SourceIndex(0) name (Sample) --- >>>})(Sample || (Sample = {})); 1 > @@ -1158,13 +1168,13 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(57, 1) Source(64, 1) + SourceIndex(0) name (Sample) -2 >Emitted(57, 2) Source(64, 2) + SourceIndex(0) name (Sample) -3 >Emitted(57, 4) Source(44, 8) + SourceIndex(0) -4 >Emitted(57, 10) Source(44, 14) + SourceIndex(0) -5 >Emitted(57, 15) Source(44, 8) + SourceIndex(0) -6 >Emitted(57, 21) Source(44, 14) + SourceIndex(0) -7 >Emitted(57, 29) Source(64, 2) + SourceIndex(0) +1 >Emitted(61, 1) Source(64, 1) + SourceIndex(0) name (Sample) +2 >Emitted(61, 2) Source(64, 2) + SourceIndex(0) name (Sample) +3 >Emitted(61, 4) Source(44, 8) + SourceIndex(0) +4 >Emitted(61, 10) Source(44, 14) + SourceIndex(0) +5 >Emitted(61, 15) Source(44, 8) + SourceIndex(0) +6 >Emitted(61, 21) Source(44, 14) + SourceIndex(0) +7 >Emitted(61, 29) Source(64, 2) + SourceIndex(0) --- >>>var AbstractMode = (function () { 1-> @@ -1173,62 +1183,67 @@ sourceFile:recursiveClassReferenceTest.ts > >interface IMode { getInitialState(): IState;} > -1->Emitted(58, 1) Source(67, 1) + SourceIndex(0) +1->Emitted(62, 1) Source(67, 1) + SourceIndex(0) --- >>> function AbstractMode() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(59, 5) Source(67, 1) + SourceIndex(0) name (AbstractMode) +1->Emitted(63, 5) Source(67, 1) + SourceIndex(0) name (AbstractMode) --- >>> } 1->^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 2 > } -1->Emitted(60, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode.constructor) -2 >Emitted(60, 6) Source(67, 89) + SourceIndex(0) name (AbstractMode.constructor) +1->Emitted(64, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode.constructor) +2 >Emitted(64, 6) Source(67, 89) + SourceIndex(0) name (AbstractMode.constructor) --- ->>> AbstractMode.prototype.getInitialState = function () { return null; }; +>>> AbstractMode.prototype.getInitialState = function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^ -6 > ^ -7 > ^^^^ -8 > ^ -9 > ^ -10> ^ 1-> 2 > getInitialState 3 > -4 > public getInitialState(): IState { -5 > return -6 > -7 > null -8 > ; -9 > -10> } -1->Emitted(61, 5) Source(67, 46) + SourceIndex(0) name (AbstractMode) -2 >Emitted(61, 43) Source(67, 61) + SourceIndex(0) name (AbstractMode) -3 >Emitted(61, 46) Source(67, 39) + SourceIndex(0) name (AbstractMode) -4 >Emitted(61, 60) Source(67, 74) + SourceIndex(0) name (AbstractMode.getInitialState) -5 >Emitted(61, 66) Source(67, 80) + SourceIndex(0) name (AbstractMode.getInitialState) -6 >Emitted(61, 67) Source(67, 81) + SourceIndex(0) name (AbstractMode.getInitialState) -7 >Emitted(61, 71) Source(67, 85) + SourceIndex(0) name (AbstractMode.getInitialState) -8 >Emitted(61, 72) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) -9 >Emitted(61, 73) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) -10>Emitted(61, 74) Source(67, 87) + SourceIndex(0) name (AbstractMode.getInitialState) +1->Emitted(65, 5) Source(67, 46) + SourceIndex(0) name (AbstractMode) +2 >Emitted(65, 43) Source(67, 61) + SourceIndex(0) name (AbstractMode) +3 >Emitted(65, 46) Source(67, 39) + SourceIndex(0) name (AbstractMode) +--- +>>> return null; +1 >^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +1 >public getInitialState(): IState { +2 > return +3 > +4 > null +5 > ; +1 >Emitted(66, 9) Source(67, 74) + SourceIndex(0) name (AbstractMode.getInitialState) +2 >Emitted(66, 15) Source(67, 80) + SourceIndex(0) name (AbstractMode.getInitialState) +3 >Emitted(66, 16) Source(67, 81) + SourceIndex(0) name (AbstractMode.getInitialState) +4 >Emitted(66, 20) Source(67, 85) + SourceIndex(0) name (AbstractMode.getInitialState) +5 >Emitted(66, 21) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) +--- +>>> }; +1 >^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^^^^^^^-> +1 > +2 > } +1 >Emitted(67, 5) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) +2 >Emitted(67, 6) Source(67, 87) + SourceIndex(0) name (AbstractMode.getInitialState) --- >>> return AbstractMode; -1 >^^^^ +1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^ -1 > +1-> 2 > } -1 >Emitted(62, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode) -2 >Emitted(62, 24) Source(67, 89) + SourceIndex(0) name (AbstractMode) +1->Emitted(68, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode) +2 >Emitted(68, 24) Source(67, 89) + SourceIndex(0) name (AbstractMode) --- >>>})(); 1 > @@ -1240,10 +1255,10 @@ sourceFile:recursiveClassReferenceTest.ts 2 >} 3 > 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} } -1 >Emitted(63, 1) Source(67, 88) + SourceIndex(0) name (AbstractMode) -2 >Emitted(63, 2) Source(67, 89) + SourceIndex(0) name (AbstractMode) -3 >Emitted(63, 2) Source(67, 1) + SourceIndex(0) -4 >Emitted(63, 6) Source(67, 89) + SourceIndex(0) +1 >Emitted(69, 1) Source(67, 88) + SourceIndex(0) name (AbstractMode) +2 >Emitted(69, 2) Source(67, 89) + SourceIndex(0) name (AbstractMode) +3 >Emitted(69, 2) Source(67, 1) + SourceIndex(0) +4 >Emitted(69, 6) Source(67, 89) + SourceIndex(0) --- >>>var Sample; 1-> @@ -1288,10 +1303,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(64, 1) Source(76, 1) + SourceIndex(0) -2 >Emitted(64, 5) Source(76, 8) + SourceIndex(0) -3 >Emitted(64, 11) Source(76, 14) + SourceIndex(0) -4 >Emitted(64, 12) Source(100, 2) + SourceIndex(0) +1->Emitted(70, 1) Source(76, 1) + SourceIndex(0) +2 >Emitted(70, 5) Source(76, 8) + SourceIndex(0) +3 >Emitted(70, 11) Source(76, 14) + SourceIndex(0) +4 >Emitted(70, 12) Source(100, 2) + SourceIndex(0) --- >>>(function (Sample) { 1-> @@ -1300,9 +1315,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 >module 3 > Sample -1->Emitted(65, 1) Source(76, 1) + SourceIndex(0) -2 >Emitted(65, 12) Source(76, 8) + SourceIndex(0) -3 >Emitted(65, 18) Source(76, 14) + SourceIndex(0) +1->Emitted(71, 1) Source(76, 1) + SourceIndex(0) +2 >Emitted(71, 12) Source(76, 8) + SourceIndex(0) +3 >Emitted(71, 18) Source(76, 14) + SourceIndex(0) --- >>> var Thing; 1 >^^^^ @@ -1338,10 +1353,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(66, 5) Source(76, 15) + SourceIndex(0) name (Sample) -2 >Emitted(66, 9) Source(76, 15) + SourceIndex(0) name (Sample) -3 >Emitted(66, 14) Source(76, 20) + SourceIndex(0) name (Sample) -4 >Emitted(66, 15) Source(100, 2) + SourceIndex(0) name (Sample) +1 >Emitted(72, 5) Source(76, 15) + SourceIndex(0) name (Sample) +2 >Emitted(72, 9) Source(76, 15) + SourceIndex(0) name (Sample) +3 >Emitted(72, 14) Source(76, 20) + SourceIndex(0) name (Sample) +4 >Emitted(72, 15) Source(100, 2) + SourceIndex(0) name (Sample) --- >>> (function (Thing) { 1->^^^^ @@ -1351,9 +1366,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(67, 5) Source(76, 15) + SourceIndex(0) name (Sample) -2 >Emitted(67, 16) Source(76, 15) + SourceIndex(0) name (Sample) -3 >Emitted(67, 21) Source(76, 20) + SourceIndex(0) name (Sample) +1->Emitted(73, 5) Source(76, 15) + SourceIndex(0) name (Sample) +2 >Emitted(73, 16) Source(76, 15) + SourceIndex(0) name (Sample) +3 >Emitted(73, 21) Source(76, 20) + SourceIndex(0) name (Sample) --- >>> var Languages; 1->^^^^^^^^ @@ -1389,10 +1404,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(68, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(68, 13) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(68, 22) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(68, 23) Source(100, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(74, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(74, 13) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(74, 22) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +4 >Emitted(74, 23) Source(100, 2) + SourceIndex(0) name (Sample.Thing) --- >>> (function (Languages) { 1->^^^^^^^^ @@ -1401,9 +1416,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Languages -1->Emitted(69, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(69, 20) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(69, 29) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +1->Emitted(75, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(75, 20) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(75, 29) Source(76, 30) + SourceIndex(0) name (Sample.Thing) --- >>> var PlainText; 1 >^^^^^^^^^^^^ @@ -1439,10 +1454,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(70, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(70, 17) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(70, 26) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(70, 27) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) +1 >Emitted(76, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +2 >Emitted(76, 17) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +3 >Emitted(76, 26) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) +4 >Emitted(76, 27) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) --- >>> (function (PlainText) { 1->^^^^^^^^^^^^ @@ -1456,11 +1471,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > PlainText 4 > 5 > { -1->Emitted(71, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(71, 24) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(71, 33) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(71, 35) Source(76, 41) + SourceIndex(0) name (Sample.Thing.Languages) -5 >Emitted(71, 36) Source(76, 42) + SourceIndex(0) name (Sample.Thing.Languages) +1->Emitted(77, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +2 >Emitted(77, 24) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +3 >Emitted(77, 33) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) +4 >Emitted(77, 35) Source(76, 41) + SourceIndex(0) name (Sample.Thing.Languages) +5 >Emitted(77, 36) Source(76, 42) + SourceIndex(0) name (Sample.Thing.Languages) --- >>> var State = (function () { 1->^^^^^^^^^^^^^^^^ @@ -1468,7 +1483,7 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > > -1->Emitted(72, 17) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(78, 17) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> function State(mode) { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1479,9 +1494,9 @@ sourceFile:recursiveClassReferenceTest.ts > 2 > constructor(private 3 > mode: IMode -1->Emitted(73, 21) Source(79, 9) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(73, 36) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(73, 40) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(79, 21) Source(79, 9) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(79, 36) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(79, 40) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) --- >>> this.mode = mode; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1494,11 +1509,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > mode 5 > : IMode -1->Emitted(74, 25) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -2 >Emitted(74, 34) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -3 >Emitted(74, 37) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -4 >Emitted(74, 41) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -5 >Emitted(74, 42) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +1->Emitted(80, 25) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +2 >Emitted(80, 34) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +3 >Emitted(80, 37) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +4 >Emitted(80, 41) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +5 >Emitted(80, 42) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1506,8 +1521,8 @@ sourceFile:recursiveClassReferenceTest.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >) { 2 > } -1 >Emitted(75, 21) Source(79, 44) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -2 >Emitted(75, 22) Source(79, 45) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +1 >Emitted(81, 21) Source(79, 44) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +2 >Emitted(81, 22) Source(79, 45) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) --- >>> State.prototype.clone = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1517,9 +1532,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > clone 3 > -1->Emitted(76, 21) Source(80, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(76, 42) Source(80, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(76, 45) Source(80, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(82, 21) Source(80, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(82, 42) Source(80, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(82, 45) Source(80, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) --- >>> return this; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1533,11 +1548,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > this 5 > ; -1 >Emitted(77, 25) Source(81, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -2 >Emitted(77, 31) Source(81, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -3 >Emitted(77, 32) Source(81, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -4 >Emitted(77, 36) Source(81, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -5 >Emitted(77, 37) Source(81, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +1 >Emitted(83, 25) Source(81, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +2 >Emitted(83, 31) Source(81, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +3 >Emitted(83, 32) Source(81, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +4 >Emitted(83, 36) Source(81, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +5 >Emitted(83, 37) Source(81, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1546,8 +1561,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(78, 21) Source(82, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -2 >Emitted(78, 22) Source(82, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +1 >Emitted(84, 21) Source(82, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +2 >Emitted(84, 22) Source(82, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) --- >>> State.prototype.equals = function (other) { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1562,11 +1577,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > public equals( 5 > other:IState -1->Emitted(79, 21) Source(84, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(79, 43) Source(84, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(79, 46) Source(84, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -4 >Emitted(79, 56) Source(84, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -5 >Emitted(79, 61) Source(84, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(85, 21) Source(84, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(85, 43) Source(84, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(85, 46) Source(84, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +4 >Emitted(85, 56) Source(84, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +5 >Emitted(85, 61) Source(84, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) --- >>> return this === other; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1584,66 +1599,71 @@ sourceFile:recursiveClassReferenceTest.ts 5 > === 6 > other 7 > ; -1 >Emitted(80, 25) Source(85, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -2 >Emitted(80, 31) Source(85, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -3 >Emitted(80, 32) Source(85, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -4 >Emitted(80, 36) Source(85, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -5 >Emitted(80, 41) Source(85, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -6 >Emitted(80, 46) Source(85, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -7 >Emitted(80, 47) Source(85, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +1 >Emitted(86, 25) Source(85, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +2 >Emitted(86, 31) Source(85, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +3 >Emitted(86, 32) Source(85, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +4 >Emitted(86, 36) Source(85, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +5 >Emitted(86, 41) Source(85, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +6 >Emitted(86, 46) Source(85, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +7 >Emitted(86, 47) Source(85, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 > } -1 >Emitted(81, 21) Source(86, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -2 >Emitted(81, 22) Source(86, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +1 >Emitted(87, 21) Source(86, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +2 >Emitted(87, 22) Source(86, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) --- ->>> State.prototype.getMode = function () { return mode; }; +>>> State.prototype.getMode = function () { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^ -6 > ^ -7 > ^^^^ -8 > ^ -9 > ^ -10> ^ 1-> > > public 2 > getMode 3 > -4 > public getMode(): IMode { -5 > return -6 > -7 > mode -8 > ; -9 > -10> } -1->Emitted(82, 21) Source(88, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(82, 44) Source(88, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(82, 47) Source(88, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -4 >Emitted(82, 61) Source(88, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -5 >Emitted(82, 67) Source(88, 35) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -6 >Emitted(82, 68) Source(88, 36) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -7 >Emitted(82, 72) Source(88, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -8 >Emitted(82, 73) Source(88, 41) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -9 >Emitted(82, 74) Source(88, 42) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -10>Emitted(82, 75) Source(88, 43) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +1->Emitted(88, 21) Source(88, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(88, 44) Source(88, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(88, 47) Source(88, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +--- +>>> return mode; +1 >^^^^^^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +1 >public getMode(): IMode { +2 > return +3 > +4 > mode +5 > ; +1 >Emitted(89, 25) Source(88, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +2 >Emitted(89, 31) Source(88, 35) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +3 >Emitted(89, 32) Source(88, 36) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +4 >Emitted(89, 36) Source(88, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +5 >Emitted(89, 37) Source(88, 41) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^-> +1 > +2 > } +1 >Emitted(90, 21) Source(88, 42) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +2 >Emitted(90, 22) Source(88, 43) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) --- >>> return State; -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^ -1 > +1-> > 2 > } -1 >Emitted(83, 21) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(83, 33) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(91, 21) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(91, 33) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1666,10 +1686,10 @@ sourceFile:recursiveClassReferenceTest.ts > > public getMode(): IMode { return mode; } > } -1 >Emitted(84, 17) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(84, 18) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(84, 18) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(84, 22) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1 >Emitted(92, 17) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +2 >Emitted(92, 18) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +3 >Emitted(92, 18) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(92, 22) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> PlainText.State = State; 1->^^^^^^^^^^^^^^^^ @@ -1692,10 +1712,10 @@ sourceFile:recursiveClassReferenceTest.ts > public getMode(): IMode { return mode; } > } 4 > -1->Emitted(85, 17) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(85, 32) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(85, 40) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(85, 41) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(93, 17) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +2 >Emitted(93, 32) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +3 >Emitted(93, 40) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(93, 41) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> var Mode = (function (_super) { 1->^^^^^^^^^^^^^^^^ @@ -1703,29 +1723,29 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > > -1->Emitted(86, 17) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(94, 17) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> __extends(Mode, _super); 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class Mode extends 2 > AbstractMode -1->Emitted(87, 21) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(87, 45) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(95, 21) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(95, 45) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> function Mode() { 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(88, 21) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1 >Emitted(96, 21) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class Mode extends 2 > AbstractMode -1->Emitted(89, 25) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) -2 >Emitted(89, 55) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +1->Emitted(97, 25) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +2 >Emitted(97, 55) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1741,8 +1761,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1 >Emitted(90, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) -2 >Emitted(90, 22) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +1 >Emitted(98, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +2 >Emitted(98, 22) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) --- >>> // scenario 2 1->^^^^^^^^^^^^^^^^^^^^ @@ -1750,8 +1770,8 @@ sourceFile:recursiveClassReferenceTest.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > // scenario 2 -1->Emitted(91, 21) Source(93, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(91, 34) Source(93, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(99, 21) Source(93, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(99, 34) Source(93, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> Mode.prototype.getInitialState = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1761,9 +1781,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > getInitialState 3 > -1->Emitted(92, 21) Source(94, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(92, 51) Source(94, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(92, 54) Source(94, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(100, 21) Source(94, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(100, 51) Source(94, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +3 >Emitted(100, 54) Source(94, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> return new State(self); 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1785,15 +1805,15 @@ sourceFile:recursiveClassReferenceTest.ts 7 > self 8 > ) 9 > ; -1 >Emitted(93, 25) Source(95, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -2 >Emitted(93, 31) Source(95, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -3 >Emitted(93, 32) Source(95, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -4 >Emitted(93, 36) Source(95, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -5 >Emitted(93, 41) Source(95, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -6 >Emitted(93, 42) Source(95, 21) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -7 >Emitted(93, 46) Source(95, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -8 >Emitted(93, 47) Source(95, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -9 >Emitted(93, 48) Source(95, 27) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +1 >Emitted(101, 25) Source(95, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +2 >Emitted(101, 31) Source(95, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +3 >Emitted(101, 32) Source(95, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +4 >Emitted(101, 36) Source(95, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +5 >Emitted(101, 41) Source(95, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +6 >Emitted(101, 42) Source(95, 21) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +7 >Emitted(101, 46) Source(95, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +8 >Emitted(101, 47) Source(95, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +9 >Emitted(101, 48) Source(95, 27) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1802,8 +1822,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(94, 21) Source(96, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -2 >Emitted(94, 22) Source(96, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +1 >Emitted(102, 21) Source(96, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +2 >Emitted(102, 22) Source(96, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) --- >>> return Mode; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1814,8 +1834,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1->Emitted(95, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(95, 32) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(103, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(103, 32) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) --- >>> })(AbstractMode); 1->^^^^^^^^^^^^^^^^ @@ -1839,12 +1859,12 @@ sourceFile:recursiveClassReferenceTest.ts > > > } -1->Emitted(96, 17) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(96, 18) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(96, 18) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(96, 20) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -5 >Emitted(96, 32) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -6 >Emitted(96, 34) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(104, 17) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +2 >Emitted(104, 18) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +3 >Emitted(104, 18) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(104, 20) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +5 >Emitted(104, 32) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +6 >Emitted(104, 34) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> PlainText.Mode = Mode; 1->^^^^^^^^^^^^^^^^ @@ -1864,10 +1884,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } 4 > -1->Emitted(97, 17) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(97, 31) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(97, 38) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(97, 39) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(105, 17) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +2 >Emitted(105, 31) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +3 >Emitted(105, 38) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +4 >Emitted(105, 39) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) --- >>> })(PlainText = Languages.PlainText || (Languages.PlainText = {})); 1->^^^^^^^^^^^^ @@ -1913,15 +1933,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(98, 13) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(98, 14) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(98, 16) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(98, 25) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -5 >Emitted(98, 28) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -6 >Emitted(98, 47) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -7 >Emitted(98, 52) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -8 >Emitted(98, 71) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -9 >Emitted(98, 79) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) +1->Emitted(106, 13) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +2 >Emitted(106, 14) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +3 >Emitted(106, 16) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +4 >Emitted(106, 25) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) +5 >Emitted(106, 28) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +6 >Emitted(106, 47) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) +7 >Emitted(106, 52) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) +8 >Emitted(106, 71) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) +9 >Emitted(106, 79) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) --- >>> })(Languages = Thing.Languages || (Thing.Languages = {})); 1 >^^^^^^^^ @@ -1966,15 +1986,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(99, 9) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(99, 10) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(99, 12) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(99, 21) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(99, 24) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -6 >Emitted(99, 39) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -7 >Emitted(99, 44) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -8 >Emitted(99, 59) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -9 >Emitted(99, 67) Source(100, 2) + SourceIndex(0) name (Sample.Thing) +1 >Emitted(107, 9) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages) +2 >Emitted(107, 10) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) +3 >Emitted(107, 12) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +4 >Emitted(107, 21) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +5 >Emitted(107, 24) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +6 >Emitted(107, 39) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +7 >Emitted(107, 44) Source(76, 21) + SourceIndex(0) name (Sample.Thing) +8 >Emitted(107, 59) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +9 >Emitted(107, 67) Source(100, 2) + SourceIndex(0) name (Sample.Thing) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); 1 >^^^^ @@ -2019,15 +2039,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(100, 5) Source(100, 1) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(100, 6) Source(100, 2) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(100, 8) Source(76, 15) + SourceIndex(0) name (Sample) -4 >Emitted(100, 13) Source(76, 20) + SourceIndex(0) name (Sample) -5 >Emitted(100, 16) Source(76, 15) + SourceIndex(0) name (Sample) -6 >Emitted(100, 28) Source(76, 20) + SourceIndex(0) name (Sample) -7 >Emitted(100, 33) Source(76, 15) + SourceIndex(0) name (Sample) -8 >Emitted(100, 45) Source(76, 20) + SourceIndex(0) name (Sample) -9 >Emitted(100, 53) Source(100, 2) + SourceIndex(0) name (Sample) +1 >Emitted(108, 5) Source(100, 1) + SourceIndex(0) name (Sample.Thing) +2 >Emitted(108, 6) Source(100, 2) + SourceIndex(0) name (Sample.Thing) +3 >Emitted(108, 8) Source(76, 15) + SourceIndex(0) name (Sample) +4 >Emitted(108, 13) Source(76, 20) + SourceIndex(0) name (Sample) +5 >Emitted(108, 16) Source(76, 15) + SourceIndex(0) name (Sample) +6 >Emitted(108, 28) Source(76, 20) + SourceIndex(0) name (Sample) +7 >Emitted(108, 33) Source(76, 15) + SourceIndex(0) name (Sample) +8 >Emitted(108, 45) Source(76, 20) + SourceIndex(0) name (Sample) +9 >Emitted(108, 53) Source(100, 2) + SourceIndex(0) name (Sample) --- >>>})(Sample || (Sample = {})); 1 > @@ -2069,12 +2089,12 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(101, 1) Source(100, 1) + SourceIndex(0) name (Sample) -2 >Emitted(101, 2) Source(100, 2) + SourceIndex(0) name (Sample) -3 >Emitted(101, 4) Source(76, 8) + SourceIndex(0) -4 >Emitted(101, 10) Source(76, 14) + SourceIndex(0) -5 >Emitted(101, 15) Source(76, 8) + SourceIndex(0) -6 >Emitted(101, 21) Source(76, 14) + SourceIndex(0) -7 >Emitted(101, 29) Source(100, 2) + SourceIndex(0) +1 >Emitted(109, 1) Source(100, 1) + SourceIndex(0) name (Sample) +2 >Emitted(109, 2) Source(100, 2) + SourceIndex(0) name (Sample) +3 >Emitted(109, 4) Source(76, 8) + SourceIndex(0) +4 >Emitted(109, 10) Source(76, 14) + SourceIndex(0) +5 >Emitted(109, 15) Source(76, 8) + SourceIndex(0) +6 >Emitted(109, 21) Source(76, 14) + SourceIndex(0) +7 >Emitted(109, 29) Source(100, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=recursiveClassReferenceTest.js.map \ No newline at end of file diff --git a/tests/baselines/reference/recursiveFunctionTypes.js b/tests/baselines/reference/recursiveFunctionTypes.js index 040c323066d..6f10ef99080 100644 --- a/tests/baselines/reference/recursiveFunctionTypes.js +++ b/tests/baselines/reference/recursiveFunctionTypes.js @@ -45,27 +45,39 @@ f7(""); // ok (function takes an any param) f7(); // ok //// [recursiveFunctionTypes.js] -function fn() { return 1; } +function fn() { + return 1; +} var x = fn; // error var y = fn; // ok var f; var g; -function f1(d) { } -function f2() { } -function g2() { } -function f3() { return f3; } +function f1(d) { +} +function f2() { +} +function g2() { +} +function f3() { + return f3; +} var a = f3; // error var C = (function () { function C() { } - C.g = function (t) { }; + C.g = function (t) { + }; return C; })(); C.g(3); // error var f4; f4 = 3; // error -function f5() { return f5; } -function f6(a) { return f6; } +function f5() { + return f5; +} +function f6(a) { + return f6; +} f6("", 3); // error (arity mismatch) f6(""); // ok (function takes an any param) f6(); // ok diff --git a/tests/baselines/reference/recursiveFunctionTypes1.js b/tests/baselines/reference/recursiveFunctionTypes1.js index c4c255d5e44..2f2d072cb6b 100644 --- a/tests/baselines/reference/recursiveFunctionTypes1.js +++ b/tests/baselines/reference/recursiveFunctionTypes1.js @@ -7,6 +7,7 @@ class C { var C = (function () { function C() { } - C.g = function (t) { }; + C.g = function (t) { + }; return C; })(); diff --git a/tests/baselines/reference/recursiveGetterAccess.js b/tests/baselines/reference/recursiveGetterAccess.js index 1dea2e02d3a..cf042c2c1a0 100644 --- a/tests/baselines/reference/recursiveGetterAccess.js +++ b/tests/baselines/reference/recursiveGetterAccess.js @@ -10,7 +10,9 @@ var MyClass = (function () { function MyClass() { } Object.defineProperty(MyClass.prototype, "testProp", { - get: function () { return this.testProp; }, + get: function () { + return this.testProp; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js index 3c53c2b2a0a..e1ea203ac5b 100644 --- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js +++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js @@ -20,7 +20,9 @@ module M { //// [recursiveIdenticalOverloadResolution.js] var M; (function (M) { - function f(p) { return f; } + function f(p) { + return f; + } ; var i; f(i); diff --git a/tests/baselines/reference/recursiveInference1.js b/tests/baselines/reference/recursiveInference1.js index 3a26ead542d..839e13130f2 100644 --- a/tests/baselines/reference/recursiveInference1.js +++ b/tests/baselines/reference/recursiveInference1.js @@ -3,5 +3,7 @@ function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); } var result = fib(5); //// [recursiveInference1.js] -function fib(x) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); } +function fib(x) { + return x <= 1 ? x : fib(x - 1) + fib(x - 2); +} var result = fib(5); diff --git a/tests/baselines/reference/recursiveInferenceBug.js b/tests/baselines/reference/recursiveInferenceBug.js index 5b4d4f0c0a1..cffa96415dc 100644 --- a/tests/baselines/reference/recursiveInferenceBug.js +++ b/tests/baselines/reference/recursiveInferenceBug.js @@ -17,6 +17,9 @@ function f(x) { return x; } var zz = { - g: function () { }, - get f() { return "abc"; } + g: function () { + }, + get f() { + return "abc"; + } }; diff --git a/tests/baselines/reference/recursiveInheritance3.js b/tests/baselines/reference/recursiveInheritance3.js index bc9fb6cb4f9..710b691fa94 100644 --- a/tests/baselines/reference/recursiveInheritance3.js +++ b/tests/baselines/reference/recursiveInheritance3.js @@ -13,6 +13,8 @@ var C = (function () { function C() { this.x = 1; } - C.prototype.foo = function (x) { return x; }; + C.prototype.foo = function (x) { + return x; + }; return C; })(); diff --git a/tests/baselines/reference/recursiveInitializer.js b/tests/baselines/reference/recursiveInitializer.js index 82abf2b50af..2b33e873cb1 100644 --- a/tests/baselines/reference/recursiveInitializer.js +++ b/tests/baselines/reference/recursiveInitializer.js @@ -35,4 +35,6 @@ var b2 = !!b2; var b3 = !b3 || b3; // expected boolean here. actually 'any' var b4 = (!b4) && b4; // expected boolean here. actually 'any' // (x:string) => any -var f = function (x) { return f(x); }; +var f = function (x) { + return f(x); +}; diff --git a/tests/baselines/reference/recursiveObjectLiteral.js b/tests/baselines/reference/recursiveObjectLiteral.js index 70de48d2499..80c512a8280 100644 --- a/tests/baselines/reference/recursiveObjectLiteral.js +++ b/tests/baselines/reference/recursiveObjectLiteral.js @@ -2,4 +2,6 @@ var a = { f: a }; //// [recursiveObjectLiteral.js] -var a = { f: a }; +var a = { + f: a +}; diff --git a/tests/baselines/reference/recursiveProperties.js b/tests/baselines/reference/recursiveProperties.js index 84d9ebcd27c..63644484956 100644 --- a/tests/baselines/reference/recursiveProperties.js +++ b/tests/baselines/reference/recursiveProperties.js @@ -12,7 +12,9 @@ var A = (function () { function A() { } Object.defineProperty(A.prototype, "testProp", { - get: function () { return this.testProp; }, + get: function () { + return this.testProp; + }, enumerable: true, configurable: true }); @@ -22,7 +24,9 @@ var B = (function () { function B() { } Object.defineProperty(B.prototype, "testProp", { - set: function (value) { this.testProp = value; }, + set: function (value) { + this.testProp = value; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js index 18c9ed4dd7c..d01825f8cbf 100644 --- a/tests/baselines/reference/recursiveReturns.js +++ b/tests/baselines/reference/recursiveReturns.js @@ -20,7 +20,9 @@ function R1() { R1(); return; } -function R2() { R2(); } +function R2() { + R2(); +} function R3(n) { if (n == 0) { } diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js index 0cef9be47ab..b056e90e909 100644 --- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js +++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js @@ -59,9 +59,13 @@ function foo(x) { function foo2(x) { } function other() { - function foo3(x) { } - function foo4(x) { } - function foo5(x) { return null; } + function foo3(x) { + } + function foo4(x) { + } + function foo5(x) { + return null; + } var list; var myList; var r = foo5(list); diff --git a/tests/baselines/reference/redefineArray.js b/tests/baselines/reference/redefineArray.js index 080d2b1a2d2..93494232436 100644 --- a/tests/baselines/reference/redefineArray.js +++ b/tests/baselines/reference/redefineArray.js @@ -2,4 +2,6 @@ Array = function (n:number, s:string) {return n;}; //// [redefineArray.js] -Array = function (n, s) { return n; }; +Array = function (n, s) { + return n; +}; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 24f0e7f1bcb..608090e8722 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -1036,31 +1036,41 @@ var rionegrensis; caniventer.prototype.salomonseni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; caniventer.prototype.uchidai = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; caniventer.prototype.raffrayana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; caniventer.prototype.Uranium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; caniventer.prototype.nayaur = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return caniventer; @@ -1074,31 +1084,41 @@ var rionegrensis; veraecrucis.prototype.naso = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; veraecrucis.prototype.vancouverensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; veraecrucis.prototype.africana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; veraecrucis.prototype.palliolata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; veraecrucis.prototype.nivicola = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return veraecrucis; @@ -1119,31 +1139,41 @@ var julianae; nudicaudus.prototype.brandtii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nudicaudus.prototype.maxwellii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nudicaudus.prototype.endoi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nudicaudus.prototype.venezuelae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nudicaudus.prototype.zamicrus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return nudicaudus; @@ -1155,43 +1185,57 @@ var julianae; galapagoensis.prototype.isabellae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.rueppellii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.peregusna = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.gliroides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.banakrisi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.rozendaali = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; galapagoensis.prototype.stuhlmanni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return galapagoensis; @@ -1203,43 +1247,57 @@ var julianae; albidens.prototype.mattheyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.Astatine = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.vincenti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.hirta = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.virginianus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.macrophyllum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; albidens.prototype.porcellus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return albidens; @@ -1253,79 +1311,105 @@ var julianae; oralis.prototype.cepapi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.porteri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.bindi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.puda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.mindorensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.ignitus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.rufus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.monax = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.unalascensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.wuchihensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.leucippe = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.ordii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oralis.prototype.eisentrauti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return oralis; @@ -1339,43 +1423,57 @@ var julianae; sumatrana.prototype.wolffsohni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.geata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.awashensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.sturdeei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.pachyurus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.lyelli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sumatrana.prototype.neohibernicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return sumatrana; @@ -1387,67 +1485,89 @@ var julianae; gerbillus.prototype.pundti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.tristrami = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.swarthi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.horsfieldii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.diazi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.rennelli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.maulinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.muscina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.pelengensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.abramus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gerbillus.prototype.reevesi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return gerbillus; @@ -1459,73 +1579,97 @@ var julianae; acariensis.prototype.levicula = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.minous = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.cinereiventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.longicaudatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.baeodon = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.soricoides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.datae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.spixii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.anakuma = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.kihaulei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.gymnura = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; acariensis.prototype.olchonensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return acariensis; @@ -1539,19 +1683,25 @@ var julianae; durangae.prototype.Californium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; durangae.prototype.Flerovium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; durangae.prototype.phrudus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return durangae; @@ -1566,13 +1716,17 @@ var ruatanica; hector.prototype.humulis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; hector.prototype.eurycerus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return hector; @@ -1587,19 +1741,25 @@ var Lanthanum; suillus.prototype.spilosoma = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; suillus.prototype.tumbalensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; suillus.prototype.anatolicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return suillus; @@ -1613,61 +1773,81 @@ var Lanthanum; nitidus.prototype.granatensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.negligens = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.lewisi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.arge = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.dominicensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.taurus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.tonganus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.silvatica = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.midas = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; nitidus.prototype.bicornis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return nitidus; @@ -1681,49 +1861,65 @@ var Lanthanum; megalonyx.prototype.phillipsii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.melanogaster = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.elaphus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.elater = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.ourebi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.caraccioli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.parva = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megalonyx.prototype.albipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return megalonyx; @@ -1735,85 +1931,113 @@ var Lanthanum; jugularis.prototype.torrei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.revoili = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.macrobullatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.compactus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.talpinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.stramineus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.dartmouthi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.ogilbyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.incomtus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.surdaster = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.melanorhinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.picticaudata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.pomona = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; jugularis.prototype.ileile = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return jugularis; @@ -1830,85 +2054,113 @@ var rendalli; zuluensis.prototype.telfairi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.keyensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.occasius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.damarensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.Neptunium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.griseoflavus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.thar = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.alborufus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.fusicaudus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.gordonorum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.ruber = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.desmarestianus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.lutillus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; zuluensis.prototype.salocco = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return zuluensis; @@ -1920,61 +2172,81 @@ var rendalli; moojeni.prototype.floweri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.montosa = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.miletus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.heaneyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.marchei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.budini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.maggietaylorae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.poliocephalus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.zibethicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; moojeni.prototype.biacensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return moojeni; @@ -1988,19 +2260,25 @@ var rendalli; crenulata.prototype.salvanius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; crenulata.prototype.maritimus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; crenulata.prototype.edax = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return crenulata; @@ -2015,49 +2293,65 @@ var trivirgatus; tumidifrons.prototype.nivalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.vestitus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.aequatorius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.scherman = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.improvisum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.cervinipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.audax = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; tumidifrons.prototype.vallinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return tumidifrons; @@ -2071,43 +2365,57 @@ var trivirgatus; mixtus.prototype.ochrogaster = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.bryophilus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.liechtensteini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.crawfordi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.hypsibia = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.matacus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mixtus.prototype.demidoff = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return mixtus; @@ -2119,13 +2427,17 @@ var trivirgatus; lotor.prototype.balensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lotor.prototype.pullata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return lotor; @@ -2137,43 +2449,57 @@ var trivirgatus; falconeri.prototype.cabrali = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.gouldi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.fuscicollis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.martiensseni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.gaoligongensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.shawi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; falconeri.prototype.gmelini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return falconeri; @@ -2185,85 +2511,113 @@ var trivirgatus; oconnelli.prototype.youngsoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.terrestris = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.chrysopus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.fuscomurina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.hellwaldii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.aenea = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.perrini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.entellus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.krebsii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.cephalotes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.molossinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.luisi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.ceylonicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oconnelli.prototype.ralli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return oconnelli; @@ -2278,25 +2632,33 @@ var quasiater; bobrinskoi.prototype.crassicaudatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; bobrinskoi.prototype.mulatta = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; bobrinskoi.prototype.ansorgei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; bobrinskoi.prototype.Copper = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return bobrinskoi; @@ -2313,25 +2675,33 @@ var ruatanica; americanus.prototype.nasoloi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; americanus.prototype.mystacalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; americanus.prototype.fardoulisi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; americanus.prototype.tumidus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return americanus; @@ -2348,79 +2718,105 @@ var lavali; wilsoni.prototype.setiger = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.lorentzii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.antisensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.blossevillii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.bontanus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.caligata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.franqueti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.roberti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.degelidus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.amoenus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.kob = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.csorbai = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wilsoni.prototype.dorsata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return wilsoni; @@ -2440,79 +2836,105 @@ var lavali; otion.prototype.bonaerensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.dussumieri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.osvaldoreigi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.grevyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.hirtula = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.cristatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.darlingtoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.fontanierii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.umbrosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.chiriquinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.orarius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.ilaeus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; otion.prototype.musschenbroekii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return otion; @@ -2524,73 +2946,97 @@ var lavali; xanthognathus.prototype.nanulus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.albigena = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.onca = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.gunnii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.apeco = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.variegates = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.goudotii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.pohlei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.ineptus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.euryotis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.maurisca = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; xanthognathus.prototype.coyhaiquensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return xanthognathus; @@ -2604,49 +3050,65 @@ var lavali; thaeleri.prototype.coromandra = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.parvipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.sponsorius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.vates = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.roosmalenorum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.rubicola = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.ikonnikovi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thaeleri.prototype.paramicrus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return thaeleri; @@ -2660,13 +3122,17 @@ var lavali; lepturus.prototype.ferrumequinum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lepturus.prototype.aequalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return lepturus; @@ -2683,55 +3149,73 @@ var dogramacii; robustulus.prototype.fossor = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.humboldti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.mexicana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.martini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.beatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.leporina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.pearsonii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.keaysi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; robustulus.prototype.hindei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return robustulus; @@ -2743,7 +3227,9 @@ var dogramacii; koepckeae.prototype.culturatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return koepckeae; @@ -2755,79 +3241,105 @@ var dogramacii; kaiseri.prototype.bedfordiae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.paramorum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.rubidus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.juninensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.marginata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.Meitnerium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.pinetorum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.hoolock = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.poeyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.Thulium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.patrius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.quadraticauda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; kaiseri.prototype.ater = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return kaiseri; @@ -2839,49 +3351,65 @@ var dogramacii; aurata.prototype.grunniens = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.howensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.karlkoopmani = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.mirapitanga = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.ophiodon = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.landeri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.sonomae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; aurata.prototype.erythromos = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return aurata; @@ -2898,85 +3426,113 @@ var lutreolus; schlegeli.prototype.mittendorfi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.blicki = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.culionensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.scrofa = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.fernandoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.Tin = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.marmorata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.tavaratra = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.peregrina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.frontalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.cuniculus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.magdalenae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.andamanensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; schlegeli.prototype.dispar = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return schlegeli; @@ -2991,67 +3547,89 @@ var argurus; dauricus.prototype.chinensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.duodecimcostatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.foxi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.macleayii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.darienensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.hardwickii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.albifrons = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.jacobitus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.guentheri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.mahomet = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dauricus.prototype.misionensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return dauricus; @@ -3066,49 +3644,65 @@ var nigra; dolichurus.prototype.solomonis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.alfredi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.morrisi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.lekaguli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.dimissus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.phaeotis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.ustus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; dolichurus.prototype.sagei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return dolichurus; @@ -3125,37 +3719,49 @@ var panglima; amphibius.prototype.bottegi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amphibius.prototype.jerdoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amphibius.prototype.camtschatica = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amphibius.prototype.spadix = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amphibius.prototype.luismanueli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amphibius.prototype.aceramarcae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return amphibius; @@ -3169,19 +3775,25 @@ var panglima; fundatus.prototype.crassulus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fundatus.prototype.flamarioni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fundatus.prototype.mirabilis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return fundatus; @@ -3195,31 +3807,41 @@ var panglima; abidi.prototype.greyii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; abidi.prototype.macedonicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; abidi.prototype.galili = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; abidi.prototype.thierryi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; abidi.prototype.ega = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return abidi; @@ -3234,43 +3856,57 @@ var quasiater; carolinensis.prototype.concinna = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.aeneus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.aloysiisabaudiae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.tenellus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.andium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.persephone = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; carolinensis.prototype.patrizii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return carolinensis; @@ -3287,73 +3923,97 @@ var minutus; himalayana.prototype.simoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.lobata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.rusticus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.latona = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.famulus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.flaviceps = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.paradoxolophus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.Osmium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.vulgaris = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.betsileoensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.vespuccii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; himalayana.prototype.olympus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return himalayana; @@ -3370,49 +4030,65 @@ var caurinus; mahaganus.prototype.martiniquensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.devius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.masalai = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.kathleenae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.simulus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.nigrovittatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.senegalensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; mahaganus.prototype.acticola = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return mahaganus; @@ -3427,7 +4103,9 @@ var macrorhinos; marmosurus.prototype.tansaniana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return marmosurus; @@ -3444,7 +4122,9 @@ var howi; angulatus.prototype.pennatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return angulatus; @@ -3468,49 +4148,65 @@ var nigra; thalia.prototype.dichotomus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.arnuxii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.verheyeni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.dauuricus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.tristriatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.lasiura = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.gangetica = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; thalia.prototype.brucei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return thalia; @@ -3527,7 +4223,9 @@ var sagitta; walkeri.prototype.maracajuensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return walkeri; @@ -3544,7 +4242,9 @@ var minutus; inez.prototype.vexillaris = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return inez; @@ -3572,55 +4272,73 @@ var panamensis; linulus.prototype.goslingi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.taki = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.fumosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.rufinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.lami = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.regina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.nanilla = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.enganus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; linulus.prototype.gomantongensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return linulus; @@ -3635,79 +4353,105 @@ var nigra; gracilis.prototype.weddellii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.echinothrix = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.garridoi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.rouxii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.aurita = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.geoffrensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.theresa = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.melanocarpus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.dubiaquercus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.pectoralis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.apoensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.grisescens = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gracilis.prototype.ramirohitra = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return gracilis; @@ -3724,79 +4468,105 @@ var samarensis; pelurus.prototype.Palladium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.castanea = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.chamek = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.nigriceps = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.lunatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.madurae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.chinchilla = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.eliasi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.proditor = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.gambianus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.petteri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.nusatenggara = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pelurus.prototype.olitor = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return pelurus; @@ -3810,85 +4580,113 @@ var samarensis; fuscus.prototype.planifrons = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.badia = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.prymnolopha = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.natalensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.hunteri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.sapiens = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.macrocercus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.nimbae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.suricatta = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.jagorii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.beecrofti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.imaizumii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.colocolo = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; fuscus.prototype.wolfi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return fuscus; @@ -3900,25 +4698,33 @@ var samarensis; pallidus.prototype.oblativa = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pallidus.prototype.watersi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pallidus.prototype.glacialis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pallidus.prototype.viaria = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return pallidus; @@ -3930,31 +4736,41 @@ var samarensis; cahirinus.prototype.alashanicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cahirinus.prototype.flaviventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cahirinus.prototype.bottai = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cahirinus.prototype.pinetis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cahirinus.prototype.saussurei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return cahirinus; @@ -3971,31 +4787,41 @@ var sagitta; leptoceros.prototype.victus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; leptoceros.prototype.hoplomyoides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; leptoceros.prototype.gratiosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; leptoceros.prototype.rex = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; leptoceros.prototype.bolami = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return leptoceros; @@ -4012,7 +4838,9 @@ var daubentonii; nigricans.prototype.woosnami = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return nigricans; @@ -4038,19 +4866,25 @@ var argurus; pygmaea.prototype.pajeros = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pygmaea.prototype.capucinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; pygmaea.prototype.cuvieri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return pygmaea; @@ -4067,43 +4901,57 @@ var chrysaeolus; sarasinorum.prototype.belzebul = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.hinpoon = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.kandti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.cynosuros = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.Germanium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.Ununoctium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sarasinorum.prototype.princeps = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return sarasinorum; @@ -4118,43 +4966,57 @@ var argurus; wetmorei.prototype.leucoptera = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.ochraventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.tephromelas = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.cracens = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.jamaicensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.gymnocaudus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wetmorei.prototype.mayori = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return wetmorei; @@ -4171,49 +5033,65 @@ var argurus; oreas.prototype.salamonis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.paniscus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.fagani = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.papuanus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.timidus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.nghetinhensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.barbei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; oreas.prototype.univittatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return oreas; @@ -4228,73 +5106,97 @@ var daubentonii; arboreus.prototype.capreolus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.moreni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.hypoleucos = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.paedulcus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.pucheranii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.stella = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.brasiliensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.brevicaudata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.vitticollis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.huangensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.cameroni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; arboreus.prototype.tianshanica = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return arboreus; @@ -4309,79 +5211,105 @@ var patas; uralensis.prototype.cartilagonodus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.pyrrhinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.insulans = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.nigricauda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.muricauda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.albicaudus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.fallax = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.attenuata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.megalura = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.neblina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.citellus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.tanezumi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; uralensis.prototype.albiventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return uralensis; @@ -4398,13 +5326,17 @@ var provocax; melanoleuca.prototype.Neodymium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanoleuca.prototype.baeri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return melanoleuca; @@ -4419,13 +5351,17 @@ var sagitta; sicarius.prototype.Chlorine = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sicarius.prototype.simulator = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return sicarius; @@ -4442,85 +5378,113 @@ var howi; marcanoi.prototype.formosae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.dudui = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.leander = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.martinsi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.beatrix = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.griseoventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.zerda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.yucatanicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.nigrita = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.jouvenetae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.indefessus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.vuquangensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.Zirconium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; marcanoi.prototype.hyaena = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return marcanoi; @@ -4535,73 +5499,97 @@ var argurus; gilbertii.prototype.nasutus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.poecilops = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.sondaicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.auriventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.cherriei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.lindberghi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.pipistrellus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.paranus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.dubosti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.opossum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.oreopolus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; gilbertii.prototype.amurensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return gilbertii; @@ -4625,79 +5613,105 @@ var lutreolus; punicus.prototype.strandi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.lar = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.erica = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.trichura = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.lemniscatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.aspalax = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.marshalli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.Zinc = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.monochromos = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.purinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.ischyrus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.tenuis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; punicus.prototype.Helium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return punicus; @@ -4712,37 +5726,49 @@ var macrorhinos; daphaenodon.prototype.bredanensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; daphaenodon.prototype.othus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; daphaenodon.prototype.hammondi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; daphaenodon.prototype.aureocollaris = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; daphaenodon.prototype.flavipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; daphaenodon.prototype.callosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return daphaenodon; @@ -4757,73 +5783,97 @@ var sagitta; cinereus.prototype.zunigae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.microps = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.guaporensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.tonkeana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.montensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.sphinx = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.glis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.dorsalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.fimbriatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.sara = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.epimelas = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cinereus.prototype.pittieri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return cinereus; @@ -4855,61 +5905,81 @@ var gabriellae; amicus.prototype.pirrensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.phaeura = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.voratus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.satarae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.hooperi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.perrensi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.ridei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.audeberti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.Lutetium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; amicus.prototype.atrox = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return amicus; @@ -4921,7 +5991,9 @@ var gabriellae; echinatus.prototype.tenuipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return echinatus; @@ -4936,37 +6008,49 @@ var imperfecta; lasiurus.prototype.marisae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lasiurus.prototype.fulvus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lasiurus.prototype.paranaensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lasiurus.prototype.didactylus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lasiurus.prototype.schreibersii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; lasiurus.prototype.orii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return lasiurus; @@ -4978,67 +6062,89 @@ var imperfecta; subspinosus.prototype.monticularis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.Gadolinium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.oasicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.paterculus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.punctata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.invictus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.stangeri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.siskiyou = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.welwitschii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.Polonium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; subspinosus.prototype.harpia = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return subspinosus; @@ -5052,19 +6158,25 @@ var imperfecta; ciliolabrum.prototype.leschenaultii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; ciliolabrum.prototype.ludia = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; ciliolabrum.prototype.sinicus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return ciliolabrum; @@ -5079,25 +6191,33 @@ var quasiater; wattsi.prototype.lagotis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wattsi.prototype.hussoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wattsi.prototype.bilarni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; wattsi.prototype.cabrerae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return wattsi; @@ -5114,55 +6234,73 @@ var petrophilus; sodyi.prototype.saundersiae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.imberbis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.cansdalei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.Lawrencium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.catta = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.breviceps = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.transitionalis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.heptneri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; sodyi.prototype.bairdii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return sodyi; @@ -5179,49 +6317,65 @@ var caurinus; megaphyllus.prototype.montana = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.amatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.bucculentus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.lepida = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.graecus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.forsteri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.perotensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; megaphyllus.prototype.cirrhosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return megaphyllus; @@ -5236,19 +6390,25 @@ var minutus; portoricensis.prototype.relictus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; portoricensis.prototype.aequatorianus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; portoricensis.prototype.rhinogradoides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return portoricensis; @@ -5263,79 +6423,105 @@ var lutreolus; foina.prototype.tarfayensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.Promethium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.salinae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.kerri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.scotti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.camerunensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.affinis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.siebersi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.maquassiensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.layardi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.bishopi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.apodemoides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; foina.prototype.argentiventer = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return foina; @@ -5352,61 +6538,81 @@ var lutreolus; cor.prototype.antinorii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.voi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.mussoi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.truncatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.achates = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.praedatrix = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.mzabi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.xanthinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.tapoatafa = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; cor.prototype.castroviejoi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return cor; @@ -5421,13 +6627,17 @@ var howi; coludo.prototype.bernhardi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; coludo.prototype.isseli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return coludo; @@ -5444,13 +6654,17 @@ var argurus; germaini.prototype.sharpei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; germaini.prototype.palmarum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return germaini; @@ -5465,67 +6679,89 @@ var sagitta; stolzmanni.prototype.riparius = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.dhofarensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.tricolor = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.gardneri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.walleri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.talpoides = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.pallipes = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.lagurus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.hipposideros = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.griselda = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; stolzmanni.prototype.florium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return stolzmanni; @@ -5542,79 +6778,105 @@ var dammermani; melanops.prototype.blarina = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.harwoodi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.ashaninka = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.wiedii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.godmani = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.condorensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.xerophila = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.laminatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.archeri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.hidalgo = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.unicolor = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.philippii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; melanops.prototype.bocagei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return melanops; @@ -5631,49 +6893,65 @@ var argurus; peninsulae.prototype.aitkeni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.novaeangliae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.olallae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.anselli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.timminsi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.sordidus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.telfordi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; peninsulae.prototype.cavernarum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return peninsulae; @@ -5688,79 +6966,105 @@ var argurus; netscheri.prototype.gravis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.ruschii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.tricuspidatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.fernandezi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.colletti = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.microbullatus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.eburneae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.tatei = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.millardi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.pruinosus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.delator = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.nyikae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; netscheri.prototype.ruemmleri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return netscheri; @@ -5777,79 +7081,105 @@ var ruatanica; Praseodymium.prototype.clara = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.spectabilis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.kamensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.ruddi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.bartelsii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.yerbabuenae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.davidi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.pilirostris = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.catherinae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.frontata = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.Terbium = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.thomensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; Praseodymium.prototype.soricinus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return Praseodymium; @@ -5866,7 +7196,9 @@ var caurinus; johorensis.prototype.maini = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return johorensis; @@ -5881,7 +7213,9 @@ var argurus; luctuosa.prototype.loriae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return luctuosa; @@ -5896,49 +7230,65 @@ var panamensis; setulosus.prototype.duthieae = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.guereza = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.buselaphus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.nuttalli = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.pelii = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.tunneyi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.lamula = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; setulosus.prototype.vampyrus = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return setulosus; @@ -5953,31 +7303,41 @@ var petrophilus; rosalia.prototype.palmeri = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; rosalia.prototype.baeops = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; rosalia.prototype.ozensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; rosalia.prototype.creaghi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; rosalia.prototype.montivaga = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return rosalia; @@ -5994,37 +7354,49 @@ var caurinus; psilurus.prototype.socialis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; psilurus.prototype.lundi = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; psilurus.prototype.araeum = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; psilurus.prototype.calamianensis = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; psilurus.prototype.petersoni = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; psilurus.prototype.nitela = function () { var _this = this; var x; - (function () { var y = _this; }); + (function () { + var y = _this; + }); return x; }; return psilurus; diff --git a/tests/baselines/reference/restArgAssignmentCompat.js b/tests/baselines/reference/restArgAssignmentCompat.js index 3f8749f332d..a640560c051 100644 --- a/tests/baselines/reference/restArgAssignmentCompat.js +++ b/tests/baselines/reference/restArgAssignmentCompat.js @@ -15,9 +15,14 @@ function f() { for (var _i = 0; _i < arguments.length; _i++) { x[_i - 0] = arguments[_i]; } - x.forEach(function (n, i) { return void ('item ' + i + ' = ' + n); }); + x.forEach(function (n, i) { + return void ('item ' + i + ' = ' + n); + }); +} +function g(x, y) { } -function g(x, y) { } var n = g; n = f; -n([4], 'foo'); +n([ + 4 +], 'foo'); diff --git a/tests/baselines/reference/restElementMustBeLast.js b/tests/baselines/reference/restElementMustBeLast.js index 337cb6de6f6..2e11ce91de8 100644 --- a/tests/baselines/reference/restElementMustBeLast.js +++ b/tests/baselines/reference/restElementMustBeLast.js @@ -4,6 +4,14 @@ var [...a, x] = [1, 2, 3]; // Error, rest must be last element //// [restElementMustBeLast.js] -var _a = [1, 2, 3], x = _a[1]; // Error, rest must be last element -_b = [1, 2, 3], x = _b[1]; // Error, rest must be last element +var _a = [ + 1, + 2, + 3 +], x = _a[1]; // Error, rest must be last element +_b = [ + 1, + 2, + 3 +], x = _b[1]; // Error, rest must be last element var _b; diff --git a/tests/baselines/reference/restParameterNotLast.js b/tests/baselines/reference/restParameterNotLast.js index 4ca416a47ec..791d83849a1 100644 --- a/tests/baselines/reference/restParameterNotLast.js +++ b/tests/baselines/reference/restParameterNotLast.js @@ -2,4 +2,5 @@ function f(...x, y) { } //// [restParameterNotLast.js] -function f(x, y) { } +function f(x, y) { +} diff --git a/tests/baselines/reference/returnInConstructor1.js b/tests/baselines/reference/returnInConstructor1.js index 0096c4d65b6..30ce79bc369 100644 --- a/tests/baselines/reference/returnInConstructor1.js +++ b/tests/baselines/reference/returnInConstructor1.js @@ -77,39 +77,47 @@ var A = (function () { function A() { return; } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); var B = (function () { function B() { return 1; // error } - B.prototype.foo = function () { }; + B.prototype.foo = function () { + }; return B; })(); var C = (function () { function C() { return this; } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); var D = (function () { function D() { return "test"; // error } - D.prototype.foo = function () { }; + D.prototype.foo = function () { + }; return D; })(); var E = (function () { function E() { - return { foo: 1 }; + return { + foo: 1 + }; } return E; })(); var F = (function () { function F() { - return { foo: 1 }; //error + return { + foo: 1 + }; //error } return F; })(); @@ -117,8 +125,10 @@ var G = (function () { function G() { this.test = 2; } - G.prototype.test1 = function () { }; - G.prototype.foo = function () { }; + G.prototype.test1 = function () { + }; + G.prototype.foo = function () { + }; return G; })(); var H = (function (_super) { diff --git a/tests/baselines/reference/returnStatements.js b/tests/baselines/reference/returnStatements.js index 77b6ae1f774..b968998e4d6 100644 --- a/tests/baselines/reference/returnStatements.js +++ b/tests/baselines/reference/returnStatements.js @@ -32,18 +32,35 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; // all the following should be valid -function fn1() { return 1; } -function fn2() { return ''; } -function fn3() { return undefined; } -function fn4() { return; } -function fn5() { return true; } -function fn6() { return new Date(12); } -function fn7() { return null; } -function fn8() { return; } // OK, eq. to 'return undefined' +function fn1() { + return 1; +} +function fn2() { + return ''; +} +function fn3() { + return undefined; +} +function fn4() { + return; +} +function fn5() { + return true; +} +function fn6() { + return new Date(12); +} +function fn7() { + return null; +} +function fn8() { + return; +} // OK, eq. to 'return undefined' var C = (function () { function C() { } - C.prototype.dispose = function () { }; + C.prototype.dispose = function () { + }; return C; })(); var D = (function (_super) { @@ -53,7 +70,17 @@ var D = (function (_super) { } return D; })(C); -function fn10() { return { id: 12 }; } -function fn11() { return new C(); } -function fn12() { return new D(); } -function fn13() { return null; } +function fn10() { + return { + id: 12 + }; +} +function fn11() { + return new C(); +} +function fn12() { + return new D(); +} +function fn13() { + return null; +} diff --git a/tests/baselines/reference/returnTypeParameter.js b/tests/baselines/reference/returnTypeParameter.js index d5f46cba776..58667207055 100644 --- a/tests/baselines/reference/returnTypeParameter.js +++ b/tests/baselines/reference/returnTypeParameter.js @@ -3,5 +3,8 @@ function f(a: T): T { } // error, no return statement function f2(a: T): T { return T; } // bug was that this satisfied the return statement requirement //// [returnTypeParameter.js] -function f(a) { } // error, no return statement -function f2(a) { return T; } // bug was that this satisfied the return statement requirement +function f(a) { +} // error, no return statement +function f2(a) { + return T; +} // bug was that this satisfied the return statement requirement diff --git a/tests/baselines/reference/returnTypeParameterWithModules.js b/tests/baselines/reference/returnTypeParameterWithModules.js index 4790fe1341b..2dc8da604f9 100644 --- a/tests/baselines/reference/returnTypeParameterWithModules.js +++ b/tests/baselines/reference/returnTypeParameterWithModules.js @@ -18,7 +18,12 @@ module M2 { var M1; (function (M1) { function reduce(ar, f, e) { - return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]); + return Array.prototype.reduce.apply(ar, e ? [ + f, + e + ] : [ + f + ]); } M1.reduce = reduce; ; @@ -33,7 +38,9 @@ var M2; M2.compose = compose; ; function compose2(g, f) { - return function (x) { return g(f(x)); }; + return function (x) { + return g(f(x)); + }; } M2.compose2 = compose2; ; diff --git a/tests/baselines/reference/returnTypeTypeArguments.js b/tests/baselines/reference/returnTypeTypeArguments.js index b374cb1c581..5be549d2f34 100644 --- a/tests/baselines/reference/returnTypeTypeArguments.js +++ b/tests/baselines/reference/returnTypeTypeArguments.js @@ -92,31 +92,65 @@ var Three = (function () { } return Three; })(); -function A1() { return null; } -function A2() { return null; } -function A3() { return null; } -function B1() { return null; } -function B2() { return null; } -function B3() { return null; } +function A1() { + return null; +} +function A2() { + return null; +} +function A3() { + return null; +} +function B1() { + return null; +} +function B2() { + return null; +} +function B3() { + return null; +} var C = (function () { function C() { } - C.prototype.A1 = function () { return null; }; - C.prototype.A2 = function () { return null; }; - C.prototype.A3 = function () { return null; }; - C.prototype.B1 = function () { return null; }; - C.prototype.B2 = function () { return null; }; - C.prototype.B3 = function () { return null; }; + C.prototype.A1 = function () { + return null; + }; + C.prototype.A2 = function () { + return null; + }; + C.prototype.A3 = function () { + return null; + }; + C.prototype.B1 = function () { + return null; + }; + C.prototype.B2 = function () { + return null; + }; + C.prototype.B3 = function () { + return null; + }; return C; })(); var D = (function () { function D() { } - D.prototype.A2 = function () { return null; }; - D.prototype.A3 = function () { return null; }; - D.prototype.B1 = function () { return null; }; - D.prototype.B2 = function () { return null; }; - D.prototype.B3 = function () { return null; }; + D.prototype.A2 = function () { + return null; + }; + D.prototype.A3 = function () { + return null; + }; + D.prototype.B1 = function () { + return null; + }; + D.prototype.B2 = function () { + return null; + }; + D.prototype.B3 = function () { + return null; + }; return D; })(); var Y = (function () { diff --git a/tests/baselines/reference/reverseInferenceInContextualInstantiation.js b/tests/baselines/reference/reverseInferenceInContextualInstantiation.js index f9c3242e1ea..7108029ac54 100644 --- a/tests/baselines/reference/reverseInferenceInContextualInstantiation.js +++ b/tests/baselines/reference/reverseInferenceInContextualInstantiation.js @@ -5,6 +5,8 @@ x.sort(compare); // Error, but shouldn't be //// [reverseInferenceInContextualInstantiation.js] -function compare(a, b) { return 0; } +function compare(a, b) { + return 0; +} var x; x.sort(compare); // Error, but shouldn't be diff --git a/tests/baselines/reference/scannertest1.js b/tests/baselines/reference/scannertest1.js index b96c965a79e..dc003e95a8f 100644 --- a/tests/baselines/reference/scannertest1.js +++ b/tests/baselines/reference/scannertest1.js @@ -33,17 +33,11 @@ var CharacterInfo = (function () { return c >= CharacterCodes._0 && c <= CharacterCodes._9; }; CharacterInfo.isHexDigit = function (c) { - return isDecimalDigit(c) || - (c >= CharacterCodes.A && c <= CharacterCodes.F) || - (c >= CharacterCodes.a && c <= CharacterCodes.f); + return isDecimalDigit(c) || (c >= CharacterCodes.A && c <= CharacterCodes.F) || (c >= CharacterCodes.a && c <= CharacterCodes.f); }; CharacterInfo.hexValue = function (c) { Debug.assert(isHexDigit(c)); - return isDecimalDigit(c) - ? (c - CharacterCodes._0) - : (c >= CharacterCodes.A && c <= CharacterCodes.F) - ? c - CharacterCodes.A + 10 - : c - CharacterCodes.a + 10; + return isDecimalDigit(c) ? (c - CharacterCodes._0) : (c >= CharacterCodes.A && c <= CharacterCodes.F) ? c - CharacterCodes.A + 10 : c - CharacterCodes.a + 10; }; return CharacterInfo; })(); diff --git a/tests/baselines/reference/scopingInCatchBlocks.js b/tests/baselines/reference/scopingInCatchBlocks.js index 3121f4e9c79..2d3ca7098b5 100644 --- a/tests/baselines/reference/scopingInCatchBlocks.js +++ b/tests/baselines/reference/scopingInCatchBlocks.js @@ -11,12 +11,17 @@ var x = ex1; // should error //// [scopingInCatchBlocks.js] -try { } +try { +} catch (ex1) { throw ex1; } -try { } -catch (ex1) { } // should not error -try { } -catch (ex1) { } // should not error +try { +} +catch (ex1) { +} // should not error +try { +} +catch (ex1) { +} // should not error var x = ex1; // should error diff --git a/tests/baselines/reference/selfInCallback.js b/tests/baselines/reference/selfInCallback.js index 25228b03187..85f16390f96 100644 --- a/tests/baselines/reference/selfInCallback.js +++ b/tests/baselines/reference/selfInCallback.js @@ -12,10 +12,14 @@ var C = (function () { function C() { this.p1 = 0; } - C.prototype.callback = function (cb) { cb(); }; + C.prototype.callback = function (cb) { + cb(); + }; C.prototype.doit = function () { var _this = this; - this.callback(function () { _this.p1 + 1; }); + this.callback(function () { + _this.p1 + 1; + }); }; return C; })(); diff --git a/tests/baselines/reference/selfInLambdas.js b/tests/baselines/reference/selfInLambdas.js index 6b09cf2e227..67006603c8e 100644 --- a/tests/baselines/reference/selfInLambdas.js +++ b/tests/baselines/reference/selfInLambdas.js @@ -53,7 +53,9 @@ var o = { var _this = this; window.onmousemove = function () { _this.counter++; - var f = function () { return _this.counter; }; + var f = function () { + return _this.counter; + }; }; } }; diff --git a/tests/baselines/reference/separate1-2.js b/tests/baselines/reference/separate1-2.js index 6ef155ca0f4..bda277467e8 100644 --- a/tests/baselines/reference/separate1-2.js +++ b/tests/baselines/reference/separate1-2.js @@ -6,6 +6,7 @@ module X { //// [separate1-2.js] var X; (function (X) { - function f() { } + function f() { + } X.f = f; })(X || (X = {})); diff --git a/tests/baselines/reference/shadowPrivateMembers.js b/tests/baselines/reference/shadowPrivateMembers.js index 098a7914a71..3d7e3db7ef1 100644 --- a/tests/baselines/reference/shadowPrivateMembers.js +++ b/tests/baselines/reference/shadowPrivateMembers.js @@ -13,7 +13,8 @@ var __extends = this.__extends || function (d, b) { var base = (function () { function base() { } - base.prototype.n = function () { }; + base.prototype.n = function () { + }; return base; })(); var derived = (function (_super) { @@ -21,6 +22,7 @@ var derived = (function (_super) { function derived() { _super.apply(this, arguments); } - derived.prototype.n = function () { }; + derived.prototype.n = function () { + }; return derived; })(base); diff --git a/tests/baselines/reference/shadowedInternalModule.js b/tests/baselines/reference/shadowedInternalModule.js index 3a7c6d4d61a..90bbd023584 100644 --- a/tests/baselines/reference/shadowedInternalModule.js +++ b/tests/baselines/reference/shadowedInternalModule.js @@ -37,11 +37,17 @@ module Z { // all errors imported modules conflict with local variables var A; (function (A) { - A.Point = { x: 0, y: 0 }; + A.Point = { + x: 0, + y: 0 + }; })(A || (A = {})); var B; (function (B) { - var A = { x: 0, y: 0 }; + var A = { + x: 0, + y: 0 + }; })(B || (B = {})); var X; (function (X) { diff --git a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.js b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.js index fbf01bc167a..2cbc58ac19a 100644 --- a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.js +++ b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.js @@ -3,4 +3,10 @@ //// [simpleArrowFunctionParameterReferencedInObjectLiteral1.js] -[].map(function () { return [].map(function (p) { return ({ X: p }); }); }); +[].map(function () { + return [].map(function (p) { + return ({ + X: p + }); + }); +}); diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js index e9755f6c048..6143ff95fb8 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js +++ b/tests/baselines/reference/sourceMap-FileWithComments.js @@ -48,7 +48,9 @@ var Shapes; this.y = y; } // Instance member - Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; + Point.prototype.getDist = function () { + return Math.sqrt(this.x * this.x + this.y * this.y); + }; // Static member Point.origin = new Point(0, 0); return Point; diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map index fc27b8542d0..3da9be212f5 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js.map +++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-FileWithComments.js.map] -{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist","Shapes.foo"],"mappings":"AAOA,AADA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAGXA,AADAA,QAAQA;;QAEJC,cAAcA;QACdA,eAAmBA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA,cAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,QASjBA,CAAAA;IAGDA,AADAA,+BAA+BA;QAC3BA,CAACA,GAAGA,EAAEA,CAACA;IAEXA;IACAI,CAACA;IADeJ,UAAGA,MAClBA,CAAAA;IAKDA,AAHAA;;MAEEA;QACEA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAGD,AADA,qBAAqB;IACjB,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist","Shapes.foo"],"mappings":"AAOA,AADA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAGXA,AADAA,QAAQA;;QAEJC,cAAcA;QACdA,eAAmBA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA;YAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA;QAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,QASjBA,CAAAA;IAGDA,AADAA,+BAA+BA;QAC3BA,CAACA,GAAGA,EAAEA,CAACA;IAEXA;IACAI,CAACA;IADeJ,UAAGA,MAClBA,CAAAA;IAKDA,AAHAA;;MAEEA;QACEA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAGD,AADA,qBAAqB;IACjB,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index 8283006042a..be00cb7f263 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -176,7 +176,7 @@ sourceFile:sourceMap-FileWithComments.ts >>> // Instance member 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^-> 1-> > > @@ -184,106 +184,112 @@ sourceFile:sourceMap-FileWithComments.ts 1->Emitted(11, 9) Source(15, 9) + SourceIndex(0) name (Shapes.Point) 2 >Emitted(11, 27) Source(15, 27) + SourceIndex(0) name (Shapes.Point) --- ->>> Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; +>>> Point.prototype.getDist = function () { 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^ -6 > ^ -7 > ^^^^ -8 > ^ -9 > ^^^^ -10> ^ -11> ^^^^ -12> ^ -13> ^ -14> ^^^ -15> ^^^^ -16> ^ -17> ^ -18> ^^^ -19> ^^^^ -20> ^ -21> ^ -22> ^^^ -23> ^^^^ -24> ^ -25> ^ -26> ^ -27> ^ -28> ^ -29> ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 > getDist 3 > -4 > getDist() { -5 > return -6 > -7 > Math -8 > . -9 > sqrt -10> ( -11> this -12> . -13> x -14> * -15> this -16> . -17> x -18> + -19> this -20> . -21> y -22> * -23> this -24> . -25> y -26> ) -27> ; -28> -29> } 1->Emitted(12, 9) Source(16, 9) + SourceIndex(0) name (Shapes.Point) 2 >Emitted(12, 32) Source(16, 16) + SourceIndex(0) name (Shapes.Point) 3 >Emitted(12, 35) Source(16, 9) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(12, 49) Source(16, 21) + SourceIndex(0) name (Shapes.Point.getDist) -5 >Emitted(12, 55) Source(16, 27) + SourceIndex(0) name (Shapes.Point.getDist) -6 >Emitted(12, 56) Source(16, 28) + SourceIndex(0) name (Shapes.Point.getDist) -7 >Emitted(12, 60) Source(16, 32) + SourceIndex(0) name (Shapes.Point.getDist) -8 >Emitted(12, 61) Source(16, 33) + SourceIndex(0) name (Shapes.Point.getDist) -9 >Emitted(12, 65) Source(16, 37) + SourceIndex(0) name (Shapes.Point.getDist) -10>Emitted(12, 66) Source(16, 38) + SourceIndex(0) name (Shapes.Point.getDist) -11>Emitted(12, 70) Source(16, 42) + SourceIndex(0) name (Shapes.Point.getDist) -12>Emitted(12, 71) Source(16, 43) + SourceIndex(0) name (Shapes.Point.getDist) -13>Emitted(12, 72) Source(16, 44) + SourceIndex(0) name (Shapes.Point.getDist) -14>Emitted(12, 75) Source(16, 47) + SourceIndex(0) name (Shapes.Point.getDist) -15>Emitted(12, 79) Source(16, 51) + SourceIndex(0) name (Shapes.Point.getDist) -16>Emitted(12, 80) Source(16, 52) + SourceIndex(0) name (Shapes.Point.getDist) -17>Emitted(12, 81) Source(16, 53) + SourceIndex(0) name (Shapes.Point.getDist) -18>Emitted(12, 84) Source(16, 56) + SourceIndex(0) name (Shapes.Point.getDist) -19>Emitted(12, 88) Source(16, 60) + SourceIndex(0) name (Shapes.Point.getDist) -20>Emitted(12, 89) Source(16, 61) + SourceIndex(0) name (Shapes.Point.getDist) -21>Emitted(12, 90) Source(16, 62) + SourceIndex(0) name (Shapes.Point.getDist) -22>Emitted(12, 93) Source(16, 65) + SourceIndex(0) name (Shapes.Point.getDist) -23>Emitted(12, 97) Source(16, 69) + SourceIndex(0) name (Shapes.Point.getDist) -24>Emitted(12, 98) Source(16, 70) + SourceIndex(0) name (Shapes.Point.getDist) -25>Emitted(12, 99) Source(16, 71) + SourceIndex(0) name (Shapes.Point.getDist) -26>Emitted(12, 100) Source(16, 72) + SourceIndex(0) name (Shapes.Point.getDist) -27>Emitted(12, 101) Source(16, 73) + SourceIndex(0) name (Shapes.Point.getDist) -28>Emitted(12, 102) Source(16, 74) + SourceIndex(0) name (Shapes.Point.getDist) -29>Emitted(12, 103) Source(16, 75) + SourceIndex(0) name (Shapes.Point.getDist) +--- +>>> return Math.sqrt(this.x * this.x + this.y * this.y); +1->^^^^^^^^^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +6 > ^^^^ +7 > ^ +8 > ^^^^ +9 > ^ +10> ^ +11> ^^^ +12> ^^^^ +13> ^ +14> ^ +15> ^^^ +16> ^^^^ +17> ^ +18> ^ +19> ^^^ +20> ^^^^ +21> ^ +22> ^ +23> ^ +24> ^ +1->getDist() { +2 > return +3 > +4 > Math +5 > . +6 > sqrt +7 > ( +8 > this +9 > . +10> x +11> * +12> this +13> . +14> x +15> + +16> this +17> . +18> y +19> * +20> this +21> . +22> y +23> ) +24> ; +1->Emitted(13, 13) Source(16, 21) + SourceIndex(0) name (Shapes.Point.getDist) +2 >Emitted(13, 19) Source(16, 27) + SourceIndex(0) name (Shapes.Point.getDist) +3 >Emitted(13, 20) Source(16, 28) + SourceIndex(0) name (Shapes.Point.getDist) +4 >Emitted(13, 24) Source(16, 32) + SourceIndex(0) name (Shapes.Point.getDist) +5 >Emitted(13, 25) Source(16, 33) + SourceIndex(0) name (Shapes.Point.getDist) +6 >Emitted(13, 29) Source(16, 37) + SourceIndex(0) name (Shapes.Point.getDist) +7 >Emitted(13, 30) Source(16, 38) + SourceIndex(0) name (Shapes.Point.getDist) +8 >Emitted(13, 34) Source(16, 42) + SourceIndex(0) name (Shapes.Point.getDist) +9 >Emitted(13, 35) Source(16, 43) + SourceIndex(0) name (Shapes.Point.getDist) +10>Emitted(13, 36) Source(16, 44) + SourceIndex(0) name (Shapes.Point.getDist) +11>Emitted(13, 39) Source(16, 47) + SourceIndex(0) name (Shapes.Point.getDist) +12>Emitted(13, 43) Source(16, 51) + SourceIndex(0) name (Shapes.Point.getDist) +13>Emitted(13, 44) Source(16, 52) + SourceIndex(0) name (Shapes.Point.getDist) +14>Emitted(13, 45) Source(16, 53) + SourceIndex(0) name (Shapes.Point.getDist) +15>Emitted(13, 48) Source(16, 56) + SourceIndex(0) name (Shapes.Point.getDist) +16>Emitted(13, 52) Source(16, 60) + SourceIndex(0) name (Shapes.Point.getDist) +17>Emitted(13, 53) Source(16, 61) + SourceIndex(0) name (Shapes.Point.getDist) +18>Emitted(13, 54) Source(16, 62) + SourceIndex(0) name (Shapes.Point.getDist) +19>Emitted(13, 57) Source(16, 65) + SourceIndex(0) name (Shapes.Point.getDist) +20>Emitted(13, 61) Source(16, 69) + SourceIndex(0) name (Shapes.Point.getDist) +21>Emitted(13, 62) Source(16, 70) + SourceIndex(0) name (Shapes.Point.getDist) +22>Emitted(13, 63) Source(16, 71) + SourceIndex(0) name (Shapes.Point.getDist) +23>Emitted(13, 64) Source(16, 72) + SourceIndex(0) name (Shapes.Point.getDist) +24>Emitted(13, 65) Source(16, 73) + SourceIndex(0) name (Shapes.Point.getDist) +--- +>>> }; +1 >^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^^^-> +1 > +2 > } +1 >Emitted(14, 9) Source(16, 74) + SourceIndex(0) name (Shapes.Point.getDist) +2 >Emitted(14, 10) Source(16, 75) + SourceIndex(0) name (Shapes.Point.getDist) --- >>> // Static member -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^-> -1 > +1-> > > 2 > // Static member -1 >Emitted(13, 9) Source(18, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(13, 25) Source(18, 25) + SourceIndex(0) name (Shapes.Point) +1->Emitted(15, 9) Source(18, 9) + SourceIndex(0) name (Shapes.Point) +2 >Emitted(15, 25) Source(18, 25) + SourceIndex(0) name (Shapes.Point) --- >>> Point.origin = new Point(0, 0); 1->^^^^^^^^ @@ -309,17 +315,17 @@ sourceFile:sourceMap-FileWithComments.ts 9 > 0 10> ) 11> ; -1->Emitted(14, 9) Source(19, 16) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(14, 21) Source(19, 22) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(14, 24) Source(19, 25) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(14, 28) Source(19, 29) + SourceIndex(0) name (Shapes.Point) -5 >Emitted(14, 33) Source(19, 34) + SourceIndex(0) name (Shapes.Point) -6 >Emitted(14, 34) Source(19, 35) + SourceIndex(0) name (Shapes.Point) -7 >Emitted(14, 35) Source(19, 36) + SourceIndex(0) name (Shapes.Point) -8 >Emitted(14, 37) Source(19, 38) + SourceIndex(0) name (Shapes.Point) -9 >Emitted(14, 38) Source(19, 39) + SourceIndex(0) name (Shapes.Point) -10>Emitted(14, 39) Source(19, 40) + SourceIndex(0) name (Shapes.Point) -11>Emitted(14, 40) Source(19, 41) + SourceIndex(0) name (Shapes.Point) +1->Emitted(16, 9) Source(19, 16) + SourceIndex(0) name (Shapes.Point) +2 >Emitted(16, 21) Source(19, 22) + SourceIndex(0) name (Shapes.Point) +3 >Emitted(16, 24) Source(19, 25) + SourceIndex(0) name (Shapes.Point) +4 >Emitted(16, 28) Source(19, 29) + SourceIndex(0) name (Shapes.Point) +5 >Emitted(16, 33) Source(19, 34) + SourceIndex(0) name (Shapes.Point) +6 >Emitted(16, 34) Source(19, 35) + SourceIndex(0) name (Shapes.Point) +7 >Emitted(16, 35) Source(19, 36) + SourceIndex(0) name (Shapes.Point) +8 >Emitted(16, 37) Source(19, 38) + SourceIndex(0) name (Shapes.Point) +9 >Emitted(16, 38) Source(19, 39) + SourceIndex(0) name (Shapes.Point) +10>Emitted(16, 39) Source(19, 40) + SourceIndex(0) name (Shapes.Point) +11>Emitted(16, 40) Source(19, 41) + SourceIndex(0) name (Shapes.Point) --- >>> return Point; 1 >^^^^^^^^ @@ -327,8 +333,8 @@ sourceFile:sourceMap-FileWithComments.ts 1 > > 2 > } -1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0) name (Shapes.Point) +1 >Emitted(17, 9) Source(20, 5) + SourceIndex(0) name (Shapes.Point) +2 >Emitted(17, 21) Source(20, 6) + SourceIndex(0) name (Shapes.Point) --- >>> })(); 1 >^^^^ @@ -349,10 +355,10 @@ sourceFile:sourceMap-FileWithComments.ts > // Static member > static origin = new Point(0, 0); > } -1 >Emitted(16, 5) Source(20, 5) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(16, 6) Source(20, 6) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(16, 6) Source(11, 5) + SourceIndex(0) name (Shapes) -4 >Emitted(16, 10) Source(20, 6) + SourceIndex(0) name (Shapes) +1 >Emitted(18, 5) Source(20, 5) + SourceIndex(0) name (Shapes.Point) +2 >Emitted(18, 6) Source(20, 6) + SourceIndex(0) name (Shapes.Point) +3 >Emitted(18, 6) Source(11, 5) + SourceIndex(0) name (Shapes) +4 >Emitted(18, 10) Source(20, 6) + SourceIndex(0) name (Shapes) --- >>> Shapes.Point = Point; 1->^^^^ @@ -373,10 +379,10 @@ sourceFile:sourceMap-FileWithComments.ts > static origin = new Point(0, 0); > } 4 > -1->Emitted(17, 5) Source(11, 18) + SourceIndex(0) name (Shapes) -2 >Emitted(17, 17) Source(11, 23) + SourceIndex(0) name (Shapes) -3 >Emitted(17, 25) Source(20, 6) + SourceIndex(0) name (Shapes) -4 >Emitted(17, 26) Source(20, 6) + SourceIndex(0) name (Shapes) +1->Emitted(19, 5) Source(11, 18) + SourceIndex(0) name (Shapes) +2 >Emitted(19, 17) Source(11, 23) + SourceIndex(0) name (Shapes) +3 >Emitted(19, 25) Source(20, 6) + SourceIndex(0) name (Shapes) +4 >Emitted(19, 26) Source(20, 6) + SourceIndex(0) name (Shapes) --- >>> // Variable comment after class 1->^^^^ @@ -388,9 +394,9 @@ sourceFile:sourceMap-FileWithComments.ts > 2 > 3 > // Variable comment after class -1->Emitted(18, 5) Source(23, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(18, 5) Source(22, 5) + SourceIndex(0) name (Shapes) -3 >Emitted(18, 36) Source(22, 36) + SourceIndex(0) name (Shapes) +1->Emitted(20, 5) Source(23, 5) + SourceIndex(0) name (Shapes) +2 >Emitted(20, 5) Source(22, 5) + SourceIndex(0) name (Shapes) +3 >Emitted(20, 36) Source(22, 36) + SourceIndex(0) name (Shapes) --- >>> var a = 10; 1 >^^^^^^^^ @@ -405,11 +411,11 @@ sourceFile:sourceMap-FileWithComments.ts 3 > = 4 > 10 5 > ; -1 >Emitted(19, 9) Source(23, 9) + SourceIndex(0) name (Shapes) -2 >Emitted(19, 10) Source(23, 10) + SourceIndex(0) name (Shapes) -3 >Emitted(19, 13) Source(23, 13) + SourceIndex(0) name (Shapes) -4 >Emitted(19, 15) Source(23, 15) + SourceIndex(0) name (Shapes) -5 >Emitted(19, 16) Source(23, 16) + SourceIndex(0) name (Shapes) +1 >Emitted(21, 9) Source(23, 9) + SourceIndex(0) name (Shapes) +2 >Emitted(21, 10) Source(23, 10) + SourceIndex(0) name (Shapes) +3 >Emitted(21, 13) Source(23, 13) + SourceIndex(0) name (Shapes) +4 >Emitted(21, 15) Source(23, 15) + SourceIndex(0) name (Shapes) +5 >Emitted(21, 16) Source(23, 16) + SourceIndex(0) name (Shapes) --- >>> function foo() { 1->^^^^ @@ -417,7 +423,7 @@ sourceFile:sourceMap-FileWithComments.ts 1-> > > -1->Emitted(20, 5) Source(25, 5) + SourceIndex(0) name (Shapes) +1->Emitted(22, 5) Source(25, 5) + SourceIndex(0) name (Shapes) --- >>> } 1->^^^^ @@ -426,8 +432,8 @@ sourceFile:sourceMap-FileWithComments.ts 1->export function foo() { > 2 > } -1->Emitted(21, 5) Source(26, 5) + SourceIndex(0) name (Shapes.foo) -2 >Emitted(21, 6) Source(26, 6) + SourceIndex(0) name (Shapes.foo) +1->Emitted(23, 5) Source(26, 5) + SourceIndex(0) name (Shapes.foo) +2 >Emitted(23, 6) Source(26, 6) + SourceIndex(0) name (Shapes.foo) --- >>> Shapes.foo = foo; 1->^^^^ @@ -440,10 +446,10 @@ sourceFile:sourceMap-FileWithComments.ts 3 > () { > } 4 > -1->Emitted(22, 5) Source(25, 21) + SourceIndex(0) name (Shapes) -2 >Emitted(22, 15) Source(25, 24) + SourceIndex(0) name (Shapes) -3 >Emitted(22, 21) Source(26, 6) + SourceIndex(0) name (Shapes) -4 >Emitted(22, 22) Source(26, 6) + SourceIndex(0) name (Shapes) +1->Emitted(24, 5) Source(25, 21) + SourceIndex(0) name (Shapes) +2 >Emitted(24, 15) Source(25, 24) + SourceIndex(0) name (Shapes) +3 >Emitted(24, 21) Source(26, 6) + SourceIndex(0) name (Shapes) +4 >Emitted(24, 22) Source(26, 6) + SourceIndex(0) name (Shapes) --- >>> /** comment after function 1->^^^^ @@ -456,8 +462,8 @@ sourceFile:sourceMap-FileWithComments.ts > */ > 2 > -1->Emitted(23, 5) Source(31, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(23, 5) Source(28, 5) + SourceIndex(0) name (Shapes) +1->Emitted(25, 5) Source(31, 5) + SourceIndex(0) name (Shapes) +2 >Emitted(25, 5) Source(28, 5) + SourceIndex(0) name (Shapes) --- >>> * this is another comment >>> */ @@ -466,7 +472,7 @@ sourceFile:sourceMap-FileWithComments.ts 1->/** comment after function > * this is another comment > */ -1->Emitted(25, 7) Source(30, 7) + SourceIndex(0) name (Shapes) +1->Emitted(27, 7) Source(30, 7) + SourceIndex(0) name (Shapes) --- >>> var b = 10; 1->^^^^^^^^ @@ -481,11 +487,11 @@ sourceFile:sourceMap-FileWithComments.ts 3 > = 4 > 10 5 > ; -1->Emitted(26, 9) Source(31, 9) + SourceIndex(0) name (Shapes) -2 >Emitted(26, 10) Source(31, 10) + SourceIndex(0) name (Shapes) -3 >Emitted(26, 13) Source(31, 13) + SourceIndex(0) name (Shapes) -4 >Emitted(26, 15) Source(31, 15) + SourceIndex(0) name (Shapes) -5 >Emitted(26, 16) Source(31, 16) + SourceIndex(0) name (Shapes) +1->Emitted(28, 9) Source(31, 9) + SourceIndex(0) name (Shapes) +2 >Emitted(28, 10) Source(31, 10) + SourceIndex(0) name (Shapes) +3 >Emitted(28, 13) Source(31, 13) + SourceIndex(0) name (Shapes) +4 >Emitted(28, 15) Source(31, 15) + SourceIndex(0) name (Shapes) +5 >Emitted(28, 16) Source(31, 16) + SourceIndex(0) name (Shapes) --- >>>})(Shapes || (Shapes = {})); 1-> @@ -527,13 +533,13 @@ sourceFile:sourceMap-FileWithComments.ts > */ > var b = 10; > } -1->Emitted(27, 1) Source(32, 1) + SourceIndex(0) name (Shapes) -2 >Emitted(27, 2) Source(32, 2) + SourceIndex(0) name (Shapes) -3 >Emitted(27, 4) Source(8, 8) + SourceIndex(0) -4 >Emitted(27, 10) Source(8, 14) + SourceIndex(0) -5 >Emitted(27, 15) Source(8, 8) + SourceIndex(0) -6 >Emitted(27, 21) Source(8, 14) + SourceIndex(0) -7 >Emitted(27, 29) Source(32, 2) + SourceIndex(0) +1->Emitted(29, 1) Source(32, 1) + SourceIndex(0) name (Shapes) +2 >Emitted(29, 2) Source(32, 2) + SourceIndex(0) name (Shapes) +3 >Emitted(29, 4) Source(8, 8) + SourceIndex(0) +4 >Emitted(29, 10) Source(8, 14) + SourceIndex(0) +5 >Emitted(29, 15) Source(8, 8) + SourceIndex(0) +6 >Emitted(29, 21) Source(8, 14) + SourceIndex(0) +7 >Emitted(29, 29) Source(32, 2) + SourceIndex(0) --- >>>/** Local Variable */ 1 > @@ -546,9 +552,9 @@ sourceFile:sourceMap-FileWithComments.ts > 2 > 3 >/** Local Variable */ -1 >Emitted(28, 1) Source(35, 1) + SourceIndex(0) -2 >Emitted(28, 1) Source(34, 1) + SourceIndex(0) -3 >Emitted(28, 22) Source(34, 22) + SourceIndex(0) +1 >Emitted(30, 1) Source(35, 1) + SourceIndex(0) +2 >Emitted(30, 1) Source(34, 1) + SourceIndex(0) +3 >Emitted(30, 22) Source(34, 22) + SourceIndex(0) --- >>>var p = new Shapes.Point(3, 4); 1->^^^^ @@ -578,19 +584,19 @@ sourceFile:sourceMap-FileWithComments.ts 11> 4 12> ) 13> ; -1->Emitted(29, 5) Source(35, 5) + SourceIndex(0) -2 >Emitted(29, 6) Source(35, 6) + SourceIndex(0) -3 >Emitted(29, 9) Source(35, 17) + SourceIndex(0) -4 >Emitted(29, 13) Source(35, 21) + SourceIndex(0) -5 >Emitted(29, 19) Source(35, 27) + SourceIndex(0) -6 >Emitted(29, 20) Source(35, 28) + SourceIndex(0) -7 >Emitted(29, 25) Source(35, 33) + SourceIndex(0) -8 >Emitted(29, 26) Source(35, 34) + SourceIndex(0) -9 >Emitted(29, 27) Source(35, 35) + SourceIndex(0) -10>Emitted(29, 29) Source(35, 37) + SourceIndex(0) -11>Emitted(29, 30) Source(35, 38) + SourceIndex(0) -12>Emitted(29, 31) Source(35, 39) + SourceIndex(0) -13>Emitted(29, 32) Source(35, 40) + SourceIndex(0) +1->Emitted(31, 5) Source(35, 5) + SourceIndex(0) +2 >Emitted(31, 6) Source(35, 6) + SourceIndex(0) +3 >Emitted(31, 9) Source(35, 17) + SourceIndex(0) +4 >Emitted(31, 13) Source(35, 21) + SourceIndex(0) +5 >Emitted(31, 19) Source(35, 27) + SourceIndex(0) +6 >Emitted(31, 20) Source(35, 28) + SourceIndex(0) +7 >Emitted(31, 25) Source(35, 33) + SourceIndex(0) +8 >Emitted(31, 26) Source(35, 34) + SourceIndex(0) +9 >Emitted(31, 27) Source(35, 35) + SourceIndex(0) +10>Emitted(31, 29) Source(35, 37) + SourceIndex(0) +11>Emitted(31, 30) Source(35, 38) + SourceIndex(0) +12>Emitted(31, 31) Source(35, 39) + SourceIndex(0) +13>Emitted(31, 32) Source(35, 40) + SourceIndex(0) --- >>>var dist = p.getDist(); 1 > @@ -613,14 +619,14 @@ sourceFile:sourceMap-FileWithComments.ts 7 > getDist 8 > () 9 > ; -1 >Emitted(30, 1) Source(36, 1) + SourceIndex(0) -2 >Emitted(30, 5) Source(36, 5) + SourceIndex(0) -3 >Emitted(30, 9) Source(36, 9) + SourceIndex(0) -4 >Emitted(30, 12) Source(36, 12) + SourceIndex(0) -5 >Emitted(30, 13) Source(36, 13) + SourceIndex(0) -6 >Emitted(30, 14) Source(36, 14) + SourceIndex(0) -7 >Emitted(30, 21) Source(36, 21) + SourceIndex(0) -8 >Emitted(30, 23) Source(36, 23) + SourceIndex(0) -9 >Emitted(30, 24) Source(36, 24) + SourceIndex(0) +1 >Emitted(32, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(32, 5) Source(36, 5) + SourceIndex(0) +3 >Emitted(32, 9) Source(36, 9) + SourceIndex(0) +4 >Emitted(32, 12) Source(36, 12) + SourceIndex(0) +5 >Emitted(32, 13) Source(36, 13) + SourceIndex(0) +6 >Emitted(32, 14) Source(36, 14) + SourceIndex(0) +7 >Emitted(32, 21) Source(36, 21) + SourceIndex(0) +8 >Emitted(32, 23) Source(36, 23) + SourceIndex(0) +9 >Emitted(32, 24) Source(36, 24) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-FileWithComments.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js index 486cdd39637..33efe0fabec 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js @@ -9,7 +9,9 @@ var Greeter = (function () { function Greeter() { var _this = this; this.a = 10; - this.returnA = function () { return _this.a; }; + this.returnA = function () { + return _this.a; + }; } return Greeter; })(); diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map index b0325217c7a..d085c2f9cc1 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QAAAC,iBAGCA;QAFUA,MAACA,GAAGA,EAAEA,CAACA;QACPA,YAAOA,GAAGA,cAAMA,OAAAA,KAAIA,CAACA,CAACA,EAANA,CAAMA,CAACA;IAClCA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QAAAC,iBAGCA;QAFUA,MAACA,GAAGA,EAAEA,CAACA;QACPA,YAAOA,GAAGA;mBAAMA,KAAIA,CAACA,CAACA;QAANA,CAAMA,CAACA;IAClCA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt index 555f1c096c2..ff4d526ffcd 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 3 > ^^^ 4 > ^^ 5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +6 > ^^^^^^^^^^^^^^^^^-> 1 > 2 > a 3 > = @@ -49,41 +49,43 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 4 >Emitted(4, 20) Source(2, 18) + SourceIndex(0) name (Greeter.constructor) 5 >Emitted(4, 21) Source(2, 19) + SourceIndex(0) name (Greeter.constructor) --- ->>> this.returnA = function () { return _this.a; }; +>>> this.returnA = function () { 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^^ -6 > ^^^^^ -7 > ^ -8 > ^ -9 > ^^ -10> ^ -11> ^ +4 > ^^^^^-> 1-> > public 2 > returnA 3 > = -4 > () => -5 > -6 > this -7 > . -8 > a -9 > -10> this.a -11> ; 1->Emitted(5, 9) Source(3, 12) + SourceIndex(0) name (Greeter.constructor) 2 >Emitted(5, 21) Source(3, 19) + SourceIndex(0) name (Greeter.constructor) 3 >Emitted(5, 24) Source(3, 22) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(5, 38) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(5, 45) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -6 >Emitted(5, 50) Source(3, 32) + SourceIndex(0) name (Greeter.constructor) -7 >Emitted(5, 51) Source(3, 33) + SourceIndex(0) name (Greeter.constructor) -8 >Emitted(5, 52) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) -9 >Emitted(5, 54) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -10>Emitted(5, 55) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) -11>Emitted(5, 56) Source(3, 35) + SourceIndex(0) name (Greeter.constructor) +--- +>>> return _this.a; +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^ +3 > ^ +4 > ^ +1->() => +2 > this +3 > . +4 > a +1->Emitted(6, 20) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(6, 25) Source(3, 32) + SourceIndex(0) name (Greeter.constructor) +3 >Emitted(6, 26) Source(3, 33) + SourceIndex(0) name (Greeter.constructor) +4 >Emitted(6, 27) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) +--- +>>> }; +1 >^^^^^^^^ +2 > ^ +3 > ^ +1 > +2 > this.a +3 > ; +1 >Emitted(7, 9) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(7, 10) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) +3 >Emitted(7, 11) Source(3, 35) + SourceIndex(0) name (Greeter.constructor) --- >>> } 1 >^^^^ @@ -92,16 +94,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 1 > > 2 > } -1 >Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (Greeter.constructor) --- >>> return Greeter; 1->^^^^ 2 > ^^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(7, 19) Source(4, 2) + SourceIndex(0) name (Greeter) +1->Emitted(9, 5) Source(4, 1) + SourceIndex(0) name (Greeter) +2 >Emitted(9, 19) Source(4, 2) + SourceIndex(0) name (Greeter) --- >>>})(); 1 > @@ -116,9 +118,9 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen > public a = 10; > public returnA = () => this.a; > } -1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0) name (Greeter) -3 >Emitted(8, 2) Source(1, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(10, 1) Source(4, 1) + SourceIndex(0) name (Greeter) +2 >Emitted(10, 2) Source(4, 2) + SourceIndex(0) name (Greeter) +3 >Emitted(10, 2) Source(1, 1) + SourceIndex(0) +4 >Emitted(10, 6) Source(4, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionExpressions.js b/tests/baselines/reference/sourceMapValidationFunctionExpressions.js index f215c5071e4..5aa2c9902ea 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionExpressions.js +++ b/tests/baselines/reference/sourceMapValidationFunctionExpressions.js @@ -14,5 +14,7 @@ var greet = function (greeting) { return greetings; }; greet("Hello"); -var incrGreetings = function () { return greetings++; }; +var incrGreetings = function () { + return greetings++; +}; //# sourceMappingURL=sourceMapValidationFunctionExpressions.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionExpressions.js.map b/tests/baselines/reference/sourceMapValidationFunctionExpressions.js.map index 0ab0bdac146..a55cd03c9ed 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionExpressions.js.map +++ b/tests/baselines/reference/sourceMapValidationFunctionExpressions.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationFunctionExpressions.js.map] -{"version":3,"file":"sourceMapValidationFunctionExpressions.js","sourceRoot":"","sources":["sourceMapValidationFunctionExpressions.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,IAAI,KAAK,GAAG,UAAC,QAAgB;IACzB,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC,CAAA;AACD,KAAK,CAAC,OAAO,CAAC,CAAC;AACf,IAAI,aAAa,GAAG,cAAM,OAAA,SAAS,EAAE,EAAX,CAAW,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctionExpressions.js","sourceRoot":"","sources":["sourceMapValidationFunctionExpressions.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,IAAI,KAAK,GAAG,UAAC,QAAgB;IACzB,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC,CAAA;AACD,KAAK,CAAC,OAAO,CAAC,CAAC;AACf,IAAI,aAAa,GAAG;WAAM,SAAS,EAAE;AAAX,CAAW,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionExpressions.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctionExpressions.sourcemap.txt index 722afe1f9d9..d745903dafa 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionExpressions.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationFunctionExpressions.sourcemap.txt @@ -104,7 +104,7 @@ sourceFile:sourceMapValidationFunctionExpressions.ts 4 > ^^^^^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >greet @@ -119,41 +119,43 @@ sourceFile:sourceMapValidationFunctionExpressions.ts 5 >Emitted(6, 15) Source(6, 15) + SourceIndex(0) 6 >Emitted(6, 16) Source(6, 16) + SourceIndex(0) --- ->>>var incrGreetings = function () { return greetings++; }; +>>>var incrGreetings = function () { 1-> 2 >^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^^ -8 > ^^ -9 > ^^ -10> ^ -11> ^ -12> ^^^^^^^^^-> +5 > ^^^^-> 1-> > 2 >var 3 > incrGreetings 4 > = -5 > () => -6 > -7 > greetings -8 > ++ -9 > -10> greetings++ -11> ; 1->Emitted(7, 1) Source(7, 1) + SourceIndex(0) 2 >Emitted(7, 5) Source(7, 5) + SourceIndex(0) 3 >Emitted(7, 18) Source(7, 18) + SourceIndex(0) 4 >Emitted(7, 21) Source(7, 21) + SourceIndex(0) -5 >Emitted(7, 35) Source(7, 27) + SourceIndex(0) -6 >Emitted(7, 42) Source(7, 27) + SourceIndex(0) -7 >Emitted(7, 51) Source(7, 36) + SourceIndex(0) -8 >Emitted(7, 53) Source(7, 38) + SourceIndex(0) -9 >Emitted(7, 55) Source(7, 27) + SourceIndex(0) -10>Emitted(7, 56) Source(7, 38) + SourceIndex(0) -11>Emitted(7, 57) Source(7, 39) + SourceIndex(0) +--- +>>> return greetings++; +1->^^^^^^^^^^^ +2 > ^^^^^^^^^ +3 > ^^ +1->() => +2 > greetings +3 > ++ +1->Emitted(8, 12) Source(7, 27) + SourceIndex(0) +2 >Emitted(8, 21) Source(7, 36) + SourceIndex(0) +3 >Emitted(8, 23) Source(7, 38) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >greetings++ +3 > ; +1 >Emitted(9, 1) Source(7, 27) + SourceIndex(0) +2 >Emitted(9, 2) Source(7, 38) + SourceIndex(0) +3 >Emitted(9, 3) Source(7, 39) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationFunctionExpressions.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js index 289d29d02bd..be4c5bbf083 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js +++ b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js @@ -2,5 +2,8 @@ var x = { n() { } }; //// [sourceMapValidationFunctionPropertyAssignment.js] -var x = { n: function () { } }; +var x = { + n: function () { + } +}; //# sourceMappingURL=sourceMapValidationFunctionPropertyAssignment.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map index 81066a66bad..9ff69d21921 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map +++ b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationFunctionPropertyAssignment.js.map] -{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":["n"],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,gBAAKA,CAACA,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":["n"],"mappings":"AAAA,IAAI,CAAC,GAAG;IAAE,CAAC;IAAKA,CAACA;CAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt index 52a8bfe688c..3595fcebf3c 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt @@ -8,37 +8,45 @@ sources: sourceMapValidationFunctionPropertyAssignment.ts emittedFile:tests/cases/compiler/sourceMapValidationFunctionPropertyAssignment.js sourceFile:sourceMapValidationFunctionPropertyAssignment.ts ------------------------------------------------------------------- ->>>var x = { n: function () { } }; +>>>var x = { 1 > 2 >^^^^ 3 > ^ 4 > ^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^ -8 > ^ -9 > ^^ -10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^^^^-> 1 > 2 >var 3 > x 4 > = -5 > { -6 > n -7 > () { -8 > } -9 > } -10> ; 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0) 4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0) -5 >Emitted(1, 11) Source(1, 11) + SourceIndex(0) -6 >Emitted(1, 12) Source(1, 12) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 17) + SourceIndex(0) name (n) -8 >Emitted(1, 29) Source(1, 18) + SourceIndex(0) name (n) -9 >Emitted(1, 31) Source(1, 20) + SourceIndex(0) -10>Emitted(1, 32) Source(1, 21) + SourceIndex(0) +--- +>>> n: function () { +1->^^^^ +2 > ^ +3 > ^-> +1->{ +2 > n +1->Emitted(2, 5) Source(1, 11) + SourceIndex(0) +2 >Emitted(2, 6) Source(1, 12) + SourceIndex(0) +--- +>>> } +1->^^^^ +2 > ^ +1->() { +2 > } +1->Emitted(3, 5) Source(1, 17) + SourceIndex(0) name (n) +2 >Emitted(3, 6) Source(1, 18) + SourceIndex(0) name (n) +--- +>>>}; +1 >^ +2 > ^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > } +2 > ; +1 >Emitted(4, 2) Source(1, 20) + SourceIndex(0) +2 >Emitted(4, 3) Source(1, 21) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationFunctionPropertyAssignment.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationStatements.js b/tests/baselines/reference/sourceMapValidationStatements.js index 8a4b565e9b0..85a4dc33889 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.js +++ b/tests/baselines/reference/sourceMapValidationStatements.js @@ -136,19 +136,22 @@ function f() { z = 10; } switch (obj.z) { - case 0: { - x++; - break; - } - case 1: { - x--; - break; - } - default: { - x *= 2; - x = 50; - break; - } + case 0: + { + x++; + break; + } + case 1: + { + x--; + break; + } + default: + { + x *= 2; + x = 50; + break; + } } while (x < 10) { x++; diff --git a/tests/baselines/reference/sourceMapValidationStatements.js.map b/tests/baselines/reference/sourceMapValidationStatements.js.map index a1ea3b1db79..63731751060 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.js.map +++ b/tests/baselines/reference/sourceMapValidationStatements.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationStatements.js.map] -{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA;IACIA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA;IACIA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA;YAAEA,CAACA;gBACLA,CAACA,EAAEA,CAACA;gBACJA,KAAKA,CAACA;YAEVA,CAACA;QACDA,KAAKA,CAACA;YAAEA,CAACA;gBACLA,CAACA,EAAEA,CAACA;gBACJA,KAAKA,CAACA;YAEVA,CAACA;QACDA;YAASA,CAACA;gBACNA,CAACA,IAAIA,CAACA,CAACA;gBACPA,CAACA,GAAGA,EAAEA,CAACA;gBACPA,KAAKA,CAACA;YAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt index 2a2daed01db..789d98afe5a 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt @@ -930,191 +930,200 @@ sourceFile:sourceMapValidationStatements.ts 9 >Emitted(52, 20) Source(47, 20) + SourceIndex(0) name (f) 10>Emitted(52, 21) Source(47, 21) + SourceIndex(0) name (f) --- ->>> case 0: { +>>> case 0: 1 >^^^^^^^^ 2 > ^^^^^ 3 > ^ -4 > ^^ -5 > ^ 1 > > 2 > case 3 > 0 -4 > : -5 > { 1 >Emitted(53, 9) Source(48, 9) + SourceIndex(0) name (f) 2 >Emitted(53, 14) Source(48, 14) + SourceIndex(0) name (f) 3 >Emitted(53, 15) Source(48, 15) + SourceIndex(0) name (f) -4 >Emitted(53, 17) Source(48, 17) + SourceIndex(0) name (f) -5 >Emitted(53, 18) Source(48, 18) + SourceIndex(0) name (f) --- ->>> x++; +>>> { 1 >^^^^^^^^^^^^ 2 > ^ -3 > ^^ -4 > ^ -5 > ^^^-> -1 > - > -2 > x -3 > ++ -4 > ; -1 >Emitted(54, 13) Source(49, 13) + SourceIndex(0) name (f) -2 >Emitted(54, 14) Source(49, 14) + SourceIndex(0) name (f) -3 >Emitted(54, 16) Source(49, 16) + SourceIndex(0) name (f) -4 >Emitted(54, 17) Source(49, 17) + SourceIndex(0) name (f) +3 > ^^^^^^^^-> +1 >: +2 > { +1 >Emitted(54, 13) Source(48, 17) + SourceIndex(0) name (f) +2 >Emitted(54, 14) Source(48, 18) + SourceIndex(0) name (f) --- ->>> break; -1->^^^^^^^^^^^^ -2 > ^^^^^ -3 > ^ +>>> x++; +1->^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^ +4 > ^ +5 > ^^^-> 1-> > -2 > break -3 > ; -1->Emitted(55, 13) Source(50, 13) + SourceIndex(0) name (f) -2 >Emitted(55, 18) Source(50, 18) + SourceIndex(0) name (f) -3 >Emitted(55, 19) Source(50, 19) + SourceIndex(0) name (f) +2 > x +3 > ++ +4 > ; +1->Emitted(55, 17) Source(49, 13) + SourceIndex(0) name (f) +2 >Emitted(55, 18) Source(49, 14) + SourceIndex(0) name (f) +3 >Emitted(55, 20) Source(49, 16) + SourceIndex(0) name (f) +4 >Emitted(55, 21) Source(49, 17) + SourceIndex(0) name (f) --- ->>> } -1 >^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> +>>> break; +1->^^^^^^^^^^^^^^^^ +2 > ^^^^^ +3 > ^ +1-> + > +2 > break +3 > ; +1->Emitted(56, 17) Source(50, 13) + SourceIndex(0) name (f) +2 >Emitted(56, 22) Source(50, 18) + SourceIndex(0) name (f) +3 >Emitted(56, 23) Source(50, 19) + SourceIndex(0) name (f) +--- +>>> } +1 >^^^^^^^^^^^^ +2 > ^ +3 > ^^^-> 1 > > > -2 > } -1 >Emitted(56, 9) Source(52, 9) + SourceIndex(0) name (f) -2 >Emitted(56, 10) Source(52, 10) + SourceIndex(0) name (f) +2 > } +1 >Emitted(57, 13) Source(52, 9) + SourceIndex(0) name (f) +2 >Emitted(57, 14) Source(52, 10) + SourceIndex(0) name (f) --- ->>> case 1: { +>>> case 1: 1->^^^^^^^^ 2 > ^^^^^ 3 > ^ -4 > ^^ -5 > ^ 1-> > 2 > case 3 > 1 -4 > : -5 > { -1->Emitted(57, 9) Source(53, 9) + SourceIndex(0) name (f) -2 >Emitted(57, 14) Source(53, 14) + SourceIndex(0) name (f) -3 >Emitted(57, 15) Source(53, 15) + SourceIndex(0) name (f) -4 >Emitted(57, 17) Source(53, 17) + SourceIndex(0) name (f) -5 >Emitted(57, 18) Source(53, 18) + SourceIndex(0) name (f) +1->Emitted(58, 9) Source(53, 9) + SourceIndex(0) name (f) +2 >Emitted(58, 14) Source(53, 14) + SourceIndex(0) name (f) +3 >Emitted(58, 15) Source(53, 15) + SourceIndex(0) name (f) --- ->>> x--; +>>> { 1 >^^^^^^^^^^^^ 2 > ^ -3 > ^^ -4 > ^ -5 > ^^^-> -1 > - > -2 > x -3 > -- -4 > ; -1 >Emitted(58, 13) Source(54, 13) + SourceIndex(0) name (f) -2 >Emitted(58, 14) Source(54, 14) + SourceIndex(0) name (f) -3 >Emitted(58, 16) Source(54, 16) + SourceIndex(0) name (f) -4 >Emitted(58, 17) Source(54, 17) + SourceIndex(0) name (f) +3 > ^^^^^^^^-> +1 >: +2 > { +1 >Emitted(59, 13) Source(53, 17) + SourceIndex(0) name (f) +2 >Emitted(59, 14) Source(53, 18) + SourceIndex(0) name (f) --- ->>> break; -1->^^^^^^^^^^^^ -2 > ^^^^^ -3 > ^ +>>> x--; +1->^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^ +4 > ^ +5 > ^^^-> 1-> > -2 > break -3 > ; -1->Emitted(59, 13) Source(55, 13) + SourceIndex(0) name (f) -2 >Emitted(59, 18) Source(55, 18) + SourceIndex(0) name (f) -3 >Emitted(59, 19) Source(55, 19) + SourceIndex(0) name (f) +2 > x +3 > -- +4 > ; +1->Emitted(60, 17) Source(54, 13) + SourceIndex(0) name (f) +2 >Emitted(60, 18) Source(54, 14) + SourceIndex(0) name (f) +3 >Emitted(60, 20) Source(54, 16) + SourceIndex(0) name (f) +4 >Emitted(60, 21) Source(54, 17) + SourceIndex(0) name (f) --- ->>> } -1 >^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^-> +>>> break; +1->^^^^^^^^^^^^^^^^ +2 > ^^^^^ +3 > ^ +1-> + > +2 > break +3 > ; +1->Emitted(61, 17) Source(55, 13) + SourceIndex(0) name (f) +2 >Emitted(61, 22) Source(55, 18) + SourceIndex(0) name (f) +3 >Emitted(61, 23) Source(55, 19) + SourceIndex(0) name (f) +--- +>>> } +1 >^^^^^^^^^^^^ +2 > ^ +3 > ^^^^-> 1 > > > -2 > } -1 >Emitted(60, 9) Source(57, 9) + SourceIndex(0) name (f) -2 >Emitted(60, 10) Source(57, 10) + SourceIndex(0) name (f) +2 > } +1 >Emitted(62, 13) Source(57, 9) + SourceIndex(0) name (f) +2 >Emitted(62, 14) Source(57, 10) + SourceIndex(0) name (f) --- ->>> default: { +>>> default: 1->^^^^^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^-> +2 > ^^^^^^-> 1-> > -2 > default: -3 > { -1->Emitted(61, 9) Source(58, 9) + SourceIndex(0) name (f) -2 >Emitted(61, 18) Source(58, 18) + SourceIndex(0) name (f) -3 >Emitted(61, 19) Source(58, 19) + SourceIndex(0) name (f) +1->Emitted(63, 9) Source(58, 9) + SourceIndex(0) name (f) --- ->>> x *= 2; +>>> { 1->^^^^^^^^^^^^ 2 > ^ -3 > ^^^^ -4 > ^ -5 > ^ -6 > ^-> +3 > ^^^^^^^^^^^-> +1->default: +2 > { +1->Emitted(64, 13) Source(58, 18) + SourceIndex(0) name (f) +2 >Emitted(64, 14) Source(58, 19) + SourceIndex(0) name (f) +--- +>>> x *= 2; +1->^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^ +4 > ^ +5 > ^ +6 > ^-> 1-> > -2 > x -3 > *= -4 > 2 -5 > ; -1->Emitted(62, 13) Source(59, 13) + SourceIndex(0) name (f) -2 >Emitted(62, 14) Source(59, 14) + SourceIndex(0) name (f) -3 >Emitted(62, 18) Source(59, 18) + SourceIndex(0) name (f) -4 >Emitted(62, 19) Source(59, 19) + SourceIndex(0) name (f) -5 >Emitted(62, 20) Source(59, 20) + SourceIndex(0) name (f) +2 > x +3 > *= +4 > 2 +5 > ; +1->Emitted(65, 17) Source(59, 13) + SourceIndex(0) name (f) +2 >Emitted(65, 18) Source(59, 14) + SourceIndex(0) name (f) +3 >Emitted(65, 22) Source(59, 18) + SourceIndex(0) name (f) +4 >Emitted(65, 23) Source(59, 19) + SourceIndex(0) name (f) +5 >Emitted(65, 24) Source(59, 20) + SourceIndex(0) name (f) --- ->>> x = 50; -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^ -4 > ^^ -5 > ^ +>>> x = 50; +1->^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^ +4 > ^^ +5 > ^ 1-> > -2 > x -3 > = -4 > 50 -5 > ; -1->Emitted(63, 13) Source(60, 13) + SourceIndex(0) name (f) -2 >Emitted(63, 14) Source(60, 14) + SourceIndex(0) name (f) -3 >Emitted(63, 17) Source(60, 17) + SourceIndex(0) name (f) -4 >Emitted(63, 19) Source(60, 19) + SourceIndex(0) name (f) -5 >Emitted(63, 20) Source(60, 20) + SourceIndex(0) name (f) +2 > x +3 > = +4 > 50 +5 > ; +1->Emitted(66, 17) Source(60, 13) + SourceIndex(0) name (f) +2 >Emitted(66, 18) Source(60, 14) + SourceIndex(0) name (f) +3 >Emitted(66, 21) Source(60, 17) + SourceIndex(0) name (f) +4 >Emitted(66, 23) Source(60, 19) + SourceIndex(0) name (f) +5 >Emitted(66, 24) Source(60, 20) + SourceIndex(0) name (f) --- ->>> break; -1 >^^^^^^^^^^^^ -2 > ^^^^^ -3 > ^ +>>> break; +1 >^^^^^^^^^^^^^^^^ +2 > ^^^^^ +3 > ^ 1 > > -2 > break -3 > ; -1 >Emitted(64, 13) Source(61, 13) + SourceIndex(0) name (f) -2 >Emitted(64, 18) Source(61, 18) + SourceIndex(0) name (f) -3 >Emitted(64, 19) Source(61, 19) + SourceIndex(0) name (f) +2 > break +3 > ; +1 >Emitted(67, 17) Source(61, 13) + SourceIndex(0) name (f) +2 >Emitted(67, 22) Source(61, 18) + SourceIndex(0) name (f) +3 >Emitted(67, 23) Source(61, 19) + SourceIndex(0) name (f) --- ->>> } -1 >^^^^^^^^ -2 > ^ +>>> } +1 >^^^^^^^^^^^^ +2 > ^ 1 > > > -2 > } -1 >Emitted(65, 9) Source(63, 9) + SourceIndex(0) name (f) -2 >Emitted(65, 10) Source(63, 10) + SourceIndex(0) name (f) +2 > } +1 >Emitted(68, 13) Source(63, 9) + SourceIndex(0) name (f) +2 >Emitted(68, 14) Source(63, 10) + SourceIndex(0) name (f) --- >>> } 1 >^^^^ @@ -1123,8 +1132,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(66, 5) Source(64, 5) + SourceIndex(0) name (f) -2 >Emitted(66, 6) Source(64, 6) + SourceIndex(0) name (f) +1 >Emitted(69, 5) Source(64, 5) + SourceIndex(0) name (f) +2 >Emitted(69, 6) Source(64, 6) + SourceIndex(0) name (f) --- >>> while (x < 10) { 1->^^^^ @@ -1142,13 +1151,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > 10 6 > ) 7 > { -1->Emitted(67, 5) Source(65, 5) + SourceIndex(0) name (f) -2 >Emitted(67, 12) Source(65, 12) + SourceIndex(0) name (f) -3 >Emitted(67, 13) Source(65, 13) + SourceIndex(0) name (f) -4 >Emitted(67, 16) Source(65, 16) + SourceIndex(0) name (f) -5 >Emitted(67, 18) Source(65, 18) + SourceIndex(0) name (f) -6 >Emitted(67, 20) Source(65, 20) + SourceIndex(0) name (f) -7 >Emitted(67, 21) Source(65, 21) + SourceIndex(0) name (f) +1->Emitted(70, 5) Source(65, 5) + SourceIndex(0) name (f) +2 >Emitted(70, 12) Source(65, 12) + SourceIndex(0) name (f) +3 >Emitted(70, 13) Source(65, 13) + SourceIndex(0) name (f) +4 >Emitted(70, 16) Source(65, 16) + SourceIndex(0) name (f) +5 >Emitted(70, 18) Source(65, 18) + SourceIndex(0) name (f) +6 >Emitted(70, 20) Source(65, 20) + SourceIndex(0) name (f) +7 >Emitted(70, 21) Source(65, 21) + SourceIndex(0) name (f) --- >>> x++; 1 >^^^^^^^^ @@ -1160,10 +1169,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > ++ 4 > ; -1 >Emitted(68, 9) Source(66, 9) + SourceIndex(0) name (f) -2 >Emitted(68, 10) Source(66, 10) + SourceIndex(0) name (f) -3 >Emitted(68, 12) Source(66, 12) + SourceIndex(0) name (f) -4 >Emitted(68, 13) Source(66, 13) + SourceIndex(0) name (f) +1 >Emitted(71, 9) Source(66, 9) + SourceIndex(0) name (f) +2 >Emitted(71, 10) Source(66, 10) + SourceIndex(0) name (f) +3 >Emitted(71, 12) Source(66, 12) + SourceIndex(0) name (f) +4 >Emitted(71, 13) Source(66, 13) + SourceIndex(0) name (f) --- >>> } 1 >^^^^ @@ -1172,8 +1181,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(69, 5) Source(67, 5) + SourceIndex(0) name (f) -2 >Emitted(69, 6) Source(67, 6) + SourceIndex(0) name (f) +1 >Emitted(72, 5) Source(67, 5) + SourceIndex(0) name (f) +2 >Emitted(72, 6) Source(67, 6) + SourceIndex(0) name (f) --- >>> do { 1->^^^^ @@ -1184,9 +1193,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > do 3 > { -1->Emitted(70, 5) Source(68, 5) + SourceIndex(0) name (f) -2 >Emitted(70, 8) Source(68, 8) + SourceIndex(0) name (f) -3 >Emitted(70, 9) Source(68, 9) + SourceIndex(0) name (f) +1->Emitted(73, 5) Source(68, 5) + SourceIndex(0) name (f) +2 >Emitted(73, 8) Source(68, 8) + SourceIndex(0) name (f) +3 >Emitted(73, 9) Source(68, 9) + SourceIndex(0) name (f) --- >>> x--; 1->^^^^^^^^ @@ -1199,10 +1208,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > -- 4 > ; -1->Emitted(71, 9) Source(69, 9) + SourceIndex(0) name (f) -2 >Emitted(71, 10) Source(69, 10) + SourceIndex(0) name (f) -3 >Emitted(71, 12) Source(69, 12) + SourceIndex(0) name (f) -4 >Emitted(71, 13) Source(69, 13) + SourceIndex(0) name (f) +1->Emitted(74, 9) Source(69, 9) + SourceIndex(0) name (f) +2 >Emitted(74, 10) Source(69, 10) + SourceIndex(0) name (f) +3 >Emitted(74, 12) Source(69, 12) + SourceIndex(0) name (f) +4 >Emitted(74, 13) Source(69, 13) + SourceIndex(0) name (f) --- >>> } while (x > 4); 1->^^^^ @@ -1220,13 +1229,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > > 6 > 4 7 > ) -1->Emitted(72, 5) Source(70, 5) + SourceIndex(0) name (f) -2 >Emitted(72, 6) Source(70, 6) + SourceIndex(0) name (f) -3 >Emitted(72, 14) Source(70, 14) + SourceIndex(0) name (f) -4 >Emitted(72, 15) Source(70, 15) + SourceIndex(0) name (f) -5 >Emitted(72, 18) Source(70, 18) + SourceIndex(0) name (f) -6 >Emitted(72, 19) Source(70, 19) + SourceIndex(0) name (f) -7 >Emitted(72, 21) Source(70, 20) + SourceIndex(0) name (f) +1->Emitted(75, 5) Source(70, 5) + SourceIndex(0) name (f) +2 >Emitted(75, 6) Source(70, 6) + SourceIndex(0) name (f) +3 >Emitted(75, 14) Source(70, 14) + SourceIndex(0) name (f) +4 >Emitted(75, 15) Source(70, 15) + SourceIndex(0) name (f) +5 >Emitted(75, 18) Source(70, 18) + SourceIndex(0) name (f) +6 >Emitted(75, 19) Source(70, 19) + SourceIndex(0) name (f) +7 >Emitted(75, 21) Source(70, 20) + SourceIndex(0) name (f) --- >>> x = y; 1 >^^^^ @@ -1241,11 +1250,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > y 5 > ; -1 >Emitted(73, 5) Source(71, 5) + SourceIndex(0) name (f) -2 >Emitted(73, 6) Source(71, 6) + SourceIndex(0) name (f) -3 >Emitted(73, 9) Source(71, 9) + SourceIndex(0) name (f) -4 >Emitted(73, 10) Source(71, 10) + SourceIndex(0) name (f) -5 >Emitted(73, 11) Source(71, 11) + SourceIndex(0) name (f) +1 >Emitted(76, 5) Source(71, 5) + SourceIndex(0) name (f) +2 >Emitted(76, 6) Source(71, 6) + SourceIndex(0) name (f) +3 >Emitted(76, 9) Source(71, 9) + SourceIndex(0) name (f) +4 >Emitted(76, 10) Source(71, 10) + SourceIndex(0) name (f) +5 >Emitted(76, 11) Source(71, 11) + SourceIndex(0) name (f) --- >>> var z = (x == 1) ? x + 1 : x - 1; 1->^^^^ @@ -1285,24 +1294,24 @@ sourceFile:sourceMapValidationStatements.ts 16> - 17> 1 18> ; -1->Emitted(74, 5) Source(72, 5) + SourceIndex(0) name (f) -2 >Emitted(74, 9) Source(72, 9) + SourceIndex(0) name (f) -3 >Emitted(74, 10) Source(72, 10) + SourceIndex(0) name (f) -4 >Emitted(74, 13) Source(72, 13) + SourceIndex(0) name (f) -5 >Emitted(74, 14) Source(72, 14) + SourceIndex(0) name (f) -6 >Emitted(74, 15) Source(72, 15) + SourceIndex(0) name (f) -7 >Emitted(74, 19) Source(72, 19) + SourceIndex(0) name (f) -8 >Emitted(74, 20) Source(72, 20) + SourceIndex(0) name (f) -9 >Emitted(74, 21) Source(72, 21) + SourceIndex(0) name (f) -10>Emitted(74, 24) Source(72, 24) + SourceIndex(0) name (f) -11>Emitted(74, 25) Source(72, 25) + SourceIndex(0) name (f) -12>Emitted(74, 28) Source(72, 28) + SourceIndex(0) name (f) -13>Emitted(74, 29) Source(72, 29) + SourceIndex(0) name (f) -14>Emitted(74, 32) Source(72, 32) + SourceIndex(0) name (f) -15>Emitted(74, 33) Source(72, 33) + SourceIndex(0) name (f) -16>Emitted(74, 36) Source(72, 36) + SourceIndex(0) name (f) -17>Emitted(74, 37) Source(72, 37) + SourceIndex(0) name (f) -18>Emitted(74, 38) Source(72, 38) + SourceIndex(0) name (f) +1->Emitted(77, 5) Source(72, 5) + SourceIndex(0) name (f) +2 >Emitted(77, 9) Source(72, 9) + SourceIndex(0) name (f) +3 >Emitted(77, 10) Source(72, 10) + SourceIndex(0) name (f) +4 >Emitted(77, 13) Source(72, 13) + SourceIndex(0) name (f) +5 >Emitted(77, 14) Source(72, 14) + SourceIndex(0) name (f) +6 >Emitted(77, 15) Source(72, 15) + SourceIndex(0) name (f) +7 >Emitted(77, 19) Source(72, 19) + SourceIndex(0) name (f) +8 >Emitted(77, 20) Source(72, 20) + SourceIndex(0) name (f) +9 >Emitted(77, 21) Source(72, 21) + SourceIndex(0) name (f) +10>Emitted(77, 24) Source(72, 24) + SourceIndex(0) name (f) +11>Emitted(77, 25) Source(72, 25) + SourceIndex(0) name (f) +12>Emitted(77, 28) Source(72, 28) + SourceIndex(0) name (f) +13>Emitted(77, 29) Source(72, 29) + SourceIndex(0) name (f) +14>Emitted(77, 32) Source(72, 32) + SourceIndex(0) name (f) +15>Emitted(77, 33) Source(72, 33) + SourceIndex(0) name (f) +16>Emitted(77, 36) Source(72, 36) + SourceIndex(0) name (f) +17>Emitted(77, 37) Source(72, 37) + SourceIndex(0) name (f) +18>Emitted(77, 38) Source(72, 38) + SourceIndex(0) name (f) --- >>> (x == 1) ? x + 1 : x - 1; 1 >^^^^ @@ -1336,21 +1345,21 @@ sourceFile:sourceMapValidationStatements.ts 13> - 14> 1 15> ; -1 >Emitted(75, 5) Source(73, 5) + SourceIndex(0) name (f) -2 >Emitted(75, 6) Source(73, 6) + SourceIndex(0) name (f) -3 >Emitted(75, 7) Source(73, 7) + SourceIndex(0) name (f) -4 >Emitted(75, 11) Source(73, 11) + SourceIndex(0) name (f) -5 >Emitted(75, 12) Source(73, 12) + SourceIndex(0) name (f) -6 >Emitted(75, 13) Source(73, 13) + SourceIndex(0) name (f) -7 >Emitted(75, 16) Source(73, 16) + SourceIndex(0) name (f) -8 >Emitted(75, 17) Source(73, 17) + SourceIndex(0) name (f) -9 >Emitted(75, 20) Source(73, 20) + SourceIndex(0) name (f) -10>Emitted(75, 21) Source(73, 21) + SourceIndex(0) name (f) -11>Emitted(75, 24) Source(73, 24) + SourceIndex(0) name (f) -12>Emitted(75, 25) Source(73, 25) + SourceIndex(0) name (f) -13>Emitted(75, 28) Source(73, 28) + SourceIndex(0) name (f) -14>Emitted(75, 29) Source(73, 29) + SourceIndex(0) name (f) -15>Emitted(75, 30) Source(73, 30) + SourceIndex(0) name (f) +1 >Emitted(78, 5) Source(73, 5) + SourceIndex(0) name (f) +2 >Emitted(78, 6) Source(73, 6) + SourceIndex(0) name (f) +3 >Emitted(78, 7) Source(73, 7) + SourceIndex(0) name (f) +4 >Emitted(78, 11) Source(73, 11) + SourceIndex(0) name (f) +5 >Emitted(78, 12) Source(73, 12) + SourceIndex(0) name (f) +6 >Emitted(78, 13) Source(73, 13) + SourceIndex(0) name (f) +7 >Emitted(78, 16) Source(73, 16) + SourceIndex(0) name (f) +8 >Emitted(78, 17) Source(73, 17) + SourceIndex(0) name (f) +9 >Emitted(78, 20) Source(73, 20) + SourceIndex(0) name (f) +10>Emitted(78, 21) Source(73, 21) + SourceIndex(0) name (f) +11>Emitted(78, 24) Source(73, 24) + SourceIndex(0) name (f) +12>Emitted(78, 25) Source(73, 25) + SourceIndex(0) name (f) +13>Emitted(78, 28) Source(73, 28) + SourceIndex(0) name (f) +14>Emitted(78, 29) Source(73, 29) + SourceIndex(0) name (f) +15>Emitted(78, 30) Source(73, 30) + SourceIndex(0) name (f) --- >>> x === 1; 1 >^^^^ @@ -1365,11 +1374,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > === 4 > 1 5 > ; -1 >Emitted(76, 5) Source(74, 5) + SourceIndex(0) name (f) -2 >Emitted(76, 6) Source(74, 6) + SourceIndex(0) name (f) -3 >Emitted(76, 11) Source(74, 11) + SourceIndex(0) name (f) -4 >Emitted(76, 12) Source(74, 12) + SourceIndex(0) name (f) -5 >Emitted(76, 13) Source(74, 13) + SourceIndex(0) name (f) +1 >Emitted(79, 5) Source(74, 5) + SourceIndex(0) name (f) +2 >Emitted(79, 6) Source(74, 6) + SourceIndex(0) name (f) +3 >Emitted(79, 11) Source(74, 11) + SourceIndex(0) name (f) +4 >Emitted(79, 12) Source(74, 12) + SourceIndex(0) name (f) +5 >Emitted(79, 13) Source(74, 13) + SourceIndex(0) name (f) --- >>> x = z = 40; 1->^^^^ @@ -1387,13 +1396,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > = 6 > 40 7 > ; -1->Emitted(77, 5) Source(75, 5) + SourceIndex(0) name (f) -2 >Emitted(77, 6) Source(75, 6) + SourceIndex(0) name (f) -3 >Emitted(77, 9) Source(75, 9) + SourceIndex(0) name (f) -4 >Emitted(77, 10) Source(75, 10) + SourceIndex(0) name (f) -5 >Emitted(77, 13) Source(75, 13) + SourceIndex(0) name (f) -6 >Emitted(77, 15) Source(75, 15) + SourceIndex(0) name (f) -7 >Emitted(77, 16) Source(75, 16) + SourceIndex(0) name (f) +1->Emitted(80, 5) Source(75, 5) + SourceIndex(0) name (f) +2 >Emitted(80, 6) Source(75, 6) + SourceIndex(0) name (f) +3 >Emitted(80, 9) Source(75, 9) + SourceIndex(0) name (f) +4 >Emitted(80, 10) Source(75, 10) + SourceIndex(0) name (f) +5 >Emitted(80, 13) Source(75, 13) + SourceIndex(0) name (f) +6 >Emitted(80, 15) Source(75, 15) + SourceIndex(0) name (f) +7 >Emitted(80, 16) Source(75, 16) + SourceIndex(0) name (f) --- >>> eval("y"); 1 >^^^^ @@ -1409,12 +1418,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > "y" 5 > ) 6 > ; -1 >Emitted(78, 5) Source(76, 5) + SourceIndex(0) name (f) -2 >Emitted(78, 9) Source(76, 9) + SourceIndex(0) name (f) -3 >Emitted(78, 10) Source(76, 10) + SourceIndex(0) name (f) -4 >Emitted(78, 13) Source(76, 13) + SourceIndex(0) name (f) -5 >Emitted(78, 14) Source(76, 14) + SourceIndex(0) name (f) -6 >Emitted(78, 15) Source(76, 15) + SourceIndex(0) name (f) +1 >Emitted(81, 5) Source(76, 5) + SourceIndex(0) name (f) +2 >Emitted(81, 9) Source(76, 9) + SourceIndex(0) name (f) +3 >Emitted(81, 10) Source(76, 10) + SourceIndex(0) name (f) +4 >Emitted(81, 13) Source(76, 13) + SourceIndex(0) name (f) +5 >Emitted(81, 14) Source(76, 14) + SourceIndex(0) name (f) +6 >Emitted(81, 15) Source(76, 15) + SourceIndex(0) name (f) --- >>> return; 1 >^^^^ @@ -1424,9 +1433,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > return 3 > ; -1 >Emitted(79, 5) Source(77, 5) + SourceIndex(0) name (f) -2 >Emitted(79, 11) Source(77, 11) + SourceIndex(0) name (f) -3 >Emitted(79, 12) Source(77, 12) + SourceIndex(0) name (f) +1 >Emitted(82, 5) Source(77, 5) + SourceIndex(0) name (f) +2 >Emitted(82, 11) Source(77, 11) + SourceIndex(0) name (f) +3 >Emitted(82, 12) Source(77, 12) + SourceIndex(0) name (f) --- >>>} 1 > @@ -1435,8 +1444,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 >} -1 >Emitted(80, 1) Source(78, 1) + SourceIndex(0) name (f) -2 >Emitted(80, 2) Source(78, 2) + SourceIndex(0) name (f) +1 >Emitted(83, 1) Source(78, 1) + SourceIndex(0) name (f) +2 >Emitted(83, 2) Source(78, 2) + SourceIndex(0) name (f) --- >>>var b = function () { 1-> @@ -1449,10 +1458,10 @@ sourceFile:sourceMapValidationStatements.ts 2 >var 3 > b 4 > = -1->Emitted(81, 1) Source(79, 1) + SourceIndex(0) -2 >Emitted(81, 5) Source(79, 5) + SourceIndex(0) -3 >Emitted(81, 6) Source(79, 6) + SourceIndex(0) -4 >Emitted(81, 9) Source(79, 9) + SourceIndex(0) +1->Emitted(84, 1) Source(79, 1) + SourceIndex(0) +2 >Emitted(84, 5) Source(79, 5) + SourceIndex(0) +3 >Emitted(84, 6) Source(79, 6) + SourceIndex(0) +4 >Emitted(84, 9) Source(79, 9) + SourceIndex(0) --- >>> var x = 10; 1->^^^^ @@ -1468,12 +1477,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > = 5 > 10 6 > ; -1->Emitted(82, 5) Source(80, 5) + SourceIndex(0) -2 >Emitted(82, 9) Source(80, 9) + SourceIndex(0) -3 >Emitted(82, 10) Source(80, 10) + SourceIndex(0) -4 >Emitted(82, 13) Source(80, 13) + SourceIndex(0) -5 >Emitted(82, 15) Source(80, 15) + SourceIndex(0) -6 >Emitted(82, 16) Source(80, 16) + SourceIndex(0) +1->Emitted(85, 5) Source(80, 5) + SourceIndex(0) +2 >Emitted(85, 9) Source(80, 9) + SourceIndex(0) +3 >Emitted(85, 10) Source(80, 10) + SourceIndex(0) +4 >Emitted(85, 13) Source(80, 13) + SourceIndex(0) +5 >Emitted(85, 15) Source(80, 15) + SourceIndex(0) +6 >Emitted(85, 16) Source(80, 16) + SourceIndex(0) --- >>> x = x + 1; 1 >^^^^ @@ -1491,13 +1500,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > + 6 > 1 7 > ; -1 >Emitted(83, 5) Source(81, 5) + SourceIndex(0) -2 >Emitted(83, 6) Source(81, 6) + SourceIndex(0) -3 >Emitted(83, 9) Source(81, 9) + SourceIndex(0) -4 >Emitted(83, 10) Source(81, 10) + SourceIndex(0) -5 >Emitted(83, 13) Source(81, 13) + SourceIndex(0) -6 >Emitted(83, 14) Source(81, 14) + SourceIndex(0) -7 >Emitted(83, 15) Source(81, 15) + SourceIndex(0) +1 >Emitted(86, 5) Source(81, 5) + SourceIndex(0) +2 >Emitted(86, 6) Source(81, 6) + SourceIndex(0) +3 >Emitted(86, 9) Source(81, 9) + SourceIndex(0) +4 >Emitted(86, 10) Source(81, 10) + SourceIndex(0) +5 >Emitted(86, 13) Source(81, 13) + SourceIndex(0) +6 >Emitted(86, 14) Source(81, 14) + SourceIndex(0) +7 >Emitted(86, 15) Source(81, 15) + SourceIndex(0) --- >>>}; 1 > @@ -1508,9 +1517,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 >} 3 > ; -1 >Emitted(84, 1) Source(82, 1) + SourceIndex(0) -2 >Emitted(84, 2) Source(82, 2) + SourceIndex(0) -3 >Emitted(84, 3) Source(82, 3) + SourceIndex(0) +1 >Emitted(87, 1) Source(82, 1) + SourceIndex(0) +2 >Emitted(87, 2) Source(82, 2) + SourceIndex(0) +3 >Emitted(87, 3) Source(82, 3) + SourceIndex(0) --- >>>f(); 1-> @@ -1523,9 +1532,9 @@ sourceFile:sourceMapValidationStatements.ts 2 >f 3 > () 4 > ; -1->Emitted(85, 1) Source(83, 1) + SourceIndex(0) -2 >Emitted(85, 2) Source(83, 2) + SourceIndex(0) -3 >Emitted(85, 4) Source(83, 4) + SourceIndex(0) -4 >Emitted(85, 5) Source(83, 5) + SourceIndex(0) +1->Emitted(88, 1) Source(83, 1) + SourceIndex(0) +2 >Emitted(88, 2) Source(83, 2) + SourceIndex(0) +3 >Emitted(88, 4) Source(83, 4) + SourceIndex(0) +4 >Emitted(88, 5) Source(83, 5) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationStatements.js.map \ No newline at end of file diff --git a/tests/baselines/reference/spaceBeforeQuestionMarkInPropertyAssignment.js b/tests/baselines/reference/spaceBeforeQuestionMarkInPropertyAssignment.js index d439cc3b020..87aff29c210 100644 --- a/tests/baselines/reference/spaceBeforeQuestionMarkInPropertyAssignment.js +++ b/tests/baselines/reference/spaceBeforeQuestionMarkInPropertyAssignment.js @@ -2,4 +2,6 @@ var x = {x ?: 1} // should not crash //// [spaceBeforeQuestionMarkInPropertyAssignment.js] -var x = { x: 1 }; // should not crash +var x = { + x: 1 +}; // should not crash diff --git a/tests/baselines/reference/specializationsShouldNotAffectEachOther.js b/tests/baselines/reference/specializationsShouldNotAffectEachOther.js index 3116571166f..d0b84d99009 100644 --- a/tests/baselines/reference/specializationsShouldNotAffectEachOther.js +++ b/tests/baselines/reference/specializationsShouldNotAffectEachOther.js @@ -23,9 +23,13 @@ var keyExtent2: any[] = series.data.map(function (d: string) { return d; }); //// [specializationsShouldNotAffectEachOther.js] var series; function foo() { - var seriesExtent = function (series) { return null; }; + var seriesExtent = function (series) { + return null; + }; var series2; series2.map(seriesExtent); return null; } -var keyExtent2 = series.data.map(function (d) { return d; }); +var keyExtent2 = series.data.map(function (d) { + return d; +}); diff --git a/tests/baselines/reference/specializeVarArgs1.js b/tests/baselines/reference/specializeVarArgs1.js index cc09df1daa6..3eac6daa61f 100644 --- a/tests/baselines/reference/specializeVarArgs1.js +++ b/tests/baselines/reference/specializeVarArgs1.js @@ -23,6 +23,8 @@ a.push('Some Value'); //// [specializeVarArgs1.js] -function observableArray() { return null; } +function observableArray() { + return null; +} var a = observableArray(); a.push('Some Value'); diff --git a/tests/baselines/reference/specializedInheritedConstructors1.js b/tests/baselines/reference/specializedInheritedConstructors1.js index 36280f9a44e..4c30628af4f 100644 --- a/tests/baselines/reference/specializedInheritedConstructors1.js +++ b/tests/baselines/reference/specializedInheritedConstructors1.js @@ -41,7 +41,11 @@ var MyView = (function (_super) { } return MyView; })(View); -var m = { model: new Model() }; -var aView = new View({ model: new Model() }); +var m = { + model: new Model() +}; +var aView = new View({ + model: new Model() +}); var aView2 = new View(m); var myView = new MyView(m); // was error diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.js b/tests/baselines/reference/specializedOverloadWithRestParameters.js index f091a39677c..56bf07f6fdf 100644 --- a/tests/baselines/reference/specializedOverloadWithRestParameters.js +++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js @@ -22,7 +22,8 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { }; + Base.prototype.foo = function () { + }; return Base; })(); var Derived1 = (function (_super) { @@ -30,7 +31,8 @@ var Derived1 = (function (_super) { function Derived1() { _super.apply(this, arguments); } - Derived1.prototype.bar = function () { }; + Derived1.prototype.bar = function () { + }; return Derived1; })(Base); function f(tagName) { diff --git a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.js b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.js index 1607f730e42..bf6c73bdf40 100644 --- a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.js +++ b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.js @@ -13,5 +13,9 @@ function x3(a, cb) { cb(a); } // both are errors -x3(1, function (x) { return 1; }); -x3(1, function (x) { return 1; }); +x3(1, function (x) { + return 1; +}); +x3(1, function (x) { + return 1; +}); diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js index e5e06d48a8d..eaf0605ef17 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js @@ -69,23 +69,27 @@ var a3: { //// [specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js] // Specialized signatures must be a subtype of a non-specialized signature // All the below should be errors -function foo(x) { } +function foo(x) { +} var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var C2 = (function () { function C2() { } - C2.prototype.foo = function (x) { }; + C2.prototype.foo = function (x) { + }; return C2; })(); var C3 = (function () { function C3() { } - C3.prototype.foo = function (x) { }; + C3.prototype.foo = function (x) { + }; return C3; })(); var a; diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js index 17a886a0784..882d0da9124 100644 --- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js +++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js @@ -84,23 +84,27 @@ var a3: { //// [specializedSignatureIsSubtypeOfNonSpecializedSignature.js] // Specialized signatures must be a subtype of a non-specialized signature // All the below should not be errors -function foo(x) { } +function foo(x) { +} var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var C2 = (function () { function C2() { } - C2.prototype.foo = function (x) { }; + C2.prototype.foo = function (x) { + }; return C2; })(); var C3 = (function () { function C3() { } - C3.prototype.foo = function (x) { }; + C3.prototype.foo = function (x) { + }; return C3; })(); var a; diff --git a/tests/baselines/reference/staticAndMemberFunctions.js b/tests/baselines/reference/staticAndMemberFunctions.js index 71f146b72f7..0d1d9e81900 100644 --- a/tests/baselines/reference/staticAndMemberFunctions.js +++ b/tests/baselines/reference/staticAndMemberFunctions.js @@ -8,7 +8,9 @@ class T { var T = (function () { function T() { } - T.x = function () { }; - T.prototype.y = 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..ccfbcc85602 100644 --- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js +++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js @@ -11,7 +11,9 @@ class C { var C = (function () { function C() { } - C.prototype.f = function () { }; - C.f = function () { }; + C.prototype.f = function () { + }; + C.f = function () { + }; return C; })(); diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js index aad40e29b76..3dc7dbb67d0 100644 --- a/tests/baselines/reference/staticClassProps.js +++ b/tests/baselines/reference/staticClassProps.js @@ -12,7 +12,8 @@ class C var C = (function () { function C() { } - C.prototype.foo = 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 529cc230d73..af5780d96cf 100644 --- a/tests/baselines/reference/staticFactory1.js +++ b/tests/baselines/reference/staticFactory1.js @@ -23,7 +23,9 @@ var __extends = this.__extends || function (d, b) { var Base = (function () { function Base() { } - Base.prototype.foo = function () { return 1; }; + Base.prototype.foo = function () { + return 1; + }; Base.create = function () { return new this(); }; @@ -34,7 +36,9 @@ var Derived = (function (_super) { function Derived() { _super.apply(this, arguments); } - Derived.prototype.foo = function () { return 2; }; + Derived.prototype.foo = function () { + return 2; + }; return Derived; })(Base); var d = Derived.create(); diff --git a/tests/baselines/reference/staticGetterAndSetter.js b/tests/baselines/reference/staticGetterAndSetter.js index 5c61af0b7cc..7c6ef26e739 100644 --- a/tests/baselines/reference/staticGetterAndSetter.js +++ b/tests/baselines/reference/staticGetterAndSetter.js @@ -10,8 +10,11 @@ var Foo = (function () { function Foo() { } Object.defineProperty(Foo, "Foo", { - get: function () { return 0; }, - set: function (n) { }, + get: function () { + return 0; + }, + set: function (n) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/staticInheritance.js b/tests/baselines/reference/staticInheritance.js index a577bad3a86..dfe39119d32 100644 --- a/tests/baselines/reference/staticInheritance.js +++ b/tests/baselines/reference/staticInheritance.js @@ -18,7 +18,8 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -function doThing(x) { } +function doThing(x) { +} var A = (function () { function A() { this.p = doThing(A); // OK diff --git a/tests/baselines/reference/staticInstanceResolution4.js b/tests/baselines/reference/staticInstanceResolution4.js index c74030d047e..6e81d67dc00 100644 --- a/tests/baselines/reference/staticInstanceResolution4.js +++ b/tests/baselines/reference/staticInstanceResolution4.js @@ -9,7 +9,8 @@ A.foo(); var A = (function () { function A() { } - A.prototype.foo = function () { }; + A.prototype.foo = function () { + }; return A; })(); A.foo(); diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index 843b79ec6f1..6ca976ae46a 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -19,7 +19,10 @@ function z(w3: WinJS) { } //// [staticInstanceResolution5_1.js] define(["require", "exports"], function (require, exports) { // these 3 should be errors - var x = function (w1) { }; - var y = function (w2) { }; - function z(w3) { } + var x = function (w1) { + }; + var y = function (w2) { + }; + function z(w3) { + } }); diff --git a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js index edd657d7da1..df0858edc08 100644 --- a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js +++ b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js @@ -17,12 +17,18 @@ var C = (function () { function C() { } C.foo = function () { - C.foo = function () { }; + C.foo = function () { + }; }; C.bar = function (x) { - C.bar = function () { }; // error - C.bar = function (x) { return x; }; // ok - C.bar = function (x) { return 1; }; // ok + C.bar = function () { + }; // error + C.bar = function (x) { + return x; + }; // ok + C.bar = function (x) { + return 1; + }; // ok return 1; }; return C; diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js index 37799356708..5de5a76ca7a 100644 --- a/tests/baselines/reference/staticMemberExportAccess.js +++ b/tests/baselines/reference/staticMemberExportAccess.js @@ -24,7 +24,9 @@ Sammy.bar(); var Sammy = (function () { function Sammy() { } - Sammy.prototype.foo = function () { return "hi"; }; + Sammy.prototype.foo = function () { + return "hi"; + }; Sammy.bar = function () { return -1; }; diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js index 7b24a29b326..23e6fa9dd06 100644 --- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js +++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js @@ -29,13 +29,15 @@ c = a; var B = (function () { function B() { } - B.prototype.name = function () { }; + B.prototype.name = function () { + }; return B; })(); var C = (function () { function C() { } - C.name = function () { }; + C.name = function () { + }; return C; })(); var a = new B(); diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js index 0c728cdbab6..1c31ef82d91 100644 --- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js +++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js @@ -20,18 +20,21 @@ class C3 { var C = (function () { function C() { } - C.f = function (x) { }; + C.f = function (x) { + }; return C; })(); var C2 = (function () { function C2() { } - C2.f = function (x) { }; + C2.f = function (x) { + }; return C2; })(); var C3 = (function () { function C3() { } - C3.f = function (x) { }; + C3.f = function (x) { + }; return C3; })(); diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js index 76fa7d6249e..499e16ec581 100644 --- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js +++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js @@ -7,6 +7,8 @@ class C { var C = (function () { function C() { } - C.s = function (p) { return p; }; + C.s = function (p) { + return p; + }; return C; })(); diff --git a/tests/baselines/reference/staticModifierAlreadySeen.js b/tests/baselines/reference/staticModifierAlreadySeen.js index d767a9b51d1..b097f3924e4 100644 --- a/tests/baselines/reference/staticModifierAlreadySeen.js +++ b/tests/baselines/reference/staticModifierAlreadySeen.js @@ -8,7 +8,8 @@ class C { var C = (function () { function C() { } - C.bar = function () { }; + C.bar = function () { + }; C.foo = 1; return C; })(); diff --git a/tests/baselines/reference/staticOffOfInstance1.js b/tests/baselines/reference/staticOffOfInstance1.js index 58cf24d0529..41b7cd895bb 100644 --- a/tests/baselines/reference/staticOffOfInstance1.js +++ b/tests/baselines/reference/staticOffOfInstance1.js @@ -13,6 +13,7 @@ var List = (function () { List.prototype.Blah = function () { this.Foo(); }; - List.Foo = function () { }; + List.Foo = function () { + }; return List; })(); diff --git a/tests/baselines/reference/staticOffOfInstance2.js b/tests/baselines/reference/staticOffOfInstance2.js index ceac77419a4..ff139859bf7 100644 --- a/tests/baselines/reference/staticOffOfInstance2.js +++ b/tests/baselines/reference/staticOffOfInstance2.js @@ -16,6 +16,7 @@ var List = (function () { this.Foo(); // no error List.Foo(); }; - List.Foo = function () { }; + List.Foo = function () { + }; return List; })(); diff --git a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js index 50252c606f4..0308805cd7b 100644 --- a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js +++ b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js @@ -18,6 +18,7 @@ var C = (function () { var D = (function () { function D() { } - D.prototype.f = function () { }; + D.prototype.f = function () { + }; return D; })(); diff --git a/tests/baselines/reference/staticPropertyNotInClassType.js b/tests/baselines/reference/staticPropertyNotInClassType.js index e9df2b2158d..22ff4276deb 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.js +++ b/tests/baselines/reference/staticPropertyNotInClassType.js @@ -47,10 +47,15 @@ var NonGeneric; this.a = a; this.b = b; } - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; Object.defineProperty(C, "x", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -73,10 +78,15 @@ var Generic; this.a = a; this.b = b; } - C.prototype.fn = function () { return this; }; + C.prototype.fn = function () { + return this; + }; Object.defineProperty(C, "x", { - get: function () { return 1; }, - set: function (v) { }, + get: function () { + return 1; + }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/staticPrototypeProperty.js b/tests/baselines/reference/staticPrototypeProperty.js index 471ec743b59..cfd81bedeec 100644 --- a/tests/baselines/reference/staticPrototypeProperty.js +++ b/tests/baselines/reference/staticPrototypeProperty.js @@ -11,7 +11,8 @@ class C2 { var C = (function () { function C() { } - C.prototype = function () { }; + C.prototype = function () { + }; return C; })(); var C2 = (function () { diff --git a/tests/baselines/reference/staticVisibility.js b/tests/baselines/reference/staticVisibility.js index 7dbf49a2baa..0da2e3dbe2c 100644 --- a/tests/baselines/reference/staticVisibility.js +++ b/tests/baselines/reference/staticVisibility.js @@ -58,9 +58,13 @@ var C2 = (function () { this.barback = ""; } Object.defineProperty(C2, "Bar", { - get: function () { return "bar"; } // ok + get: function () { + return "bar"; + } // ok , - set: function (bar) { barback = bar; } // not ok + set: function (bar) { + barback = bar; + } // not ok , enumerable: true, configurable: true diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js index c69fa0aabd7..4da39198b21 100644 --- a/tests/baselines/reference/statics.js +++ b/tests/baselines/reference/statics.js @@ -40,7 +40,9 @@ var M; this.c1 = c1; this.c2 = c2; this.x = C.y + this.c1 + this.c2 + c3; - this.g = function (v) { return C.f(_this.x + C.y + v + _this.c1 + _this.c2 + C.pub); }; + this.g = function (v) { + return C.f(_this.x + C.y + v + _this.c1 + _this.c2 + C.pub); + }; } C.f = function (n) { return "wow: " + (n + C.y + C.pub + C.priv); diff --git a/tests/baselines/reference/staticsInAFunction.js b/tests/baselines/reference/staticsInAFunction.js index e918f4b2901..e6959b7757a 100644 --- a/tests/baselines/reference/staticsInAFunction.js +++ b/tests/baselines/reference/staticsInAFunction.js @@ -11,5 +11,6 @@ function boo() { test(); test(name, string); test(name ? : any); - { } + { + } } diff --git a/tests/baselines/reference/staticsInConstructorBodies.js b/tests/baselines/reference/staticsInConstructorBodies.js index bb91b52a18a..044f183b370 100644 --- a/tests/baselines/reference/staticsInConstructorBodies.js +++ b/tests/baselines/reference/staticsInConstructorBodies.js @@ -10,7 +10,8 @@ class C { var C = (function () { function C() { } - C.m1 = function () { }; // ERROR + C.m1 = function () { + }; // ERROR C.p1 = 0; // ERROR return C; })(); diff --git a/tests/baselines/reference/strictMode5.js b/tests/baselines/reference/strictMode5.js index 8e4021820f1..c46de926dbb 100644 --- a/tests/baselines/reference/strictMode5.js +++ b/tests/baselines/reference/strictMode5.js @@ -36,7 +36,8 @@ var A = (function () { return _this.n(); }; }; - A.prototype.n = function () { }; + A.prototype.n = function () { + }; return A; })(); function bar(x) { diff --git a/tests/baselines/reference/stringIndexerAndConstructor.js b/tests/baselines/reference/stringIndexerAndConstructor.js index db3b9b8770b..6d4cc3747c0 100644 --- a/tests/baselines/reference/stringIndexerAndConstructor.js +++ b/tests/baselines/reference/stringIndexerAndConstructor.js @@ -17,6 +17,7 @@ interface I { var C = (function () { function C() { } - C.v = function () { }; + C.v = function () { + }; return C; })(); diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js index 9d70b66887c..ed96311f526 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js @@ -106,7 +106,8 @@ var C = (function () { get: function () { return ''; }, - set: function (v) { } // ok + set: function (v) { + } // ok , enumerable: true, configurable: true @@ -114,7 +115,8 @@ var C = (function () { C.prototype.foo = function () { return ''; }; - C.foo = function () { }; // ok + C.foo = function () { + }; // ok Object.defineProperty(C, "X", { get: function () { return 1; @@ -129,7 +131,8 @@ var a; var b = { a: '', b: 1, - c: function () { }, + c: function () { + }, "d": '', "e": 1, 1.0: '', @@ -140,7 +143,8 @@ var b = { get X() { return ''; }, - set X(v) { }, + set X(v) { + }, foo: function () { return ''; } diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js index c9278c40446..b9195403b20 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js @@ -50,7 +50,9 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.foo = function () { return ''; }; + A.prototype.foo = function () { + return ''; + }; return A; })(); var B = (function (_super) { @@ -58,7 +60,9 @@ var B = (function (_super) { function B() { _super.apply(this, arguments); } - B.prototype.bar = function () { return ''; }; + B.prototype.bar = function () { + return ''; + }; return B; })(A); var Foo = (function () { diff --git a/tests/baselines/reference/stringIndexingResults.js b/tests/baselines/reference/stringIndexingResults.js index a6e00d92ec2..4e80c25d9b9 100644 --- a/tests/baselines/reference/stringIndexingResults.js +++ b/tests/baselines/reference/stringIndexingResults.js @@ -54,7 +54,9 @@ var a; var r7 = a['y']; var r8 = a['a']; var r9 = a[1]; -var b = { y: '' }; +var b = { + y: '' +}; var r10 = b['y']; var r11 = b['a']; var r12 = b[1]; diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js index 2c9e54e610b..a367c3400f8 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js @@ -7,7 +7,9 @@ module m1 { //// [stringLiteralObjectLiteralDeclaration1.js] var m1; (function (m1) { - m1.n = { 'foo bar': 4 }; + m1.n = { + 'foo bar': 4 + }; })(m1 || (m1 = {})); diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.js b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.js index 99ed3fb320a..0c46d72e23a 100644 --- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.js +++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.js @@ -5,6 +5,8 @@ x.text = "bar" //// [stringLiteralPropertyNameWithLineContinuation1.js] -var x = { 'text\ -': 'hello' }; +var x = { + 'text\ +': 'hello' +}; x.text = "bar"; diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js index 6260493dea0..37aa59bef43 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js @@ -101,21 +101,36 @@ function f16(x: any) { } //// [stringLiteralTypeIsSubtypeOfString.js] // string literal types are subtypes of string, any -function f1(x) { } -function f2(x) { } -function f3(x) { } -function f4(x) { } -function f5(x) { } -function f6(x) { } -function f7(x) { } -function f8(x) { } -function f9(x) { } +function f1(x) { +} +function f2(x) { +} +function f3(x) { +} +function f4(x) { +} +function f5(x) { +} +function f6(x) { +} +function f7(x) { +} +function f8(x) { +} +function f9(x) { +} var C = (function () { function C() { } - C.prototype.toString = function () { return null; }; - C.prototype.charAt = function (pos) { return null; }; - C.prototype.charCodeAt = function (index) { return null; }; + C.prototype.toString = function () { + return null; + }; + C.prototype.charAt = function (pos) { + return null; + }; + C.prototype.charCodeAt = function (index) { + return null; + }; C.prototype.concat = function () { var strings = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -123,31 +138,68 @@ var C = (function () { } return null; }; - C.prototype.indexOf = function (searchString, position) { return null; }; - C.prototype.lastIndexOf = function (searchString, position) { return null; }; - C.prototype.localeCompare = function (that) { return null; }; - C.prototype.match = function (regexp) { return null; }; - C.prototype.replace = function (searchValue, replaceValue) { return null; }; - C.prototype.search = function (regexp) { return null; }; - C.prototype.slice = function (start, end) { return null; }; - C.prototype.split = function (separator, limit) { return null; }; - C.prototype.substring = function (start, end) { return null; }; - C.prototype.toLowerCase = function () { return null; }; - C.prototype.toLocaleLowerCase = function () { return null; }; - C.prototype.toUpperCase = function () { return null; }; - C.prototype.toLocaleUpperCase = function () { return null; }; - C.prototype.trim = function () { return null; }; - C.prototype.substr = function (from, length) { return null; }; + C.prototype.indexOf = function (searchString, position) { + return null; + }; + C.prototype.lastIndexOf = function (searchString, position) { + return null; + }; + C.prototype.localeCompare = function (that) { + return null; + }; + C.prototype.match = function (regexp) { + return null; + }; + C.prototype.replace = function (searchValue, replaceValue) { + return null; + }; + C.prototype.search = function (regexp) { + return null; + }; + C.prototype.slice = function (start, end) { + return null; + }; + C.prototype.split = function (separator, limit) { + return null; + }; + C.prototype.substring = function (start, end) { + return null; + }; + C.prototype.toLowerCase = function () { + return null; + }; + C.prototype.toLocaleLowerCase = function () { + return null; + }; + C.prototype.toUpperCase = function () { + return null; + }; + C.prototype.toLocaleUpperCase = function () { + return null; + }; + C.prototype.trim = function () { + return null; + }; + C.prototype.substr = function (from, length) { + return null; + }; return C; })(); -function f10(x) { } -function f11(x) { } -function f12(x) { } -function f13(x) { } +function f10(x) { +} +function f11(x) { +} +function f12(x) { +} +function f13(x) { +} var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function f14(x) { } -function f15(x) { } -function f16(x) { } +function f14(x) { +} +function f15(x) { +} +function f16(x) { +} diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js index 724c20c6309..dc2b2a73412 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js @@ -28,18 +28,25 @@ var b = { //// [stringLiteralTypesInImplementationSignatures.js] // String literal types are only valid in overload signatures -function foo(x) { } -var f = function foo(x) { }; -var f2 = function (x, y) { }; +function foo(x) { +} +var f = function foo(x) { +}; +var f2 = function (x, y) { +}; var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var a; var b = { - foo: function (x) { }, - a: function foo(x, y) { }, - b: function (x) { } + foo: function (x) { + }, + a: function foo(x, y) { + }, + b: function (x) { + } }; diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js index 5050709c213..2ecd3330e20 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js @@ -31,15 +31,19 @@ var b = { //// [stringLiteralTypesInImplementationSignatures2.js] // String literal types are only valid in overload signatures -function foo(x) { } +function foo(x) { +} var C = (function () { function C() { } - C.prototype.foo = function (x) { }; + C.prototype.foo = function (x) { + }; return C; })(); var a; var b = { - foo: function (x) { }, - foo: function (x) { } + foo: function (x) { + }, + foo: function (x) { + } }; diff --git a/tests/baselines/reference/stringPropCodeGen.js b/tests/baselines/reference/stringPropCodeGen.js index ae8cfa3d5aa..46e1a6eb920 100644 --- a/tests/baselines/reference/stringPropCodeGen.js +++ b/tests/baselines/reference/stringPropCodeGen.js @@ -15,7 +15,8 @@ a.bar.toString(); //// [stringPropCodeGen.js] var a = { - "foo": function () { }, + "foo": function () { + }, "bar": 5 }; a.foo(); diff --git a/tests/baselines/reference/stripInternal1.js b/tests/baselines/reference/stripInternal1.js index c5d350bcd86..9deadf1fc31 100644 --- a/tests/baselines/reference/stripInternal1.js +++ b/tests/baselines/reference/stripInternal1.js @@ -10,9 +10,11 @@ class C { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; // @internal - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); diff --git a/tests/baselines/reference/structural1.js b/tests/baselines/reference/structural1.js index 73b033a525c..ebafbc8f0a0 100644 --- a/tests/baselines/reference/structural1.js +++ b/tests/baselines/reference/structural1.js @@ -18,5 +18,8 @@ var M; function f(i) { } M.f = f; - f({ salt: 2, pepper: 0 }); + f({ + salt: 2, + pepper: 0 + }); })(M || (M = {})); diff --git a/tests/baselines/reference/subtypesOfAny.js b/tests/baselines/reference/subtypesOfAny.js index e73a120ed63..973db6a9a74 100644 --- a/tests/baselines/reference/subtypesOfAny.js +++ b/tests/baselines/reference/subtypesOfAny.js @@ -149,7 +149,8 @@ var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js index 7d739132a77..c14e5c01a26 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.js +++ b/tests/baselines/reference/subtypesOfTypeParameter.js @@ -143,7 +143,8 @@ var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; @@ -174,12 +175,22 @@ function f2(x, y) { var r4 = true ? x : new Date(); var r5 = true ? /1/ : x; var r5 = true ? x : /1/; - var r6 = true ? { foo: 1 } : x; - var r6 = true ? x : { foo: 1 }; - var r7 = true ? function () { } : x; - var r7 = true ? x : function () { }; - var r8 = true ? function (x) { return x; } : x; - var r8b = true ? x : function (x) { return x; }; // type parameters not identical across declarations + var r6 = true ? { + foo: 1 + } : x; + var r6 = true ? x : { + foo: 1 + }; + var r7 = true ? function () { + } : x; + var r7 = true ? x : function () { + }; + var r8 = true ? function (x) { + return x; + } : x; + var r8b = true ? x : function (x) { + return x; + }; // type parameters not identical across declarations var i1; var r9 = true ? i1 : x; var r9 = true ? x : i1; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js index df4511fb7ad..9c52fa671e5 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js @@ -199,7 +199,8 @@ var E; (function (E) { E[E["A"] = 0] = "A"; })(E || (E = {})); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; @@ -241,16 +242,26 @@ function f9(x) { var r5 = true ? x : /1/; // ok } function f10(x) { - var r6 = true ? { foo: 1 } : x; // ok - var r6 = true ? x : { foo: 1 }; // ok + var r6 = true ? { + foo: 1 + } : x; // ok + var r6 = true ? x : { + foo: 1 + }; // ok } function f11(x) { - var r7 = true ? function () { } : x; // ok - var r7 = true ? x : function () { }; // ok + var r7 = true ? function () { + } : x; // ok + var r7 = true ? x : function () { + }; // ok } function f12(x) { - var r8 = true ? function (x) { return x; } : x; // ok - var r8b = true ? x : function (x) { return x; }; // ok, type parameters not identical across declarations + var r8 = true ? function (x) { + return x; + } : x; // ok + var r8b = true ? x : function (x) { + return x; + }; // ok, type parameters not identical across declarations } function f13(x) { var i1; diff --git a/tests/baselines/reference/subtypesOfUnion.js b/tests/baselines/reference/subtypesOfUnion.js index 926efc3e921..a18ebb944b9 100644 --- a/tests/baselines/reference/subtypesOfUnion.js +++ b/tests/baselines/reference/subtypesOfUnion.js @@ -68,7 +68,8 @@ var A2 = (function () { } return A2; })(); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/subtypingWithCallSignatures.js b/tests/baselines/reference/subtypingWithCallSignatures.js index 73ca2c6543c..560871cce4e 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures.js +++ b/tests/baselines/reference/subtypingWithCallSignatures.js @@ -14,8 +14,16 @@ module CallSignature { //// [subtypingWithCallSignatures.js] var CallSignature; (function (CallSignature) { - var r = foo1(function (x) { return 1; }); // ok because base returns void - var r2 = foo1(function (x) { return ''; }); // ok because base returns void - var r3 = foo2(function (x, y) { return 1; }); // ok because base returns void - var r4 = foo2(function (x) { return ''; }); // ok because base returns void + var r = foo1(function (x) { + return 1; + }); // ok because base returns void + var r2 = foo1(function (x) { + return ''; + }); // ok because base returns void + var r3 = foo2(function (x, y) { + return 1; + }); // ok because base returns void + var r4 = foo2(function (x) { + return ''; + }); // ok because base returns void })(CallSignature || (CallSignature = {})); diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js index e1341914739..cd430902af0 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures2.js +++ b/tests/baselines/reference/subtypingWithCallSignatures2.js @@ -206,51 +206,160 @@ var OtherDerived = (function (_super) { } return OtherDerived; })(Base); -var r1arg1 = function (x) { return [x]; }; -var r1arg2 = function (x) { return [1]; }; +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 -var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions -var r1b = [r1arg1, r1arg2]; // generic signature, subtype in both directions -var r2arg1 = function (x) { return ['']; }; -var r2arg2 = function (x) { return ['']; }; +var r1a = [ + r1arg2, + r1arg1 +]; // generic signature, subtype in both directions +var r1b = [ + r1arg1, + r1arg2 +]; // generic signature, subtype in both directions +var r2arg1 = function (x) { + return [ + '' + ]; +}; +var r2arg2 = function (x) { + return [ + '' + ]; +}; var r2 = foo2(r2arg1); -var r2a = [r2arg1, r2arg2]; -var r2b = [r2arg2, r2arg1]; -var r3arg1 = function (x) { return x; }; -var r3arg2 = function (x) { }; +var r2a = [ + r2arg1, + r2arg2 +]; +var r2b = [ + r2arg2, + r2arg1 +]; +var r3arg1 = function (x) { + return x; +}; +var r3arg2 = function (x) { +}; var r3 = foo3(r3arg1); -var r3a = [r3arg1, r3arg2]; -var r3b = [r3arg2, r3arg1]; -var r4arg1 = function (x, y) { return x; }; -var r4arg2 = function (x, y) { return ''; }; +var r3a = [ + r3arg1, + r3arg2 +]; +var r3b = [ + r3arg2, + r3arg1 +]; +var r4arg1 = function (x, y) { + return x; +}; +var r4arg2 = function (x, y) { + return ''; +}; var r4 = foo4(r4arg1); // any -var r4a = [r4arg1, r4arg2]; -var r4b = [r4arg2, r4arg1]; -var r5arg1 = function (x) { return null; }; -var r5arg2 = function (x) { return ''; }; +var r4a = [ + r4arg1, + r4arg2 +]; +var r4b = [ + r4arg2, + r4arg1 +]; +var r5arg1 = function (x) { + return null; +}; +var r5arg2 = function (x) { + return ''; +}; var r5 = foo5(r5arg1); // any -var r5a = [r5arg1, r5arg2]; -var r5b = [r5arg2, r5arg1]; -var r6arg1 = function (x) { return null; }; -var r6arg2 = function (x) { return null; }; +var r5a = [ + r5arg1, + r5arg2 +]; +var r5b = [ + r5arg2, + r5arg1 +]; +var r6arg1 = function (x) { + return null; +}; +var r6arg2 = function (x) { + return null; +}; var r6 = foo6(r6arg1); // any -var r6a = [r6arg1, r6arg2]; -var r6b = [r6arg2, r6arg1]; -var r7arg1 = function (x) { return function (r) { return null; }; }; -var r7arg2 = function (x) { return function (r) { return null; }; }; +var r6a = [ + r6arg1, + r6arg2 +]; +var r6b = [ + r6arg2, + r6arg1 +]; +var r7arg1 = function (x) { + return function (r) { + return null; + }; +}; +var r7arg2 = function (x) { + return function (r) { + return null; + }; +}; var r7 = foo7(r7arg1); // any -var r7a = [r7arg1, r7arg2]; -var r7b = [r7arg2, r7arg1]; -var r8arg1 = function (x, y) { return function (r) { return null; }; }; -var r8arg2 = function (x, y) { return function (r) { return null; }; }; +var r7a = [ + r7arg1, + r7arg2 +]; +var r7b = [ + r7arg2, + r7arg1 +]; +var r8arg1 = function (x, y) { + return function (r) { + return null; + }; +}; +var r8arg2 = function (x, y) { + return function (r) { + return null; + }; +}; var r8 = foo8(r8arg1); // any -var r8a = [r8arg1, r8arg2]; -var r8b = [r8arg2, r8arg1]; -var r9arg1 = function (x, y) { return function (r) { return null; }; }; -var r9arg2 = function (x, y) { return function (r) { return null; }; }; +var r8a = [ + r8arg1, + r8arg2 +]; +var r8b = [ + r8arg2, + r8arg1 +]; +var r9arg1 = function (x, y) { + return function (r) { + return null; + }; +}; +var r9arg2 = function (x, y) { + return function (r) { + return null; + }; +}; var r9 = foo9(r9arg1); // any -var r9a = [r9arg1, r9arg2]; -var r9b = [r9arg2, r9arg1]; +var r9a = [ + r9arg1, + r9arg2 +]; +var r9b = [ + r9arg2, + r9arg1 +]; var r10arg1 = function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -266,33 +375,89 @@ var r10arg2 = function () { return null; }; var r10 = foo10(r10arg1); // any -var r10a = [r10arg1, r10arg2]; -var r10b = [r10arg2, r10arg1]; -var r11arg1 = function (x, y) { return x; }; -var r11arg2 = function (x, y) { return null; }; +var r10a = [ + r10arg1, + r10arg2 +]; +var r10b = [ + r10arg2, + r10arg1 +]; +var r11arg1 = function (x, y) { + return x; +}; +var r11arg2 = function (x, y) { + return null; +}; var r11 = foo11(r11arg1); // any -var r11a = [r11arg1, r11arg2]; -var r11b = [r11arg2, r11arg1]; -var r12arg1 = function (x, y) { return null; }; -var r12arg2 = function (x, y) { return null; }; +var r11a = [ + r11arg1, + r11arg2 +]; +var r11b = [ + r11arg2, + r11arg1 +]; +var r12arg1 = function (x, y) { + return null; +}; +var r12arg2 = function (x, y) { + return null; +}; var r12 = foo12(r12arg1); // any -var r12a = [r12arg1, r12arg2]; -var r12b = [r12arg2, r12arg1]; -var r13arg1 = function (x, y) { return y; }; -var r13arg2 = function (x, y) { return null; }; +var r12a = [ + r12arg1, + r12arg2 +]; +var r12b = [ + r12arg2, + r12arg1 +]; +var r13arg1 = function (x, y) { + return y; +}; +var r13arg2 = function (x, y) { + return null; +}; var r13 = foo13(r13arg1); // any -var r13a = [r13arg1, r13arg2]; -var r13b = [r13arg2, r13arg1]; -var r14arg1 = function (x) { return x.a; }; -var r14arg2 = function (x) { return null; }; +var r13a = [ + r13arg1, + r13arg2 +]; +var r13b = [ + r13arg2, + r13arg1 +]; +var r14arg1 = function (x) { + return x.a; +}; +var r14arg2 = function (x) { + return null; +}; var r14 = foo14(r14arg1); // any -var r14a = [r14arg1, r14arg2]; -var r14b = [r14arg2, r14arg1]; -var r15arg1 = function (x) { return null; }; +var r14a = [ + r14arg1, + r14arg2 +]; +var r14b = [ + r14arg2, + r14arg1 +]; +var r15arg1 = function (x) { + return null; +}; var r15 = foo15(r15arg1); // any -var r16arg1 = function (x) { return [1]; }; +var r16arg1 = function (x) { + return [ + 1 + ]; +}; var r16 = foo16(r16arg1); -var r17arg1 = function (x) { return null; }; +var r17arg1 = function (x) { + return null; +}; var r17 = foo17(r17arg1); // any -var r18arg1 = function (x) { return null; }; +var r18arg1 = function (x) { + return null; +}; var r18 = foo18(r18arg1); diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js index fb7b0fef551..9dd2cb7a87e 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.js +++ b/tests/baselines/reference/subtypingWithCallSignatures3.js @@ -155,19 +155,67 @@ var Errors; } return OtherDerived; })(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 ['']; }]; - var r2arg = function (x) { return function (r) { return null; }; }; - var r2arg2 = function (x) { return function (r) { return null; }; }; + 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 [ + '' + ]; + } + ]; + var r2arg = function (x) { + return function (r) { + return null; + }; + }; + var r2arg2 = function (x) { + return function (r) { + return null; + }; + }; var r2 = foo7(r2arg); // any - var r2a = [r2arg2, r2arg]; - var r2b = [r2arg, r2arg2]; - var r3arg = function (x, y) { return function (r) { return null; }; }; - var r3arg2 = function (x, y) { return function (r) { return null; }; }; + var r2a = [ + r2arg2, + r2arg + ]; + var r2b = [ + r2arg, + r2arg2 + ]; + var r3arg = function (x, y) { + return function (r) { + return null; + }; + }; + var r3arg2 = function (x, y) { + return function (r) { + return null; + }; + }; var r3 = foo8(r3arg); // any - var r3a = [r3arg2, r3arg]; - var r3b = [r3arg, r3arg2]; + var r3a = [ + r3arg2, + r3arg + ]; + var r3b = [ + r3arg, + r3arg2 + ]; var r4arg = function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -183,36 +231,90 @@ var Errors; return null; }; var r4 = foo10(r4arg); // any - var r4a = [r4arg2, r4arg]; - var r4b = [r4arg, r4arg2]; - var r5arg = function (x, y) { return null; }; - var r5arg2 = function (x, y) { return null; }; + var r4a = [ + r4arg2, + r4arg + ]; + var r4b = [ + r4arg, + r4arg2 + ]; + var r5arg = function (x, y) { + return null; + }; + var r5arg2 = function (x, y) { + return null; + }; var r5 = foo11(r5arg); // any - var r5a = [r5arg2, r5arg]; - var r5b = [r5arg, r5arg2]; - var r6arg = function (x, y) { return null; }; - var r6arg2 = function (x, y) { return null; }; + var r5a = [ + r5arg2, + r5arg + ]; + var r5b = [ + r5arg, + r5arg2 + ]; + var r6arg = function (x, y) { + return null; + }; + var r6arg2 = function (x, y) { + return null; + }; var r6 = foo12(r6arg); // (x: Array, y: Array) => Array - var r6a = [r6arg2, r6arg]; - var r6b = [r6arg, r6arg2]; - var r7arg = function (x) { return null; }; - var r7arg2 = function (x) { return 1; }; + var r6a = [ + r6arg2, + r6arg + ]; + var r6b = [ + r6arg, + r6arg2 + ]; + var r7arg = function (x) { + return null; + }; + var r7arg2 = function (x) { + return 1; + }; var r7 = foo15(r7arg); // any - var r7a = [r7arg2, r7arg]; - var r7b = [r7arg, r7arg2]; - var r7arg3 = function (x) { return 1; }; + var r7a = [ + r7arg2, + r7arg + ]; + var r7b = [ + r7arg, + r7arg2 + ]; + var r7arg3 = function (x) { + return 1; + }; var r7c = foo15(r7arg3); // (x: { a: string; b: number }) => number): number; - var r7d = [r7arg2, r7arg3]; - var r7e = [r7arg3, r7arg2]; - var r8arg = function (x) { return null; }; + var r7d = [ + r7arg2, + r7arg3 + ]; + var r7e = [ + r7arg3, + r7arg2 + ]; + var r8arg = function (x) { + return null; + }; var r8 = foo16(r8arg); // any - var r9arg = function (x) { return null; }; + var r9arg = function (x) { + return null; + }; var r9 = foo17(r9arg); // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; })(Errors || (Errors = {})); var WithGenericSignaturesInBaseType; (function (WithGenericSignaturesInBaseType) { - var r2arg2 = function (x) { return ['']; }; + var r2arg2 = function (x) { + return [ + '' + ]; + }; var r2 = foo2(r2arg2); // (x:T) => T[] since we can infer from generic signatures now - var r3arg2 = function (x) { return null; }; + var r3arg2 = function (x) { + return null; + }; var r3 = foo3(r3arg2); // any })(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {})); diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.js b/tests/baselines/reference/subtypingWithCallSignatures4.js index cbdf92e2e60..abdef75ef91 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures4.js +++ b/tests/baselines/reference/subtypingWithCallSignatures4.js @@ -145,52 +145,149 @@ var OtherDerived = (function (_super) { } return OtherDerived; })(Base); -var r1arg = function (x) { return null; }; -var r1arg2 = function (x) { return null; }; +var r1arg = function (x) { + return null; +}; +var r1arg2 = function (x) { + return null; +}; var r1 = foo1(r1arg); -var r1a = [r1arg, r1arg2]; -var r1b = [r1arg2, r1arg]; -var r2arg = function (x) { return ['']; }; -var r2arg2 = function (x) { return ['']; }; +var r1a = [ + r1arg, + r1arg2 +]; +var r1b = [ + r1arg2, + r1arg +]; +var r2arg = function (x) { + return [ + '' + ]; +}; +var r2arg2 = function (x) { + return [ + '' + ]; +}; var r2 = foo2(r2arg); -var r2a = [r2arg, r2arg2]; -var r2b = [r2arg2, r2arg]; -var r3arg = function (x) { return null; }; -var r3arg2 = function (x) { }; +var r2a = [ + r2arg, + r2arg2 +]; +var r2b = [ + r2arg2, + r2arg +]; +var r3arg = function (x) { + return null; +}; +var r3arg2 = function (x) { +}; var r3 = foo3(r3arg); -var r3a = [r3arg, r3arg2]; -var r3b = [r3arg2, r3arg]; -var r4arg = function (x, y) { return ''; }; -var r4arg2 = function (x, y) { return ''; }; +var r3a = [ + r3arg, + r3arg2 +]; +var r3b = [ + r3arg2, + r3arg +]; +var r4arg = function (x, y) { + return ''; +}; +var r4arg2 = function (x, y) { + return ''; +}; var r4 = foo4(r4arg); -var r4a = [r4arg, r4arg2]; -var r4b = [r4arg2, r4arg]; -var r5arg = function (x) { return null; }; -var r5arg2 = function (x) { return null; }; +var r4a = [ + r4arg, + r4arg2 +]; +var r4b = [ + r4arg2, + r4arg +]; +var r5arg = function (x) { + return null; +}; +var r5arg2 = function (x) { + return null; +}; var r5 = foo5(r5arg); -var r5a = [r5arg, r5arg2]; -var r5b = [r5arg2, r5arg]; -var r6arg = function (x) { return null; }; -var r6arg2 = function (x) { return null; }; +var r5a = [ + r5arg, + r5arg2 +]; +var r5b = [ + r5arg2, + r5arg +]; +var r6arg = function (x) { + return null; +}; +var r6arg2 = function (x) { + return null; +}; var r6 = foo6(r6arg); -var r6a = [r6arg, r6arg2]; -var r6b = [r6arg2, r6arg]; -var r11arg = function (x, y) { return null; }; -var r11arg2 = function (x, y) { return null; }; +var r6a = [ + r6arg, + r6arg2 +]; +var r6b = [ + r6arg2, + r6arg +]; +var r11arg = function (x, y) { + return null; +}; +var r11arg2 = function (x, y) { + return null; +}; var r11 = foo11(r11arg); -var r11a = [r11arg, r11arg2]; -var r11b = [r11arg2, r11arg]; -var r15arg = function (x) { return null; }; -var r15arg2 = function (x) { return null; }; +var r11a = [ + r11arg, + r11arg2 +]; +var r11b = [ + r11arg2, + r11arg +]; +var r15arg = function (x) { + return null; +}; +var r15arg2 = function (x) { + return null; +}; var r15 = foo15(r15arg); -var r15a = [r15arg, r15arg2]; -var r15b = [r15arg2, r15arg]; -var r16arg = function (x) { return null; }; -var r16arg2 = function (x) { return null; }; +var r15a = [ + r15arg, + r15arg2 +]; +var r15b = [ + r15arg2, + r15arg +]; +var r16arg = function (x) { + return null; +}; +var r16arg2 = function (x) { + return null; +}; var r16 = foo16(r16arg); -var r16a = [r16arg, r16arg2]; -var r16b = [r16arg2, r16arg]; -var r17arg = function (x) { return null; }; +var r16a = [ + r16arg, + r16arg2 +]; +var r16b = [ + r16arg2, + r16arg +]; +var r17arg = function (x) { + return null; +}; var r17 = foo17(r17arg); -var r18arg = function (x) { return null; }; +var r18arg = function (x) { + return null; +}; var r18 = foo18(r18arg); diff --git a/tests/baselines/reference/subtypingWithCallSignaturesA.js b/tests/baselines/reference/subtypingWithCallSignaturesA.js index a6c8da99b8c..5a679844573 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesA.js +++ b/tests/baselines/reference/subtypingWithCallSignaturesA.js @@ -3,4 +3,6 @@ declare function foo3(cb: (x: number) => number): typeof cb; var r5 = foo3((x: number) => ''); // error //// [subtypingWithCallSignaturesA.js] -var r5 = foo3(function (x) { return ''; }); // error +var r5 = foo3(function (x) { + return ''; +}); // error diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.js b/tests/baselines/reference/subtypingWithConstructSignatures2.js index 9a7ecd791c3..ebedd898491 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures2.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js @@ -209,73 +209,157 @@ var OtherDerived = (function (_super) { var r1arg1; var r1arg2; var r1 = foo1(r1arg1); // any, return types are not subtype of first overload -var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions -var r1b = [r1arg1, r1arg2]; // generic signature, subtype in both directions +var r1a = [ + r1arg2, + r1arg1 +]; // generic signature, subtype in both directions +var r1b = [ + r1arg1, + r1arg2 +]; // generic signature, subtype in both directions var r2arg1; var r2arg2; var r2 = foo2(r2arg1); -var r2a = [r2arg1, r2arg2]; -var r2b = [r2arg2, r2arg1]; +var r2a = [ + r2arg1, + r2arg2 +]; +var r2b = [ + r2arg2, + r2arg1 +]; var r3arg1; var r3arg2; var r3 = foo3(r3arg1); -var r3a = [r3arg1, r3arg2]; -var r3b = [r3arg2, r3arg1]; +var r3a = [ + r3arg1, + r3arg2 +]; +var r3b = [ + r3arg2, + r3arg1 +]; var r4arg1; var r4arg2; var r4 = foo4(r4arg1); // any -var r4a = [r4arg1, r4arg2]; -var r4b = [r4arg2, r4arg1]; +var r4a = [ + r4arg1, + r4arg2 +]; +var r4b = [ + r4arg2, + r4arg1 +]; var r5arg1; var r5arg2; var r5 = foo5(r5arg1); // any -var r5a = [r5arg1, r5arg2]; -var r5b = [r5arg2, r5arg1]; +var r5a = [ + r5arg1, + r5arg2 +]; +var r5b = [ + r5arg2, + r5arg1 +]; var r6arg1; var r6arg2; var r6 = foo6(r6arg1); // any -var r6a = [r6arg1, r6arg2]; -var r6b = [r6arg2, r6arg1]; +var r6a = [ + r6arg1, + r6arg2 +]; +var r6b = [ + r6arg2, + r6arg1 +]; var r7arg1; var r7arg2; var r7 = foo7(r7arg1); // any -var r7a = [r7arg1, r7arg2]; -var r7b = [r7arg2, r7arg1]; +var r7a = [ + r7arg1, + r7arg2 +]; +var r7b = [ + r7arg2, + r7arg1 +]; var r8arg1; var r8arg2; var r8 = foo8(r8arg1); // any -var r8a = [r8arg1, r8arg2]; -var r8b = [r8arg2, r8arg1]; +var r8a = [ + r8arg1, + r8arg2 +]; +var r8b = [ + r8arg2, + r8arg1 +]; var r9arg1; var r9arg2; var r9 = foo9(r9arg1); // any -var r9a = [r9arg1, r9arg2]; -var r9b = [r9arg2, r9arg1]; +var r9a = [ + r9arg1, + r9arg2 +]; +var r9b = [ + r9arg2, + r9arg1 +]; var r10arg1; var r10arg2; var r10 = foo10(r10arg1); // any -var r10a = [r10arg1, r10arg2]; -var r10b = [r10arg2, r10arg1]; +var r10a = [ + r10arg1, + r10arg2 +]; +var r10b = [ + r10arg2, + r10arg1 +]; var r11arg1; var r11arg2; var r11 = foo11(r11arg1); // any -var r11a = [r11arg1, r11arg2]; -var r11b = [r11arg2, r11arg1]; +var r11a = [ + r11arg1, + r11arg2 +]; +var r11b = [ + r11arg2, + r11arg1 +]; var r12arg1; var r12arg2; var r12 = foo12(r12arg1); // any -var r12a = [r12arg1, r12arg2]; -var r12b = [r12arg2, r12arg1]; +var r12a = [ + r12arg1, + r12arg2 +]; +var r12b = [ + r12arg2, + r12arg1 +]; var r13arg1; var r13arg2; var r13 = foo13(r13arg1); // any -var r13a = [r13arg1, r13arg2]; -var r13b = [r13arg2, r13arg1]; +var r13a = [ + r13arg1, + r13arg2 +]; +var r13b = [ + r13arg2, + r13arg1 +]; var r14arg1; var r14arg2; var r14 = foo14(r14arg1); // any -var r14a = [r14arg1, r14arg2]; -var r14b = [r14arg2, r14arg1]; +var r14a = [ + r14arg1, + r14arg2 +]; +var r14b = [ + r14arg2, + r14arg1 +]; var r15arg1; var r15 = foo15(r15arg1); // any var r16arg1; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js index a74c14e8d4b..f32f26fc693 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js @@ -160,42 +160,90 @@ var Errors; var r1arg1; var r1arg2; var r1 = foo2(r1arg1); // any - var r1a = [r1arg2, r1arg1]; - var r1b = [r1arg1, r1arg2]; + var r1a = [ + r1arg2, + r1arg1 + ]; + var r1b = [ + r1arg1, + r1arg2 + ]; var r2arg1; var r2arg2; var r2 = foo7(r2arg1); // any - var r2a = [r2arg2, r2arg1]; - var r2b = [r2arg1, r2arg2]; + var r2a = [ + r2arg2, + r2arg1 + ]; + var r2b = [ + r2arg1, + r2arg2 + ]; var r3arg1; var r3arg2; var r3 = foo8(r3arg1); // any - var r3a = [r3arg2, r3arg1]; - var r3b = [r3arg1, r3arg2]; + var r3a = [ + r3arg2, + r3arg1 + ]; + var r3b = [ + r3arg1, + r3arg2 + ]; var r4arg1; var r4arg2; var r4 = foo10(r4arg1); // any - var r4a = [r4arg2, r4arg1]; - var r4b = [r4arg1, r4arg2]; + var r4a = [ + r4arg2, + r4arg1 + ]; + var r4b = [ + r4arg1, + r4arg2 + ]; var r5arg1; var r5arg2; var r5 = foo11(r5arg1); // any - var r5a = [r5arg2, r5arg1]; - var r5b = [r5arg1, r5arg2]; + var r5a = [ + r5arg2, + r5arg1 + ]; + var r5b = [ + r5arg1, + r5arg2 + ]; var r6arg1; var r6arg2; var r6 = foo12(r6arg1); // new (x: Array, y: Array) => Array - var r6a = [r6arg2, r6arg1]; - var r6b = [r6arg1, r6arg2]; + var r6a = [ + r6arg2, + r6arg1 + ]; + var r6b = [ + r6arg1, + r6arg2 + ]; var r7arg1; var r7arg2; var r7 = foo15(r7arg1); // (x: { a: string; b: number }) => number): number; - var r7a = [r7arg2, r7arg1]; - var r7b = [r7arg1, r7arg2]; + var r7a = [ + r7arg2, + r7arg1 + ]; + var r7b = [ + r7arg1, + r7arg2 + ]; var r7arg3; var r7c = foo15(r7arg3); // any - var r7d = [r7arg2, r7arg3]; - var r7e = [r7arg3, r7arg2]; + var r7d = [ + r7arg2, + r7arg3 + ]; + var r7e = [ + r7arg3, + r7arg2 + ]; var r8arg; var r8 = foo16(r8arg); // any var r9arg; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.js b/tests/baselines/reference/subtypingWithConstructSignatures4.js index b3d43b03087..4e0783afa47 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures4.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js @@ -148,48 +148,102 @@ var OtherDerived = (function (_super) { var r1arg; var r1arg2; var r1 = foo1(r1arg); -var r1a = [r1arg, r1arg2]; -var r1b = [r1arg2, r1arg]; +var r1a = [ + r1arg, + r1arg2 +]; +var r1b = [ + r1arg2, + r1arg +]; var r2arg; var r2arg2; var r2 = foo2(r2arg); -var r2a = [r2arg, r2arg2]; -var r2b = [r2arg2, r2arg]; +var r2a = [ + r2arg, + r2arg2 +]; +var r2b = [ + r2arg2, + r2arg +]; var r3arg; var r3arg2; var r3 = foo3(r3arg); -var r3a = [r3arg, r3arg2]; -var r3b = [r3arg2, r3arg]; +var r3a = [ + r3arg, + r3arg2 +]; +var r3b = [ + r3arg2, + r3arg +]; var r4arg; var r4arg2; var r4 = foo4(r4arg); -var r4a = [r4arg, r4arg2]; -var r4b = [r4arg2, r4arg]; +var r4a = [ + r4arg, + r4arg2 +]; +var r4b = [ + r4arg2, + r4arg +]; var r5arg; var r5arg2; var r5 = foo5(r5arg); -var r5a = [r5arg, r5arg2]; -var r5b = [r5arg2, r5arg]; +var r5a = [ + r5arg, + r5arg2 +]; +var r5b = [ + r5arg2, + r5arg +]; var r6arg; var r6arg2; var r6 = foo6(r6arg); -var r6a = [r6arg, r6arg2]; -var r6b = [r6arg2, r6arg]; +var r6a = [ + r6arg, + r6arg2 +]; +var r6b = [ + r6arg2, + r6arg +]; var r11arg; var r11arg2; var r11 = foo11(r11arg); -var r11a = [r11arg, r11arg2]; -var r11b = [r11arg2, r11arg]; +var r11a = [ + r11arg, + r11arg2 +]; +var r11b = [ + r11arg2, + r11arg +]; var r15arg; var r15arg2; var r15 = foo15(r15arg); -var r15a = [r15arg, r15arg2]; -var r15b = [r15arg2, r15arg]; +var r15a = [ + r15arg, + r15arg2 +]; +var r15b = [ + r15arg2, + r15arg +]; var r16arg; var r16arg2; var r16 = foo16(r16arg); -var r16a = [r16arg, r16arg2]; -var r16b = [r16arg2, r16arg]; +var r16a = [ + r16arg, + r16arg2 +]; +var r16b = [ + r16arg2, + r16arg +]; var r17arg; var r17 = foo17(r17arg); var r18arg; diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js index 87a7012e91e..f0005c9fe15 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js @@ -77,12 +77,16 @@ module TwoLevels { // Derived member is not optional but base member is, should be ok // object literal case var a; -var b = { Foo: null }; +var b = { + Foo: null +}; var r = true ? a : b; var TwoLevels; (function (TwoLevels) { // object literal case var a; - var b = { Foo: null }; + var b = { + Foo: null + }; var r = true ? a : b; })(TwoLevels || (TwoLevels = {})); diff --git a/tests/baselines/reference/subtypingWithOptionalProperties.js b/tests/baselines/reference/subtypingWithOptionalProperties.js index 4908a92f2e5..48f73e72b0e 100644 --- a/tests/baselines/reference/subtypingWithOptionalProperties.js +++ b/tests/baselines/reference/subtypingWithOptionalProperties.js @@ -17,5 +17,7 @@ function f(a) { var b = a; return b; } -var r = f({ s: new Object() }); // ok +var r = f({ + s: new Object() +}); // ok r.s && r.s.toFixed(); // would blow up at runtime diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js index 3d9080b76e1..c9ab251443f 100644 --- a/tests/baselines/reference/superAccess.js +++ b/tests/baselines/reference/superAccess.js @@ -23,7 +23,9 @@ var __extends = this.__extends || function (d, b) { var MyBase = (function () { function MyBase() { this.S2 = "test"; - this.f = function () { return 5; }; + this.f = function () { + return 5; + }; } MyBase.S1 = 5; return MyBase; diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js index 7d8f7a9e643..cd3d9c63e41 100644 --- a/tests/baselines/reference/superAccess2.js +++ b/tests/baselines/reference/superAccess2.js @@ -34,8 +34,10 @@ var __extends = this.__extends || function (d, b) { var P = (function () { function P() { } - P.prototype.x = function () { }; - P.y = function () { }; + P.prototype.x = function () { + }; + P.y = function () { + }; return P; })(); var Q = (function (_super) { @@ -45,7 +47,9 @@ var Q = (function (_super) { var _this = this; if (z === void 0) { z = _super.prototype.; } if (zz === void 0) { zz = _super.prototype.; } - if (zzz === void 0) { zzz = function () { return _super.prototype.; }; } + if (zzz === void 0) { zzz = function () { + return _super.prototype.; + }; } _super.call(this); this.z = z; this.xx = _super.prototype.; diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js index 92abed0d66d..bbfd81879bb 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js @@ -26,7 +26,9 @@ var A = (function () { var B = (function (_super) { __extends(B, _super); function B() { - _super.call(this, function (value) { return String(value); }); + _super.call(this, function (value) { + return String(value); + }); } return B; })(A); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js index 7e3c61e6690..11eb82025a6 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js @@ -26,7 +26,9 @@ var A = (function () { var B = (function (_super) { __extends(B, _super); function B() { - _super.call(this, function (value) { return String(value); }); + _super.call(this, function (value) { + return String(value); + }); } return B; })(A); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js index b48d5bb7f58..b6caa0880ca 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js @@ -26,7 +26,9 @@ var A = (function () { var B = (function (_super) { __extends(B, _super); function B() { - _super.call(this, function (value) { return String(value); }); + _super.call(this, function (value) { + return String(value); + }); } return B; })(A); diff --git a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js index 7818aed7ff8..3f4c24297e1 100644 --- a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js +++ b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js @@ -19,7 +19,9 @@ var A = (function () { })(); var B = (function () { function B() { - _super.call(this, function (value) { return String(value); }); + _super.call(this, function (value) { + return String(value); + }); } return B; })(); diff --git a/tests/baselines/reference/superCallFromFunction1.js b/tests/baselines/reference/superCallFromFunction1.js index a7fcbaaeff0..ecc78aa5397 100644 --- a/tests/baselines/reference/superCallFromFunction1.js +++ b/tests/baselines/reference/superCallFromFunction1.js @@ -6,5 +6,7 @@ function foo() { //// [superCallFromFunction1.js] function foo() { - _super.call(this, function (value) { return String(value); }); + _super.call(this, function (value) { + return String(value); + }); } diff --git a/tests/baselines/reference/superCallInNonStaticMethod.js b/tests/baselines/reference/superCallInNonStaticMethod.js index 7ef1ce1c62a..cf29ac3b1a4 100644 --- a/tests/baselines/reference/superCallInNonStaticMethod.js +++ b/tests/baselines/reference/superCallInNonStaticMethod.js @@ -70,7 +70,9 @@ var Other = (function (_super) { var _this = this; _super.call(this); this.propertyInitializer = _super.prototype.instanceMethod.call(this); - this.functionProperty = function () { _super.prototype.instanceMethod.call(_this); }; + this.functionProperty = function () { + _super.prototype.instanceMethod.call(_this); + }; _super.prototype.instanceMethod.call(this); } // in instance method diff --git a/tests/baselines/reference/superCallOutsideConstructor.js b/tests/baselines/reference/superCallOutsideConstructor.js index 94f41cccb57..32d45b044f5 100644 --- a/tests/baselines/reference/superCallOutsideConstructor.js +++ b/tests/baselines/reference/superCallOutsideConstructor.js @@ -32,7 +32,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; return C; })(); var D = (function (_super) { diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.js b/tests/baselines/reference/superCallParameterContextualTyping1.js index b11d62d62c8..0df2159c40c 100644 --- a/tests/baselines/reference/superCallParameterContextualTyping1.js +++ b/tests/baselines/reference/superCallParameterContextualTyping1.js @@ -29,7 +29,9 @@ var B = (function (_super) { __extends(B, _super); // Ensure 'value' is of type 'number (and not '{}') by using its 'toExponential()' method. function B() { - _super.call(this, function (value) { return String(value.toExponential()); }); + _super.call(this, function (value) { + return String(value.toExponential()); + }); } return B; })(A); diff --git a/tests/baselines/reference/superCallParameterContextualTyping2.js b/tests/baselines/reference/superCallParameterContextualTyping2.js index 61e8b94f00f..cfd2c452ada 100644 --- a/tests/baselines/reference/superCallParameterContextualTyping2.js +++ b/tests/baselines/reference/superCallParameterContextualTyping2.js @@ -28,7 +28,9 @@ var C = (function (_super) { __extends(C, _super); // Ensure 'value' is not of type 'any' by invoking it with type arguments. function C() { - _super.call(this, function (value) { return String(value()); }); + _super.call(this, function (value) { + return String(value()); + }); } return C; })(A); diff --git a/tests/baselines/reference/superCalls.js b/tests/baselines/reference/superCalls.js index 2928793feb6..e714a4db191 100644 --- a/tests/baselines/reference/superCalls.js +++ b/tests/baselines/reference/superCalls.js @@ -43,7 +43,8 @@ var Base = (function () { } return Base; })(); -function v() { } +function v() { +} var Derived = (function (_super) { __extends(Derived, _super); //super call in class constructor of derived type diff --git a/tests/baselines/reference/superCallsInConstructor.js b/tests/baselines/reference/superCallsInConstructor.js index 0c19e365d92..912bfab349b 100644 --- a/tests/baselines/reference/superCallsInConstructor.js +++ b/tests/baselines/reference/superCallsInConstructor.js @@ -30,8 +30,10 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function () { }; - C.prototype.bar = function () { }; + C.prototype.foo = function () { + }; + C.prototype.bar = function () { + }; return C; })(); var Base = (function () { @@ -47,7 +49,8 @@ var Derived = (function (_super) { _super.call(this); bar(); } - try { } + try { + } catch (e) { _super.call(this); } diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js index ce49da10687..2dc2db1a3d4 100644 --- a/tests/baselines/reference/superErrors.js +++ b/tests/baselines/reference/superErrors.js @@ -61,8 +61,16 @@ var __extends = this.__extends || function (d, b) { function foo() { // super in a non class context var x = super.; - var y = function () { return super.; }; - var z = function () { return function () { return function () { return super.; }; }; }; + var y = function () { + return super.; + }; + var z = function () { + return function () { + return function () { + return super.; + }; + }; + }; } var User = (function () { function User() { @@ -84,27 +92,47 @@ var RegisteredUser = (function (_super) { } // super call in a lambda in an inner function in a constructor function inner2() { - var x = function () { return super.sayHello.call(this); }; + var x = function () { + return super.sayHello.call(this); + }; } // super call in a lambda in a function expression in a constructor - (function () { return function () { return super.; }; })(); + (function () { + return function () { + return super.; + }; + })(); } RegisteredUser.prototype.sayHello = function () { // super call in a method _super.prototype.sayHello.call(this); // super call in a lambda in an inner function in a method function inner() { - var x = function () { return super.sayHello.call(this); }; + var x = function () { + return super.sayHello.call(this); + }; } // super call in a lambda in a function expression in a constructor - (function () { return function () { return super.; }; })(); + (function () { + return function () { + return super.; + }; + })(); }; RegisteredUser.staticFunction = function () { var _this = this; // super in static functions var s = _super.; - var x = function () { return _super.; }; - var y = function () { return function () { return function () { return _super.; }; }; }; + var x = function () { + return _super.; + }; + var y = function () { + return function () { + return function () { + return _super.; + }; + }; + }; }; return RegisteredUser; })(User); diff --git a/tests/baselines/reference/superInCatchBlock1.js b/tests/baselines/reference/superInCatchBlock1.js index 1b9085ec266..f94c0511277 100644 --- a/tests/baselines/reference/superInCatchBlock1.js +++ b/tests/baselines/reference/superInCatchBlock1.js @@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) { var A = (function () { function A() { } - A.prototype.m = function () { }; + A.prototype.m = function () { + }; return A; })(); var B = (function (_super) { diff --git a/tests/baselines/reference/superInLambdas.js b/tests/baselines/reference/superInLambdas.js index 10c489f1b40..f7e3c4706c4 100644 --- a/tests/baselines/reference/superInLambdas.js +++ b/tests/baselines/reference/superInLambdas.js @@ -92,14 +92,18 @@ var RegisteredUser = (function (_super) { // super call in a constructor _super.prototype.sayHello.call(this); // super call in a lambda in a constructor - var x = function () { return _super.prototype.sayHello.call(_this); }; + var x = function () { + return _super.prototype.sayHello.call(_this); + }; } RegisteredUser.prototype.sayHello = function () { var _this = this; // super call in a method _super.prototype.sayHello.call(this); // super call in a lambda in a method - var x = function () { return _super.prototype.sayHello.call(_this); }; + var x = function () { + return _super.prototype.sayHello.call(_this); + }; }; return RegisteredUser; })(User); @@ -110,12 +114,24 @@ var RegisteredUser2 = (function (_super) { _super.call(this); this.name = "Joe"; // super call in a nested lambda in a constructor - var x = function () { return function () { return function () { return _super.prototype.sayHello.call(_this); }; }; }; + var x = function () { + return function () { + return function () { + return _super.prototype.sayHello.call(_this); + }; + }; + }; } RegisteredUser2.prototype.sayHello = function () { var _this = this; // super call in a nested lambda in a method - var x = function () { return function () { return function () { return _super.prototype.sayHello.call(_this); }; }; }; + var x = function () { + return function () { + return function () { + return _super.prototype.sayHello.call(_this); + }; + }; + }; }; return RegisteredUser2; })(User); @@ -126,12 +142,24 @@ var RegisteredUser3 = (function (_super) { _super.call(this); this.name = "Sam"; // super property in a nested lambda in a constructor - var superName = function () { return function () { return function () { return _super.prototype.name; }; }; }; + var superName = function () { + return function () { + return function () { + return _super.prototype.name; + }; + }; + }; } RegisteredUser3.prototype.sayHello = function () { var _this = this; // super property in a nested lambda in a method - var superName = function () { return function () { return function () { return _super.prototype.name; }; }; }; + var superName = function () { + return function () { + return function () { + return _super.prototype.name; + }; + }; + }; }; return RegisteredUser3; })(User); @@ -142,12 +170,20 @@ var RegisteredUser4 = (function (_super) { _super.call(this); this.name = "Mark"; // super in a nested lambda in a constructor - var x = function () { return function () { return _super.prototype.; }; }; + var x = function () { + return function () { + return _super.prototype.; + }; + }; } RegisteredUser4.prototype.sayHello = function () { var _this = this; // super in a nested lambda in a method - var x = function () { return function () { return _super.prototype.; }; }; + var x = function () { + return function () { + return _super.prototype.; + }; + }; }; return RegisteredUser4; })(User); diff --git a/tests/baselines/reference/superNewCall1.js b/tests/baselines/reference/superNewCall1.js index d9b74ac5080..b0ec9899a52 100644 --- a/tests/baselines/reference/superNewCall1.js +++ b/tests/baselines/reference/superNewCall1.js @@ -28,7 +28,9 @@ var A = (function () { var B = (function (_super) { __extends(B, _super); function B() { - new _super.prototype(function (value) { return String(value); }); + new _super.prototype(function (value) { + return String(value); + }); } return B; })(A); diff --git a/tests/baselines/reference/superPropertyAccess.js b/tests/baselines/reference/superPropertyAccess.js index a5419aaf36e..a9ee2352c76 100644 --- a/tests/baselines/reference/superPropertyAccess.js +++ b/tests/baselines/reference/superPropertyAccess.js @@ -45,15 +45,22 @@ var __extends = this.__extends || function (d, b) { }; var MyBase = (function () { function MyBase() { - this.m2 = function () { }; + this.m2 = function () { + }; this.d1 = 42; this.d2 = 42; } - MyBase.prototype.m1 = function (a) { return a; }; - MyBase.prototype.p1 = function () { }; + MyBase.prototype.m1 = function (a) { + return a; + }; + MyBase.prototype.p1 = function () { + }; Object.defineProperty(MyBase.prototype, "value", { - get: function () { return 0; }, - set: function (v) { }, + get: function () { + return 0; + }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -72,7 +79,9 @@ var MyDerived = (function (_super) { _super.prototype.p1.call(this); // Should error, private not public instance member function var l1 = _super.prototype.d1; // Should error, instance data property not a public instance member function var l1 = _super.prototype.d2; // Should error, instance data property not a public instance member function - _super.prototype.m1 = function (a) { return ""; }; // Should be allowed, we will not restrict assignment + _super.prototype.m1 = function (a) { + return ""; + }; // Should be allowed, we will not restrict assignment _super.prototype.value = 0; // Should error, instance data property not a public instance member function var z = _super.prototype.value; // Should error, instance data property not a public instance member function }; diff --git a/tests/baselines/reference/superPropertyAccess1.js b/tests/baselines/reference/superPropertyAccess1.js index a0a52526f93..8b1e855e0a3 100644 --- a/tests/baselines/reference/superPropertyAccess1.js +++ b/tests/baselines/reference/superPropertyAccess1.js @@ -37,7 +37,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.foo = function () { }; + C.prototype.foo = function () { + }; Object.defineProperty(C.prototype, "x", { get: function () { return 1; @@ -45,7 +46,8 @@ var C = (function () { enumerable: true, configurable: true }); - C.prototype.bar = function () { }; + C.prototype.bar = function () { + }; return C; })(); var D = (function (_super) { diff --git a/tests/baselines/reference/superPropertyAccess2.js b/tests/baselines/reference/superPropertyAccess2.js index b906f1b0a8b..98beb078e2f 100644 --- a/tests/baselines/reference/superPropertyAccess2.js +++ b/tests/baselines/reference/superPropertyAccess2.js @@ -37,7 +37,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.foo = function () { }; + C.foo = function () { + }; Object.defineProperty(C.prototype, "x", { get: function () { return 1; @@ -45,7 +46,8 @@ var C = (function () { enumerable: true, configurable: true }); - C.bar = function () { }; + C.bar = function () { + }; return C; })(); var D = (function (_super) { diff --git a/tests/baselines/reference/superPropertyAccessNoError.js b/tests/baselines/reference/superPropertyAccessNoError.js index e49a2c6b719..086ead2e16d 100644 --- a/tests/baselines/reference/superPropertyAccessNoError.js +++ b/tests/baselines/reference/superPropertyAccessNoError.js @@ -95,7 +95,9 @@ var SomeDerivedClass = (function (_super) { var _this = this; var x = _super.prototype.func.call(this); var x; - var y = function () { return _super.prototype.func.call(_this); }; + var y = function () { + return _super.prototype.func.call(_this); + }; }; Object.defineProperty(SomeDerivedClass.prototype, "a", { get: function () { diff --git a/tests/baselines/reference/superWithTypeArgument3.js b/tests/baselines/reference/superWithTypeArgument3.js index ef228a3ba20..8277fe0506e 100644 --- a/tests/baselines/reference/superWithTypeArgument3.js +++ b/tests/baselines/reference/superWithTypeArgument3.js @@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C() { } - C.prototype.bar = function (x) { }; + C.prototype.bar = function (x) { + }; return C; })(); var D = (function (_super) { 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 7fd55d221ab..48ae609cdc6 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 @@ -52,7 +52,9 @@ var ObjectLiteral; var F = (function () { function F() { } - F.prototype.test = function () { return ""; }; + F.prototype.test = function () { + return ""; + }; return F; })(); var SuperObjectTest = (function (_super) { diff --git a/tests/baselines/reference/switchAssignmentCompat.js b/tests/baselines/reference/switchAssignmentCompat.js index 1e6792ee378..4743e5d7eb3 100644 --- a/tests/baselines/reference/switchAssignmentCompat.js +++ b/tests/baselines/reference/switchAssignmentCompat.js @@ -13,5 +13,6 @@ var Foo = (function () { return Foo; })(); switch (0) { - case Foo: break; // Error expected + case Foo: + break; // Error expected } diff --git a/tests/baselines/reference/switchBreakStatements.js b/tests/baselines/reference/switchBreakStatements.js index 534f025e2f5..810c9909233 100644 --- a/tests/baselines/reference/switchBreakStatements.js +++ b/tests/baselines/reference/switchBreakStatements.js @@ -91,7 +91,8 @@ SEVEN: switch ('') { break SEVEN; EIGHT: switch ('') { case 'a': - var fn = function () { }; + var fn = function () { + }; break EIGHT; } } diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js index ca354779be1..546d03dec92 100644 --- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js +++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js @@ -25,16 +25,24 @@ var Foo = (function () { return Foo; })(); switch (0) { - case Foo: break; // Error - case "sss": break; // Error - case 123: break; // No Error - case true: break; // Error + case Foo: + break; // Error + case "sss": + break; // Error + case 123: + break; // No Error + case true: + break; // Error } var s = 0; // No error for all switch (s) { - case Foo: break; - case "sss": break; - case 123: break; - case true: break; + case Foo: + break; + case "sss": + break; + case 123: + break; + case true: + break; } diff --git a/tests/baselines/reference/switchFallThroughs.js b/tests/baselines/reference/switchFallThroughs.js index 53f221bd467..b38c6b6f0ab 100644 --- a/tests/baselines/reference/switchFallThroughs.js +++ b/tests/baselines/reference/switchFallThroughs.js @@ -26,9 +26,10 @@ function R1(index) { var a = 'a'; return a; case 3: - case 4: { - return 'b'; - } + case 4: + { + return 'b'; + } case 5: default: return 'c'; diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js index 6348ca62e78..699871d9dd2 100644 --- a/tests/baselines/reference/switchStatements.js +++ b/tests/baselines/reference/switchStatements.js @@ -81,13 +81,21 @@ switch (x) { case /[a-z]/: case []: case {}: - case { id: 12 }: - case ['a']: + case { + id: 12 + }: + case [ + 'a' + ]: case typeof x: case typeof M: case M.fn(1): - case function (x) { return ''; }: - case (function (x) { return ''; })(2): + case function (x) { + return ''; + }: + case (function (x) { + return ''; + })(2): default: } // basic assignable check, rest covered in tests for 'assignement compatibility' @@ -105,7 +113,10 @@ var D = (function (_super) { })(C); switch (new C()) { case new D(): - case { id: 12, name: '' }: + case { + id: 12, + name: '' + }: case new C(): } switch ('') { @@ -128,11 +139,19 @@ switch ([]) { } switch ({}) { } -switch ({ id: 12 }) { +switch ({ + id: 12 +}) { } -switch (['a']) { +switch ([ + 'a' +]) { } -switch (function (x) { return ''; }) { +switch (function (x) { + return ''; +}) { } -switch ((function (x) { return ''; })(1)) { +switch ((function (x) { + return ''; +})(1)) { } diff --git a/tests/baselines/reference/switchStatementsWithMultipleDefaults.js b/tests/baselines/reference/switchStatementsWithMultipleDefaults.js index a17abe5711d..09a1a70a5d9 100644 --- a/tests/baselines/reference/switchStatementsWithMultipleDefaults.js +++ b/tests/baselines/reference/switchStatementsWithMultipleDefaults.js @@ -56,7 +56,8 @@ switch (x) { default: // Error, third 'default' clause default: // Error, fourth 'default' clause. // Errors on fifth-seventh - default: return; + default: + return; default: default: } diff --git a/tests/baselines/reference/symbolDeclarationEmit10.js b/tests/baselines/reference/symbolDeclarationEmit10.js index 0c46d8750e9..7ace6617db5 100644 --- a/tests/baselines/reference/symbolDeclarationEmit10.js +++ b/tests/baselines/reference/symbolDeclarationEmit10.js @@ -6,8 +6,11 @@ var obj = { //// [symbolDeclarationEmit10.js] var obj = { - get [Symbol.isConcatSpreadable]() { return ''; }, - set [Symbol.isConcatSpreadable](x) { } + get [Symbol.isConcatSpreadable]() { + return ''; + }, + set [Symbol.isConcatSpreadable](x) { + } }; diff --git a/tests/baselines/reference/symbolDeclarationEmit11.js b/tests/baselines/reference/symbolDeclarationEmit11.js index e5822104bf8..c9c819eefa2 100644 --- a/tests/baselines/reference/symbolDeclarationEmit11.js +++ b/tests/baselines/reference/symbolDeclarationEmit11.js @@ -10,10 +10,14 @@ class C { var C = (function () { function C() { } - C[Symbol.toPrimitive] = function () { }; + C[Symbol.toPrimitive] = function () { + }; Object.defineProperty(C, Symbol.isRegExp, { - get: function () { return ""; }, - set: function (x) { }, + get: function () { + return ""; + }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index 68a256bd39d..49ff8b35976 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -18,13 +18,17 @@ var M; var C = (function () { function C() { } - C.prototype[Symbol.toPrimitive] = function (x) { }; + C.prototype[Symbol.toPrimitive] = function (x) { + }; C.prototype[Symbol.isConcatSpreadable] = function () { return undefined; }; Object.defineProperty(C.prototype, Symbol.isRegExp, { - get: function () { return undefined; }, - set: function (x) { }, + get: function () { + return undefined; + }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/symbolDeclarationEmit13.js b/tests/baselines/reference/symbolDeclarationEmit13.js index acf470ffce1..51b6edcece5 100644 --- a/tests/baselines/reference/symbolDeclarationEmit13.js +++ b/tests/baselines/reference/symbolDeclarationEmit13.js @@ -9,12 +9,15 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, Symbol.isRegExp, { - get: function () { return ""; }, + get: function () { + return ""; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, Symbol.toStringTag, { - set: function (x) { }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/symbolDeclarationEmit14.js b/tests/baselines/reference/symbolDeclarationEmit14.js index 64330c6ce92..d81bc329927 100644 --- a/tests/baselines/reference/symbolDeclarationEmit14.js +++ b/tests/baselines/reference/symbolDeclarationEmit14.js @@ -9,12 +9,16 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, Symbol.isRegExp, { - get: function () { return ""; }, + get: function () { + return ""; + }, enumerable: true, configurable: true }); Object.defineProperty(C.prototype, Symbol.toStringTag, { - get: function () { return ""; }, + get: function () { + return ""; + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/symbolDeclarationEmit3.js b/tests/baselines/reference/symbolDeclarationEmit3.js index e3b22d883c8..6d06c09bd69 100644 --- a/tests/baselines/reference/symbolDeclarationEmit3.js +++ b/tests/baselines/reference/symbolDeclarationEmit3.js @@ -9,7 +9,8 @@ class C { var C = (function () { function C() { } - C.prototype[Symbol.isRegExp] = function (x) { }; + C.prototype[Symbol.isRegExp] = function (x) { + }; return C; })(); diff --git a/tests/baselines/reference/symbolDeclarationEmit4.js b/tests/baselines/reference/symbolDeclarationEmit4.js index cfe3a14122d..cd3fc53a5bb 100644 --- a/tests/baselines/reference/symbolDeclarationEmit4.js +++ b/tests/baselines/reference/symbolDeclarationEmit4.js @@ -9,8 +9,11 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, Symbol.isRegExp, { - get: function () { return ""; }, - set: function (x) { }, + get: function () { + return ""; + }, + set: function (x) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/symbolDeclarationEmit9.js b/tests/baselines/reference/symbolDeclarationEmit9.js index d38171767a5..8cdb7173144 100644 --- a/tests/baselines/reference/symbolDeclarationEmit9.js +++ b/tests/baselines/reference/symbolDeclarationEmit9.js @@ -5,7 +5,8 @@ var obj = { //// [symbolDeclarationEmit9.js] var obj = { - [Symbol.isConcatSpreadable]() { } + [Symbol.isConcatSpreadable]() { + } }; diff --git a/tests/baselines/reference/symbolProperty1.js b/tests/baselines/reference/symbolProperty1.js index 0117dd3b1c2..1537883f4ec 100644 --- a/tests/baselines/reference/symbolProperty1.js +++ b/tests/baselines/reference/symbolProperty1.js @@ -12,7 +12,8 @@ var x = { var s; var x = { [s]: 0, - [s]() { }, + [s]() { + }, get [s]() { return 0; } diff --git a/tests/baselines/reference/symbolProperty18.js b/tests/baselines/reference/symbolProperty18.js index 1d0a57e7b50..ff69588be31 100644 --- a/tests/baselines/reference/symbolProperty18.js +++ b/tests/baselines/reference/symbolProperty18.js @@ -12,8 +12,11 @@ i[Symbol.toPrimitive] = false; //// [symbolProperty18.js] var i = { [Symbol.iterator]: 0, - [Symbol.toStringTag]() { return ""; }, - set [Symbol.toPrimitive](p) { } + [Symbol.toStringTag]() { + return ""; + }, + set [Symbol.toPrimitive](p) { + } }; var it = i[Symbol.iterator]; var str = i[Symbol.toStringTag](); diff --git a/tests/baselines/reference/symbolProperty19.js b/tests/baselines/reference/symbolProperty19.js index 5ec7968218a..d4bfd0dc7c7 100644 --- a/tests/baselines/reference/symbolProperty19.js +++ b/tests/baselines/reference/symbolProperty19.js @@ -9,8 +9,14 @@ var str = i[Symbol.toStringTag](); //// [symbolProperty19.js] var i = { - [Symbol.iterator]: { p: null }, - [Symbol.toStringTag]() { return { p: undefined }; } + [Symbol.iterator]: { + p: null + }, + [Symbol.toStringTag]() { + return { + p: undefined + }; + } }; var it = i[Symbol.iterator]; var str = i[Symbol.toStringTag](); diff --git a/tests/baselines/reference/symbolProperty2.js b/tests/baselines/reference/symbolProperty2.js index 0158366f9d5..5c0f89b0257 100644 --- a/tests/baselines/reference/symbolProperty2.js +++ b/tests/baselines/reference/symbolProperty2.js @@ -12,7 +12,8 @@ var x = { var s = Symbol(); var x = { [s]: 0, - [s]() { }, + [s]() { + }, get [s]() { return 0; } diff --git a/tests/baselines/reference/symbolProperty20.js b/tests/baselines/reference/symbolProperty20.js index dd60a87cbea..cfb763dc207 100644 --- a/tests/baselines/reference/symbolProperty20.js +++ b/tests/baselines/reference/symbolProperty20.js @@ -12,5 +12,7 @@ var i: I = { //// [symbolProperty20.js] var i = { [Symbol.iterator]: s => s, - [Symbol.toStringTag](n) { return n; } + [Symbol.toStringTag](n) { + return n; + } }; diff --git a/tests/baselines/reference/symbolProperty22.js b/tests/baselines/reference/symbolProperty22.js index d4609c74d36..19989106e56 100644 --- a/tests/baselines/reference/symbolProperty22.js +++ b/tests/baselines/reference/symbolProperty22.js @@ -8,4 +8,6 @@ declare function foo(p1: T, p2: I): U; foo("", { [Symbol.unscopables]: s => s.length }); //// [symbolProperty22.js] -foo("", { [Symbol.unscopables]: s => s.length }); +foo("", { + [Symbol.unscopables]: s => s.length +}); diff --git a/tests/baselines/reference/symbolProperty28.js b/tests/baselines/reference/symbolProperty28.js index 219a192e381..57c826cb7ab 100644 --- a/tests/baselines/reference/symbolProperty28.js +++ b/tests/baselines/reference/symbolProperty28.js @@ -21,7 +21,9 @@ var C1 = (function () { function C1() { } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(); diff --git a/tests/baselines/reference/symbolProperty29.js b/tests/baselines/reference/symbolProperty29.js index f7fee99f6a1..da6afdc6420 100644 --- a/tests/baselines/reference/symbolProperty29.js +++ b/tests/baselines/reference/symbolProperty29.js @@ -11,7 +11,9 @@ var C1 = (function () { function C1() { } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(); diff --git a/tests/baselines/reference/symbolProperty3.js b/tests/baselines/reference/symbolProperty3.js index dda9ca23d32..6159b10f9f3 100644 --- a/tests/baselines/reference/symbolProperty3.js +++ b/tests/baselines/reference/symbolProperty3.js @@ -12,7 +12,8 @@ var x = { var s = Symbol; var x = { [s]: 0, - [s]() { }, + [s]() { + }, get [s]() { return 0; } diff --git a/tests/baselines/reference/symbolProperty30.js b/tests/baselines/reference/symbolProperty30.js index bdb108015cf..af151e0efd5 100644 --- a/tests/baselines/reference/symbolProperty30.js +++ b/tests/baselines/reference/symbolProperty30.js @@ -11,7 +11,9 @@ var C1 = (function () { function C1() { } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(); diff --git a/tests/baselines/reference/symbolProperty31.js b/tests/baselines/reference/symbolProperty31.js index cf532774652..e8388225dd7 100644 --- a/tests/baselines/reference/symbolProperty31.js +++ b/tests/baselines/reference/symbolProperty31.js @@ -19,7 +19,9 @@ var C1 = (function () { function C1() { } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(); diff --git a/tests/baselines/reference/symbolProperty32.js b/tests/baselines/reference/symbolProperty32.js index 73e4bffdc01..b544c60da7e 100644 --- a/tests/baselines/reference/symbolProperty32.js +++ b/tests/baselines/reference/symbolProperty32.js @@ -19,7 +19,9 @@ var C1 = (function () { function C1() { } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(); diff --git a/tests/baselines/reference/symbolProperty33.js b/tests/baselines/reference/symbolProperty33.js index f5a08010338..082c0fe7e65 100644 --- a/tests/baselines/reference/symbolProperty33.js +++ b/tests/baselines/reference/symbolProperty33.js @@ -21,7 +21,9 @@ var C1 = (function (_super) { _super.apply(this, arguments); } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(C2); diff --git a/tests/baselines/reference/symbolProperty34.js b/tests/baselines/reference/symbolProperty34.js index 5b25f487fbf..de7d722227b 100644 --- a/tests/baselines/reference/symbolProperty34.js +++ b/tests/baselines/reference/symbolProperty34.js @@ -21,7 +21,9 @@ var C1 = (function (_super) { _super.apply(this, arguments); } C1.prototype[Symbol.toStringTag] = function () { - return { x: "" }; + return { + x: "" + }; }; return C1; })(C2); diff --git a/tests/baselines/reference/symbolProperty4.js b/tests/baselines/reference/symbolProperty4.js index 6072d6bbf72..be7cdab5f85 100644 --- a/tests/baselines/reference/symbolProperty4.js +++ b/tests/baselines/reference/symbolProperty4.js @@ -10,7 +10,8 @@ var x = { //// [symbolProperty4.js] var x = { [Symbol()]: 0, - [Symbol()]() { }, + [Symbol()]() { + }, get [Symbol()]() { return 0; } diff --git a/tests/baselines/reference/symbolProperty48.js b/tests/baselines/reference/symbolProperty48.js index 48717470f2f..b0dc2b46dba 100644 --- a/tests/baselines/reference/symbolProperty48.js +++ b/tests/baselines/reference/symbolProperty48.js @@ -14,7 +14,8 @@ var M; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = function () { }; + C.prototype[Symbol.iterator] = function () { + }; return C; })(); })(M || (M = {})); diff --git a/tests/baselines/reference/symbolProperty49.js b/tests/baselines/reference/symbolProperty49.js index 6c115a89ae4..ea6e6f2c523 100644 --- a/tests/baselines/reference/symbolProperty49.js +++ b/tests/baselines/reference/symbolProperty49.js @@ -14,7 +14,8 @@ var M; var C = (function () { function C() { } - C.prototype[M.Symbol.iterator] = function () { }; + C.prototype[M.Symbol.iterator] = function () { + }; return C; })(); })(M || (M = {})); diff --git a/tests/baselines/reference/symbolProperty5.js b/tests/baselines/reference/symbolProperty5.js index c7c88681f8a..9f0ff3d688f 100644 --- a/tests/baselines/reference/symbolProperty5.js +++ b/tests/baselines/reference/symbolProperty5.js @@ -10,7 +10,8 @@ var x = { //// [symbolProperty5.js] var x = { [Symbol.iterator]: 0, - [Symbol.isRegExp]() { }, + [Symbol.isRegExp]() { + }, get [Symbol.toStringTag]() { return 0; } diff --git a/tests/baselines/reference/symbolProperty50.js b/tests/baselines/reference/symbolProperty50.js index 61ded053938..0a668e95509 100644 --- a/tests/baselines/reference/symbolProperty50.js +++ b/tests/baselines/reference/symbolProperty50.js @@ -13,7 +13,8 @@ var M; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = function () { }; + C.prototype[Symbol.iterator] = function () { + }; return C; })(); })(M || (M = {})); diff --git a/tests/baselines/reference/symbolProperty51.js b/tests/baselines/reference/symbolProperty51.js index 246dbaaa173..b3b9902fcd6 100644 --- a/tests/baselines/reference/symbolProperty51.js +++ b/tests/baselines/reference/symbolProperty51.js @@ -13,7 +13,8 @@ var M; var C = (function () { function C() { } - C.prototype[Symbol.iterator] = function () { }; + C.prototype[Symbol.iterator] = function () { + }; return C; })(); })(M || (M = {})); diff --git a/tests/baselines/reference/symbolProperty6.js b/tests/baselines/reference/symbolProperty6.js index aee61b97435..114999dc873 100644 --- a/tests/baselines/reference/symbolProperty6.js +++ b/tests/baselines/reference/symbolProperty6.js @@ -13,7 +13,8 @@ var C = (function () { function C() { this[Symbol.iterator] = 0; } - C.prototype[Symbol.isRegExp] = function () { }; + C.prototype[Symbol.isRegExp] = function () { + }; Object.defineProperty(C.prototype, Symbol.toStringTag, { get: function () { return 0; diff --git a/tests/baselines/reference/symbolProperty7.js b/tests/baselines/reference/symbolProperty7.js index 781113572a1..42d19616ce3 100644 --- a/tests/baselines/reference/symbolProperty7.js +++ b/tests/baselines/reference/symbolProperty7.js @@ -13,7 +13,8 @@ var C = (function () { function C() { this[Symbol()] = 0; } - C.prototype[Symbol()] = function () { }; + C.prototype[Symbol()] = function () { + }; Object.defineProperty(C.prototype, Symbol(), { get: function () { return 0; diff --git a/tests/baselines/reference/symbolType13.js b/tests/baselines/reference/symbolType13.js index afd62079bb5..56aef2cc8e6 100644 --- a/tests/baselines/reference/symbolType13.js +++ b/tests/baselines/reference/symbolType13.js @@ -9,6 +9,9 @@ for (var y in s) { } //// [symbolType13.js] var s = Symbol(); var x; -for (s in {}) { } -for (x in s) { } -for (var y in s) { } +for (s in {}) { +} +for (x in s) { +} +for (var y in s) { +} diff --git a/tests/baselines/reference/taggedTemplateContextualTyping1.js b/tests/baselines/reference/taggedTemplateContextualTyping1.js index 17618b50e8b..173d0f56bb7 100644 --- a/tests/baselines/reference/taggedTemplateContextualTyping1.js +++ b/tests/baselines/reference/taggedTemplateContextualTyping1.js @@ -26,7 +26,28 @@ function tempTag1(...rest) { // Otherwise, the arrow functions' parameters will be typed as 'any', // and it is an error to invoke an any-typed value with type arguments, // so this test will error. -tempTag1 `${x => { x(undefined); return x; }}${10}`; -tempTag1 `${x => { x(undefined); return x; }}${y => { y(undefined); return y; }}${10}`; -tempTag1 `${x => { x(undefined); return x; }}${(y) => { y(undefined); return y; }}${undefined}`; -tempTag1 `${(x) => { x(undefined); return x; }}${y => { y(undefined); return y; }}${undefined}`; +tempTag1 `${x => { + x(undefined); + return x; +}}${10}`; +tempTag1 `${x => { + x(undefined); + return x; +}}${y => { + y(undefined); + return y; +}}${10}`; +tempTag1 `${x => { + x(undefined); + return x; +}}${(y) => { + y(undefined); + return y; +}}${undefined}`; +tempTag1 `${(x) => { + x(undefined); + return x; +}}${y => { + y(undefined); + return y; +}}${undefined}`; diff --git a/tests/baselines/reference/taggedTemplateContextualTyping2.js b/tests/baselines/reference/taggedTemplateContextualTyping2.js index 8adea53f470..1eed600da4c 100644 --- a/tests/baselines/reference/taggedTemplateContextualTyping2.js +++ b/tests/baselines/reference/taggedTemplateContextualTyping2.js @@ -25,6 +25,18 @@ function tempTag2(...rest) { // Otherwise, the arrow functions' parameters will be typed as 'any', // and it is an error to invoke an any-typed value with type arguments, // so this test will error. -tempTag2 `${x => { x(undefined); return x; }}${0}`; -tempTag2 `${x => { x(undefined); return x; }}${y => { y(null); return y; }}${"hello"}`; -tempTag2 `${x => { x(undefined); return x; }}${undefined}${"hello"}`; +tempTag2 `${x => { + x(undefined); + return x; +}}${0}`; +tempTag2 `${x => { + x(undefined); + return x; +}}${y => { + y(null); + return y; +}}${"hello"}`; +tempTag2 `${x => { + x(undefined); + return x; +}}${undefined}${"hello"}`; diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js index 9d3531c2667..663969caefc 100644 --- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js +++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.js @@ -95,48 +95,115 @@ var arr: any[]; //// [taggedTemplateStringsTypeArgumentInference.js] // Generic tag with one parameter -function noParams(n) { } +function noParams(n) { +} (_a = [""], _a.raw = [""], noParams(_a)); // Generic tag with parameter which does not use type parameter -function noGenericParams(n) { } +function noGenericParams(n) { +} (_b = [""], _b.raw = [""], noGenericParams(_b)); // Generic tag with multiple type parameters and only one used in parameter type annotation -function someGenerics1a(n, m) { } +function someGenerics1a(n, m) { +} (_c = ["", ""], _c.raw = ["", ""], someGenerics1a(_c, 3)); -function someGenerics1b(n, m) { } +function someGenerics1b(n, m) { +} (_d = ["", ""], _d.raw = ["", ""], someGenerics1b(_d, 3)); // Generic tag with argument of function type whose parameter is of type parameter type -function someGenerics2a(strs, n) { } -(_e = ["", ""], _e.raw = ["", ""], someGenerics2a(_e, function (n) { return n; })); -function someGenerics2b(strs, n) { } -(_f = ["", ""], _f.raw = ["", ""], someGenerics2b(_f, function (n, x) { return n; })); +function someGenerics2a(strs, n) { +} +(_e = ["", ""], _e.raw = ["", ""], someGenerics2a(_e, function (n) { + return n; +})); +function someGenerics2b(strs, n) { +} +(_f = ["", ""], _f.raw = ["", ""], someGenerics2b(_f, function (n, x) { + return n; +})); // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter -function someGenerics3(strs, producer) { } -(_g = ["", ""], _g.raw = ["", ""], someGenerics3(_g, function () { return ''; })); -(_h = ["", ""], _h.raw = ["", ""], someGenerics3(_h, function () { return undefined; })); -(_j = ["", ""], _j.raw = ["", ""], someGenerics3(_j, function () { return 3; })); +function someGenerics3(strs, producer) { +} +(_g = ["", ""], _g.raw = ["", ""], someGenerics3(_g, function () { + return ''; +})); +(_h = ["", ""], _h.raw = ["", ""], someGenerics3(_h, function () { + return undefined; +})); +(_j = ["", ""], _j.raw = ["", ""], someGenerics3(_j, function () { + return 3; +})); // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type -function someGenerics4(strs, n, f) { } -(_k = ["", "", ""], _k.raw = ["", "", ""], someGenerics4(_k, 4, function () { return null; })); -(_l = ["", "", ""], _l.raw = ["", "", ""], someGenerics4(_l, '', function () { return 3; })); +function someGenerics4(strs, n, f) { +} +(_k = ["", "", ""], _k.raw = ["", "", ""], someGenerics4(_k, 4, function () { + return null; +})); +(_l = ["", "", ""], _l.raw = ["", "", ""], someGenerics4(_l, '', function () { + return 3; +})); (_m = ["", "", ""], _m.raw = ["", "", ""], someGenerics4(_m, null, null)); // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type -function someGenerics5(strs, n, f) { } -(_n = ["", " ", ""], _n.raw = ["", " ", ""], someGenerics5(_n, 4, function () { return null; })); -(_o = ["", "", ""], _o.raw = ["", "", ""], someGenerics5(_o, '', function () { return 3; })); +function someGenerics5(strs, n, f) { +} +(_n = ["", " ", ""], _n.raw = ["", " ", ""], someGenerics5(_n, 4, function () { + return null; +})); +(_o = ["", "", ""], _o.raw = ["", "", ""], someGenerics5(_o, '', function () { + return 3; +})); (_p = ["", "", ""], _p.raw = ["", "", ""], someGenerics5(_p, null, null)); // Generic tag with multiple arguments of function types that each have parameters of the same generic type -function someGenerics6(strs, a, b, c) { } -(_q = ["", "", "", ""], _q.raw = ["", "", "", ""], someGenerics6(_q, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_r = ["", "", "", ""], _r.raw = ["", "", "", ""], someGenerics6(_r, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_s = ["", "", "", ""], _s.raw = ["", "", "", ""], someGenerics6(_s, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +function someGenerics6(strs, a, b, c) { +} +(_q = ["", "", "", ""], _q.raw = ["", "", "", ""], someGenerics6(_q, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); +(_r = ["", "", "", ""], _r.raw = ["", "", "", ""], someGenerics6(_r, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); +(_s = ["", "", "", ""], _s.raw = ["", "", "", ""], someGenerics6(_s, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); // Generic tag with multiple arguments of function types that each have parameters of different generic type -function someGenerics7(strs, a, b, c) { } -(_t = ["", "", "", ""], _t.raw = ["", "", "", ""], someGenerics7(_t, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_u = ["", "", "", ""], _u.raw = ["", "", "", ""], someGenerics7(_u, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); -(_v = ["", "", "", ""], _v.raw = ["", "", "", ""], someGenerics7(_v, function (n) { return n; }, function (n) { return n; }, function (n) { return n; })); +function someGenerics7(strs, a, b, c) { +} +(_t = ["", "", "", ""], _t.raw = ["", "", "", ""], someGenerics7(_t, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); +(_u = ["", "", "", ""], _u.raw = ["", "", "", ""], someGenerics7(_u, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); +(_v = ["", "", "", ""], _v.raw = ["", "", "", ""], someGenerics7(_v, function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +})); // Generic tag with argument of generic function type -function someGenerics8(strs, n) { return n; } +function someGenerics8(strs, n) { + return n; +} var x = (_w = ["", ""], _w.raw = ["", ""], someGenerics8(_w, someGenerics7)); (_x = ["", "", "", ""], _x.raw = ["", "", "", ""], x(_x, null, null, null)); // Generic tag with multiple parameters of generic type passed arguments with no best common type @@ -145,10 +212,22 @@ function someGenerics9(strs, a, b, c) { } var a9a = (_y = ["", "", "", ""], _y.raw = ["", "", "", ""], someGenerics9(_y, '', 0, [])); var a9a; -var a9e = (_z = ["", "", "", ""], _z.raw = ["", "", "", ""], someGenerics9(_z, undefined, { x: 6, z: new Date() }, { x: 6, y: '' })); +var a9e = (_z = ["", "", "", ""], _z.raw = ["", "", "", ""], someGenerics9(_z, undefined, { + x: 6, + z: new Date() +}, { + x: 6, + y: '' +})); var a9e; // Generic tag with multiple parameters of generic type passed arguments with a single best common type -var a9d = (_0 = ["", "", "", ""], _0.raw = ["", "", "", ""], someGenerics9(_0, { x: 3 }, { x: 6 }, { x: 6 })); +var a9d = (_0 = ["", "", "", ""], _0.raw = ["", "", "", ""], someGenerics9(_0, { + x: 3 +}, { + x: 6 +}, { + x: 6 +})); var a9d; // Generic tag with multiple parameters of generic type where one argument is of type 'any' var anyVar; diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.js b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.js index 2f57882b4b7..1fdeb3e4b38 100644 --- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.js +++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.js @@ -94,48 +94,61 @@ var arr: any[]; //// [taggedTemplateStringsTypeArgumentInferenceES6.js] // Generic tag with one parameter -function noParams(n) { } +function noParams(n) { +} noParams ``; // Generic tag with parameter which does not use type parameter -function noGenericParams(n) { } +function noGenericParams(n) { +} noGenericParams ``; // Generic tag with multiple type parameters and only one used in parameter type annotation -function someGenerics1a(n, m) { } +function someGenerics1a(n, m) { +} someGenerics1a `${3}`; -function someGenerics1b(n, m) { } +function someGenerics1b(n, m) { +} someGenerics1b `${3}`; // Generic tag with argument of function type whose parameter is of type parameter type -function someGenerics2a(strs, n) { } +function someGenerics2a(strs, n) { +} someGenerics2a `${(n) => n}`; -function someGenerics2b(strs, n) { } +function someGenerics2b(strs, n) { +} someGenerics2b `${(n, x) => n}`; // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter -function someGenerics3(strs, producer) { } +function someGenerics3(strs, producer) { +} someGenerics3 `${() => ''}`; someGenerics3 `${() => undefined}`; someGenerics3 `${() => 3}`; // 2 parameter generic tag with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type -function someGenerics4(strs, n, f) { } +function someGenerics4(strs, n, f) { +} someGenerics4 `${4}${() => null}`; someGenerics4 `${''}${() => 3}`; someGenerics4 `${null}${null}`; // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type -function someGenerics5(strs, n, f) { } +function someGenerics5(strs, n, f) { +} someGenerics5 `${4} ${() => null}`; someGenerics5 `${''}${() => 3}`; someGenerics5 `${null}${null}`; // Generic tag with multiple arguments of function types that each have parameters of the same generic type -function someGenerics6(strs, a, b, c) { } +function someGenerics6(strs, a, b, c) { +} someGenerics6 `${n => n}${n => n}${n => n}`; someGenerics6 `${n => n}${n => n}${n => n}`; someGenerics6 `${(n) => n}${(n) => n}${(n) => n}`; // Generic tag with multiple arguments of function types that each have parameters of different generic type -function someGenerics7(strs, a, b, c) { } +function someGenerics7(strs, a, b, c) { +} someGenerics7 `${n => n}${n => n}${n => n}`; someGenerics7 `${n => n}${n => n}${n => n}`; someGenerics7 `${(n) => n}${(n) => n}${(n) => n}`; // Generic tag with argument of generic function type -function someGenerics8(strs, n) { return n; } +function someGenerics8(strs, n) { + return n; +} var x = someGenerics8 `${someGenerics7}`; x `${null}${null}${null}`; // Generic tag with multiple parameters of generic type passed arguments with no best common type @@ -144,10 +157,22 @@ function someGenerics9(strs, a, b, c) { } var a9a = someGenerics9 `${''}${0}${[]}`; var a9a; -var a9e = someGenerics9 `${undefined}${{ x: 6, z: new Date() }}${{ x: 6, y: '' }}`; +var a9e = someGenerics9 `${undefined}${{ + x: 6, + z: new Date() +}}${{ + x: 6, + y: '' +}}`; var a9e; // Generic tag with multiple parameters of generic type passed arguments with a single best common type -var a9d = someGenerics9 `${{ x: 3 }}${{ x: 6 }}${{ x: 6 }}`; +var a9d = someGenerics9 `${{ + x: 3 +}}${{ + x: 6 +}}${{ + x: 6 +}}`; var a9d; // Generic tag with multiple parameters of generic type where one argument is of type 'any' var anyVar; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js index 4b9df44d3f7..1840fed234b 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.js @@ -74,11 +74,15 @@ fn5 `${ (n) => n.substr(0) }`; //// [taggedTemplateStringsWithOverloadResolution3.js] -function fn1() { return null; } +function fn1() { + return null; +} var s = (_a = ["", ""], _a.raw = ["", ""], fn1(_a, undefined)); // No candidate overloads found (_b = ["", ""], _b.raw = ["", ""], fn1(_b, {})); // Error -function fn2() { return undefined; } +function fn2() { + return undefined; +} var d1 = (_c = ["", "", ""], _c.raw = ["", "", ""], fn2(_c, 0, undefined)); // contextually typed var d2 = (_d = ["", "", ""], _d.raw = ["", "", ""], fn2(_d, 0, undefined)); // any d1.foo(); // error @@ -87,7 +91,9 @@ d2(); // no error (typed as any) (_e = ["", "", ""], _e.raw = ["", "", ""], fn2(_e, 0, '')); // OK // Generic and non-generic overload where non-generic overload is the only candidate (_f = ["", "", ""], _f.raw = ["", "", ""], fn2(_f, '', 0)); // OK -function fn3() { return null; } +function fn3() { + return null; +} var s = (_g = ["", ""], _g.raw = ["", ""], fn3(_g, 3)); var s = (_h = ["", "", "", ""], _h.raw = ["", "", "", ""], fn3(_h, '', 3, '')); var n = (_j = ["", "", "", ""], _j.raw = ["", "", "", ""], fn3(_j, 5, 5, 5)); @@ -98,7 +104,8 @@ var s = (_l = ["", "", "", ""], _l.raw = ["", "", "", ""], fn3(_l, '', '', '')); var n = (_m = ["", "", "", ""], _m.raw = ["", "", "", ""], fn3(_m, '', '', 3)); // Generic overloads with differing arity tagging with argument count that doesn't match any overload (_n = [""], _n.raw = [""], fn3(_n)); // Error -function fn4() { } +function fn4() { +} // Generic overloads with constraints tagged with types that satisfy the constraints (_o = ["", "", ""], _o.raw = ["", "", ""], fn4(_o, '', 3)); (_p = ["", "", ""], _p.raw = ["", "", ""], fn4(_p, 3, '')); @@ -109,7 +116,13 @@ function fn4() { } // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints (_t = ["", "", ""], _t.raw = ["", "", ""], fn4(_t, true, null)); (_u = ["", "", ""], _u.raw = ["", "", ""], fn4(_u, null, true)); -function fn5() { return undefined; } -(_v = ["", ""], _v.raw = ["", ""], fn5(_v, function (n) { return n.toFixed(); })); // will error; 'n' should have type 'string'. -(_w = ["", ""], _w.raw = ["", ""], fn5(_w, function (n) { return n.substr(0); })); +function fn5() { + return undefined; +} +(_v = ["", ""], _v.raw = ["", ""], fn5(_v, function (n) { + return n.toFixed(); +})); // will error; 'n' should have type 'string'. +(_w = ["", ""], _w.raw = ["", ""], fn5(_w, function (n) { + return n.substr(0); +})); var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w; diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.js index 583770b9cd8..666974de447 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.js +++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.js @@ -73,11 +73,15 @@ fn5 `${ (n) => n.substr(0) }`; //// [taggedTemplateStringsWithOverloadResolution3_ES6.js] -function fn1() { return null; } +function fn1() { + return null; +} var s = fn1 `${undefined}`; // No candidate overloads found fn1 `${{}}`; // Error -function fn2() { return undefined; } +function fn2() { + return undefined; +} var d1 = fn2 `${0}${undefined}`; // contextually typed var d2 = fn2 `${0}${undefined}`; // any d1.foo(); // error @@ -86,7 +90,9 @@ d2(); // no error (typed as any) fn2 `${0}${''}`; // OK // Generic and non-generic overload where non-generic overload is the only candidate fn2 `${''}${0}`; // OK -function fn3() { return null; } +function fn3() { + return null; +} var s = fn3 `${3}`; var s = fn3 `${''}${3}${''}`; var n = fn3 `${5}${5}${5}`; @@ -97,7 +103,8 @@ var s = fn3 `${''}${''}${''}`; var n = fn3 `${''}${''}${3}`; // Generic overloads with differing arity tagging with argument count that doesn't match any overload fn3 ``; // Error -function fn4() { } +function fn4() { +} // Generic overloads with constraints tagged with types that satisfy the constraints fn4 `${''}${3}`; fn4 `${3}${''}`; @@ -108,6 +115,8 @@ fn4 `${null}${null}`; // Error // Generic overloads with constraints called without type arguments but with types that do not satisfy the constraints fn4 `${true}${null}`; fn4 `${null}${true}`; -function fn5() { return undefined; } +function fn5() { + return undefined; +} fn5 `${(n) => n.toFixed()}`; // will error; 'n' should have type 'string'. fn5 `${(n) => n.substr(0)}`; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js index f7523eb9870..10a8f1f2a12 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js @@ -13,5 +13,7 @@ function foo() { rest[_i - 0] = arguments[_i]; } } -(_a = ["", ""], _a.raw = ["", ""], foo(_a, function (x) { x = "bad"; })); +(_a = ["", ""], _a.raw = ["", ""], foo(_a, function (x) { + x = "bad"; +})); var _a; diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js index 7691b83b3bc..bc18a600458 100644 --- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js +++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js @@ -8,4 +8,6 @@ foo `${function (x: number) { x = "bad"; } }`; //// [taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js] function foo(...rest) { } -foo `${function (x) { x = "bad"; }}`; +foo `${function (x) { + x = "bad"; +}}`; diff --git a/tests/baselines/reference/targetTypeArgs.js b/tests/baselines/reference/targetTypeArgs.js index 18dff375abe..cb227f81b40 100644 --- a/tests/baselines/reference/targetTypeArgs.js +++ b/tests/baselines/reference/targetTypeArgs.js @@ -18,10 +18,36 @@ foo(function(x) { x }); function foo(callback) { callback("hello"); } -foo(function (x) { x; }); -[1].forEach(function (v, i, a) { v; }); -["hello"].every(function (v, i, a) { return true; }); -[1].every(function (v, i, a) { return true; }); -[1].every(function (v, i, a) { return true; }); -["s"].every(function (v, i, a) { return true; }); -["s"].forEach(function (v, i, a) { v; }); +foo(function (x) { + x; +}); +[ + 1 +].forEach(function (v, i, a) { + v; +}); +[ + "hello" +].every(function (v, i, a) { + return true; +}); +[ + 1 +].every(function (v, i, a) { + return true; +}); +[ + 1 +].every(function (v, i, a) { + return true; +}); +[ + "s" +].every(function (v, i, a) { + return true; +}); +[ + "s" +].forEach(function (v, i, a) { + v; +}); diff --git a/tests/baselines/reference/targetTypeBaseCalls.js b/tests/baselines/reference/targetTypeBaseCalls.js index c886183bacf..d844354b154 100644 --- a/tests/baselines/reference/targetTypeBaseCalls.js +++ b/tests/baselines/reference/targetTypeBaseCalls.js @@ -25,18 +25,25 @@ var __extends = this.__extends || function (d, b) { __.prototype = b.prototype; d.prototype = new __(); }; -function foo(x) { } +function foo(x) { +} 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 +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) { __extends(Bar, _super); function Bar() { - _super.call(this, function (s) { s = 5; }); + _super.call(this, function (s) { + s = 5; + }); } return Bar; })(Foo); // error, if types are applied correctly diff --git a/tests/baselines/reference/targetTypeCalls.js b/tests/baselines/reference/targetTypeCalls.js index 168195216ca..302419a2693 100644 --- a/tests/baselines/reference/targetTypeCalls.js +++ b/tests/baselines/reference/targetTypeCalls.js @@ -6,7 +6,27 @@ var fra3: (v:any)=>string = function() { return function() { return function(v) var fra4: (v:any)=>void = function() { return function() { return function(v) {return v;};}(); }() // should work //// [targetTypeCalls.js] -var fra1 = function () { return function (v) { return v; }; }(); // should work -var fra2 = function () { return function () { return 0; }; }(); // should work -var fra3 = function () { return function () { return function (v) { return v; }; }(); }(); // should work -var fra4 = function () { return function () { return function (v) { return v; }; }(); }(); // should work +var fra1 = function () { + return function (v) { + return v; + }; +}(); // should work +var fra2 = function () { + return function () { + return 0; + }; +}(); // should work +var fra3 = function () { + return function () { + return function (v) { + return v; + }; + }(); +}(); // should work +var fra4 = function () { + return function () { + return function (v) { + return v; + }; + }(); +}(); // should work diff --git a/tests/baselines/reference/targetTypeCastTest.js b/tests/baselines/reference/targetTypeCastTest.js index 053aced7305..c9a30c6d685 100644 --- a/tests/baselines/reference/targetTypeCastTest.js +++ b/tests/baselines/reference/targetTypeCastTest.js @@ -28,8 +28,12 @@ function Point(x, y) { this.x = x; this.y = y; } -var add = function (x, y) { return x + y; }; +var add = function (x, y) { + return x + y; +}; var add2 = function (x, y) { return 0; }; -function add3(x, y) { x; } +function add3(x, y) { + x; +} diff --git a/tests/baselines/reference/targetTypeObjectLiteralToAny.js b/tests/baselines/reference/targetTypeObjectLiteralToAny.js index fced520e09e..f6228f210f8 100644 --- a/tests/baselines/reference/targetTypeObjectLiteralToAny.js +++ b/tests/baselines/reference/targetTypeObjectLiteralToAny.js @@ -15,6 +15,9 @@ function suggest() { var TypeScriptKeywords; var result; TypeScriptKeywords.forEach(function (keyword) { - result.push({ text: keyword, type: "keyword" }); // this should not cause a crash - push should be typed to any + result.push({ + text: keyword, + type: "keyword" + }); // this should not cause a crash - push should be typed to any }); } diff --git a/tests/baselines/reference/targetTypeTest1.js b/tests/baselines/reference/targetTypeTest1.js index 8f9657ee9d0..8c9156d1e0d 100644 --- a/tests/baselines/reference/targetTypeTest1.js +++ b/tests/baselines/reference/targetTypeTest1.js @@ -80,7 +80,9 @@ function Point(x, y) { this.x = x; this.y = y; } -function EF1(a, b) { return a + b; } +function EF1(a, b) { + return a + b; +} var x = EF1(1, 2); // Point.origin declared as type Point Point.origin = new Point(0, 0); @@ -108,10 +110,10 @@ function C(a, b) { this.a = a; this.b = b; } -C.prototype = - { a: 0, - b: 0, - C1M1: function (c, d) { - return (this.a + c) + (this.b + d); - } - }; +C.prototype = { + a: 0, + b: 0, + C1M1: function (c, d) { + return (this.a + c) + (this.b + d); + } +}; diff --git a/tests/baselines/reference/targetTypeTest2.js b/tests/baselines/reference/targetTypeTest2.js index 0ba82bc9cce..2d0a7dee464 100644 --- a/tests/baselines/reference/targetTypeTest2.js +++ b/tests/baselines/reference/targetTypeTest2.js @@ -13,8 +13,18 @@ function func2(stuff1:string, stuff2:number, stuff3:number) { //// [targetTypeTest2.js] // Test target typing for array literals and call expressions -var a = [1, 2, "3"]; -function func1(stuff) { return stuff; } +var a = [ + 1, + 2, + "3" +]; +function func1(stuff) { + return stuff; +} function func2(stuff1, stuff2, stuff3) { - return func1([stuff1, stuff2, stuff3]); + return func1([ + stuff1, + stuff2, + stuff3 + ]); } diff --git a/tests/baselines/reference/targetTypeTest3.js b/tests/baselines/reference/targetTypeTest3.js index 13972478582..199d998a11c 100644 --- a/tests/baselines/reference/targetTypeTest3.js +++ b/tests/baselines/reference/targetTypeTest3.js @@ -13,8 +13,18 @@ function func2(stuff1:string, stuff2:number, stuff3:number) { //// [targetTypeTest3.js] // Test target typing for array literals and call expressions -var a = [1, 2, "3"]; // should produce an error -function func1(stuff) { return stuff; } +var a = [ + 1, + 2, + "3" +]; // should produce an error +function func1(stuff) { + return stuff; +} function func2(stuff1, stuff2, stuff3) { - return func1([stuff1, stuff2, stuff3]); + return func1([ + stuff1, + stuff2, + stuff3 + ]); } diff --git a/tests/baselines/reference/targetTypeVoidFunc.js b/tests/baselines/reference/targetTypeVoidFunc.js index dba2086b0e1..9913b4bd491 100644 --- a/tests/baselines/reference/targetTypeVoidFunc.js +++ b/tests/baselines/reference/targetTypeVoidFunc.js @@ -9,7 +9,9 @@ var z = new (f1())(); //// [targetTypeVoidFunc.js] function f1() { - return function () { return; }; + return function () { + return; + }; } ; var x = f1(); diff --git a/tests/baselines/reference/targetTypingOnFunctions.js b/tests/baselines/reference/targetTypingOnFunctions.js index fad75a4bf6d..5b11a34ff4d 100644 --- a/tests/baselines/reference/targetTypingOnFunctions.js +++ b/tests/baselines/reference/targetTypingOnFunctions.js @@ -4,5 +4,9 @@ var fu: (s: string) => string = function (s) { return s.toLowerCase() }; var zu = fu = function (s) { return s.toLowerCase() }; //// [targetTypingOnFunctions.js] -var fu = function (s) { return s.toLowerCase(); }; -var zu = fu = function (s) { return s.toLowerCase(); }; +var fu = function (s) { + return s.toLowerCase(); +}; +var zu = fu = function (s) { + return s.toLowerCase(); +}; diff --git a/tests/baselines/reference/templateStringInArray.js b/tests/baselines/reference/templateStringInArray.js index 97d0b1a636b..175dc39f62c 100644 --- a/tests/baselines/reference/templateStringInArray.js +++ b/tests/baselines/reference/templateStringInArray.js @@ -2,4 +2,8 @@ var x = [1, 2, `abc${ 123 }def`]; //// [templateStringInArray.js] -var x = [1, 2, ("abc" + 123 + "def")]; +var x = [ + 1, + 2, + ("abc" + 123 + "def") +]; diff --git a/tests/baselines/reference/templateStringInArrowFunction.js b/tests/baselines/reference/templateStringInArrowFunction.js index 4c4890633e1..984c8673cb0 100644 --- a/tests/baselines/reference/templateStringInArrowFunction.js +++ b/tests/baselines/reference/templateStringInArrowFunction.js @@ -2,4 +2,6 @@ var x = x => `abc${ x }def`; //// [templateStringInArrowFunction.js] -var x = function (x) { return ("abc" + x + "def"); }; +var x = function (x) { + return ("abc" + x + "def"); +}; diff --git a/tests/baselines/reference/templateStringInEqualityChecks.js b/tests/baselines/reference/templateStringInEqualityChecks.js index f7573f8efd5..54f5fa610c2 100644 --- a/tests/baselines/reference/templateStringInEqualityChecks.js +++ b/tests/baselines/reference/templateStringInEqualityChecks.js @@ -5,7 +5,4 @@ var x = `abc${0}abc` === `abc` || "abc0abc" !== `abc${0}abc`; //// [templateStringInEqualityChecks.js] -var x = "abc" + 0 + "abc" === "abc" || - "abc" !== "abc" + 0 + "abc" && - "abc" + 0 + "abc" == "abc0abc" && - "abc0abc" !== "abc" + 0 + "abc"; +var x = "abc" + 0 + "abc" === "abc" || "abc" !== "abc" + 0 + "abc" && "abc" + 0 + "abc" == "abc0abc" && "abc0abc" !== "abc" + 0 + "abc"; diff --git a/tests/baselines/reference/templateStringInEqualityChecksES6.js b/tests/baselines/reference/templateStringInEqualityChecksES6.js index 9bb001d9dc7..317db1ab366 100644 --- a/tests/baselines/reference/templateStringInEqualityChecksES6.js +++ b/tests/baselines/reference/templateStringInEqualityChecksES6.js @@ -5,7 +5,4 @@ var x = `abc${0}abc` === `abc` || "abc0abc" !== `abc${0}abc`; //// [templateStringInEqualityChecksES6.js] -var x = `abc${0}abc` === `abc` || - `abc` !== `abc${0}abc` && - `abc${0}abc` == "abc0abc" && - "abc0abc" !== `abc${0}abc`; +var x = `abc${0}abc` === `abc` || `abc` !== `abc${0}abc` && `abc${0}abc` == "abc0abc" && "abc0abc" !== `abc${0}abc`; diff --git a/tests/baselines/reference/templateStringInInOperator.js b/tests/baselines/reference/templateStringInInOperator.js index c496e335dd4..6384c1096c6 100644 --- a/tests/baselines/reference/templateStringInInOperator.js +++ b/tests/baselines/reference/templateStringInInOperator.js @@ -2,4 +2,7 @@ var x = `${ "hi" }` in { hi: 10, hello: 20}; //// [templateStringInInOperator.js] -var x = "" + "hi" in { hi: 10, hello: 20 }; +var x = "" + "hi" in { + hi: 10, + hello: 20 +}; diff --git a/tests/baselines/reference/templateStringInInOperatorES6.js b/tests/baselines/reference/templateStringInInOperatorES6.js index bd4daef3b6d..75d79fad062 100644 --- a/tests/baselines/reference/templateStringInInOperatorES6.js +++ b/tests/baselines/reference/templateStringInInOperatorES6.js @@ -2,4 +2,7 @@ var x = `${ "hi" }` in { hi: 10, hello: 20}; //// [templateStringInInOperatorES6.js] -var x = `${"hi"}` in { hi: 10, hello: 20 }; +var x = `${"hi"}` in { + hi: 10, + hello: 20 +}; diff --git a/tests/baselines/reference/templateStringInObjectLiteral.js b/tests/baselines/reference/templateStringInObjectLiteral.js index 2e4de70f57c..5a096b0adfa 100644 --- a/tests/baselines/reference/templateStringInObjectLiteral.js +++ b/tests/baselines/reference/templateStringInObjectLiteral.js @@ -6,6 +6,7 @@ var x = { //// [templateStringInObjectLiteral.js] var x = (_a = ["b"], _a.raw = ["b"], ({ - a: "abc" + 123 + "def" })(_a)); + a: "abc" + 123 + "def" +})(_a)); 321; var _a; diff --git a/tests/baselines/reference/templateStringInObjectLiteralES6.js b/tests/baselines/reference/templateStringInObjectLiteralES6.js index 7de012185a9..22144e75247 100644 --- a/tests/baselines/reference/templateStringInObjectLiteralES6.js +++ b/tests/baselines/reference/templateStringInObjectLiteralES6.js @@ -6,5 +6,6 @@ var x = { //// [templateStringInObjectLiteralES6.js] var x = { - a: `abc${123}def`, } `b`; + a: `abc${123}def`, +} `b`; 321; diff --git a/tests/baselines/reference/templateStringWithEmbeddedArray.js b/tests/baselines/reference/templateStringWithEmbeddedArray.js index 1fb6512db47..946bae01dfb 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedArray.js +++ b/tests/baselines/reference/templateStringWithEmbeddedArray.js @@ -2,4 +2,8 @@ var x = `abc${ [1,2,3] }def`; //// [templateStringWithEmbeddedArray.js] -var x = "abc" + [1, 2, 3] + "def"; +var x = "abc" + [ + 1, + 2, + 3 +] + "def"; diff --git a/tests/baselines/reference/templateStringWithEmbeddedArrayES6.js b/tests/baselines/reference/templateStringWithEmbeddedArrayES6.js index 804ef7a4e78..96b311cf02b 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedArrayES6.js +++ b/tests/baselines/reference/templateStringWithEmbeddedArrayES6.js @@ -2,4 +2,8 @@ var x = `abc${ [1,2,3] }def`; //// [templateStringWithEmbeddedArrayES6.js] -var x = `abc${[1, 2, 3]}def`; +var x = `abc${[ + 1, + 2, + 3 +]}def`; diff --git a/tests/baselines/reference/templateStringWithEmbeddedArrowFunction.js b/tests/baselines/reference/templateStringWithEmbeddedArrowFunction.js index eb2579b0cc3..22b9387047f 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedArrowFunction.js +++ b/tests/baselines/reference/templateStringWithEmbeddedArrowFunction.js @@ -2,4 +2,6 @@ var x = `abc${ x => x }def`; //// [templateStringWithEmbeddedArrowFunction.js] -var x = "abc" + function (x) { return x; } + "def"; +var x = "abc" + function (x) { + return x; +} + "def"; diff --git a/tests/baselines/reference/templateStringWithEmbeddedFunctionExpression.js b/tests/baselines/reference/templateStringWithEmbeddedFunctionExpression.js index 88a8349d1a4..3447ff87ac3 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedFunctionExpression.js +++ b/tests/baselines/reference/templateStringWithEmbeddedFunctionExpression.js @@ -2,4 +2,6 @@ var x = `abc${ function y() { return y; } }def`; //// [templateStringWithEmbeddedFunctionExpression.js] -var x = "abc" + function y() { return y; } + "def"; +var x = "abc" + function y() { + return y; +} + "def"; diff --git a/tests/baselines/reference/templateStringWithEmbeddedFunctionExpressionES6.js b/tests/baselines/reference/templateStringWithEmbeddedFunctionExpressionES6.js index f0e2f749cfd..46e37c0ac18 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedFunctionExpressionES6.js +++ b/tests/baselines/reference/templateStringWithEmbeddedFunctionExpressionES6.js @@ -2,4 +2,6 @@ var x = `abc${ function y() { return y; } }def`; //// [templateStringWithEmbeddedFunctionExpressionES6.js] -var x = `abc${function y() { return y; }}def`; +var x = `abc${function y() { + return y; +}}def`; diff --git a/tests/baselines/reference/templateStringWithEmbeddedInOperator.js b/tests/baselines/reference/templateStringWithEmbeddedInOperator.js index 091843ea52e..27c83d6ca81 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedInOperator.js +++ b/tests/baselines/reference/templateStringWithEmbeddedInOperator.js @@ -2,4 +2,7 @@ var x = `abc${ "hi" in { hi: 10, hello: 20} }def`; //// [templateStringWithEmbeddedInOperator.js] -var x = "abc" + ("hi" in { hi: 10, hello: 20 }) + "def"; +var x = "abc" + ("hi" in { + hi: 10, + hello: 20 +}) + "def"; diff --git a/tests/baselines/reference/templateStringWithEmbeddedInOperatorES6.js b/tests/baselines/reference/templateStringWithEmbeddedInOperatorES6.js index f6510c2fab9..76a66436311 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedInOperatorES6.js +++ b/tests/baselines/reference/templateStringWithEmbeddedInOperatorES6.js @@ -2,4 +2,7 @@ var x = `abc${ "hi" in { hi: 10, hello: 20} }def`; //// [templateStringWithEmbeddedInOperatorES6.js] -var x = `abc${"hi" in { hi: 10, hello: 20 }}def`; +var x = `abc${"hi" in { + hi: 10, + hello: 20 +}}def`; diff --git a/tests/baselines/reference/templateStringWithEmbeddedObjectLiteral.js b/tests/baselines/reference/templateStringWithEmbeddedObjectLiteral.js index 40ecf486245..99d801f1c8a 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedObjectLiteral.js +++ b/tests/baselines/reference/templateStringWithEmbeddedObjectLiteral.js @@ -2,4 +2,7 @@ var x = `abc${ { x: 10, y: 20 } }def`; //// [templateStringWithEmbeddedObjectLiteral.js] -var x = "abc" + { x: 10, y: 20 } + "def"; +var x = "abc" + { + x: 10, + y: 20 +} + "def"; diff --git a/tests/baselines/reference/templateStringWithEmbeddedObjectLiteralES6.js b/tests/baselines/reference/templateStringWithEmbeddedObjectLiteralES6.js index dbc3837e133..bf197d86319 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedObjectLiteralES6.js +++ b/tests/baselines/reference/templateStringWithEmbeddedObjectLiteralES6.js @@ -2,4 +2,7 @@ var x = `abc${ { x: 10, y: 20 } }def`; //// [templateStringWithEmbeddedObjectLiteralES6.js] -var x = `abc${{ x: 10, y: 20 }}def`; +var x = `abc${{ + x: 10, + y: 20 +}}def`; diff --git a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js index 72d0fd8c8db..ef113312060 100644 --- a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js +++ b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js @@ -4,4 +4,6 @@ `${function (x: number) { x = "bad"; } }`; //// [templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js] -"" + function (x) { x = "bad"; }; +"" + function (x) { + x = "bad"; +}; diff --git a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js index 18fae66c78a..9ce47348dc1 100644 --- a/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js +++ b/tests/baselines/reference/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js @@ -3,4 +3,6 @@ `${function (x: number) { x = "bad"; } }`; //// [templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6.js] -`${function (x) { x = "bad"; }}`; +`${function (x) { + x = "bad"; +}}`; diff --git a/tests/baselines/reference/ternaryExpressionSourceMap.js b/tests/baselines/reference/ternaryExpressionSourceMap.js index 4b43726b281..24813de9734 100644 --- a/tests/baselines/reference/ternaryExpressionSourceMap.js +++ b/tests/baselines/reference/ternaryExpressionSourceMap.js @@ -5,5 +5,9 @@ var foo = x ? () => 0 : () => 0; //// [ternaryExpressionSourceMap.js] var x = 1; -var foo = x ? function () { return 0; } : function () { return 0; }; +var foo = x ? function () { + return 0; +} : function () { + return 0; +}; //# sourceMappingURL=ternaryExpressionSourceMap.js.map \ No newline at end of file diff --git a/tests/baselines/reference/ternaryExpressionSourceMap.js.map b/tests/baselines/reference/ternaryExpressionSourceMap.js.map index 9eb28cae3c1..af4eaa03ab7 100644 --- a/tests/baselines/reference/ternaryExpressionSourceMap.js.map +++ b/tests/baselines/reference/ternaryExpressionSourceMap.js.map @@ -1,2 +1,2 @@ //// [ternaryExpressionSourceMap.js.map] -{"version":3,"file":"ternaryExpressionSourceMap.js","sourceRoot":"","sources":["ternaryExpressionSourceMap.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,IAAI,GAAG,GAAG,CAAC,GAAG,cAAM,QAAC,EAAD,CAAC,GAAG,cAAM,QAAC,EAAD,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"ternaryExpressionSourceMap.js","sourceRoot":"","sources":["ternaryExpressionSourceMap.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,IAAI,GAAG,GAAG,CAAC,GAAG;WAAM,CAAC;AAAD,CAAC,GAAG;WAAM,CAAC;AAAD,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/ternaryExpressionSourceMap.sourcemap.txt b/tests/baselines/reference/ternaryExpressionSourceMap.sourcemap.txt index 9eb1dd1be86..b1046e0b429 100644 --- a/tests/baselines/reference/ternaryExpressionSourceMap.sourcemap.txt +++ b/tests/baselines/reference/ternaryExpressionSourceMap.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:ternaryExpressionSourceMap.ts 4 > ^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^^^^-> 1 > > 2 >var @@ -30,23 +30,13 @@ sourceFile:ternaryExpressionSourceMap.ts 5 >Emitted(1, 10) Source(2, 10) + SourceIndex(0) 6 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) --- ->>>var foo = x ? function () { return 0; } : function () { return 0; }; +>>>var foo = x ? function () { 1-> 2 >^^^^ 3 > ^^^ 4 > ^^^ 5 > ^ 6 > ^^^ -7 > ^^^^^^^^^^^^^^ -8 > ^^^^^^^^ -9 > ^^ -10> ^ -11> ^^^ -12> ^^^^^^^^^^^^^^ -13> ^^^^^^^^ -14> ^^ -15> ^ -16> ^ 1-> > 2 >var @@ -54,31 +44,52 @@ sourceFile:ternaryExpressionSourceMap.ts 4 > = 5 > x 6 > ? -7 > () => -8 > 0 -9 > -10> 0 -11> : -12> () => -13> 0 -14> -15> 0 -16> ; 1->Emitted(2, 1) Source(3, 1) + SourceIndex(0) 2 >Emitted(2, 5) Source(3, 5) + SourceIndex(0) 3 >Emitted(2, 8) Source(3, 8) + SourceIndex(0) 4 >Emitted(2, 11) Source(3, 11) + SourceIndex(0) 5 >Emitted(2, 12) Source(3, 12) + SourceIndex(0) 6 >Emitted(2, 15) Source(3, 15) + SourceIndex(0) -7 >Emitted(2, 29) Source(3, 21) + SourceIndex(0) -8 >Emitted(2, 37) Source(3, 22) + SourceIndex(0) -9 >Emitted(2, 39) Source(3, 21) + SourceIndex(0) -10>Emitted(2, 40) Source(3, 22) + SourceIndex(0) -11>Emitted(2, 43) Source(3, 25) + SourceIndex(0) -12>Emitted(2, 57) Source(3, 31) + SourceIndex(0) -13>Emitted(2, 65) Source(3, 32) + SourceIndex(0) -14>Emitted(2, 67) Source(3, 31) + SourceIndex(0) -15>Emitted(2, 68) Source(3, 32) + SourceIndex(0) -16>Emitted(2, 69) Source(3, 33) + SourceIndex(0) +--- +>>> return 0; +1 >^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^-> +1 >() => +2 > 0 +1 >Emitted(3, 12) Source(3, 21) + SourceIndex(0) +2 >Emitted(3, 13) Source(3, 22) + SourceIndex(0) +--- +>>>} : function () { +1-> +2 >^ +3 > ^^^ +4 > ^^^^^^^^^^-> +1-> +2 >0 +3 > : +1->Emitted(4, 1) Source(3, 21) + SourceIndex(0) +2 >Emitted(4, 2) Source(3, 22) + SourceIndex(0) +3 >Emitted(4, 5) Source(3, 25) + SourceIndex(0) +--- +>>> return 0; +1->^^^^^^^^^^^ +2 > ^ +1->() => +2 > 0 +1->Emitted(5, 12) Source(3, 31) + SourceIndex(0) +2 >Emitted(5, 13) Source(3, 32) + SourceIndex(0) +--- +>>>}; +1 > +2 >^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >0 +3 > ; +1 >Emitted(6, 1) Source(3, 31) + SourceIndex(0) +2 >Emitted(6, 2) Source(3, 32) + SourceIndex(0) +3 >Emitted(6, 3) Source(3, 33) + SourceIndex(0) --- >>>//# sourceMappingURL=ternaryExpressionSourceMap.js.map \ No newline at end of file diff --git a/tests/baselines/reference/thisBinding.js b/tests/baselines/reference/thisBinding.js index 79a27b19fd8..0c0547a4b91 100644 --- a/tests/baselines/reference/thisBinding.js +++ b/tests/baselines/reference/thisBinding.js @@ -27,7 +27,10 @@ var M; var C = (function () { function C() { this.x = 0; - ({ z: 10, f: this.f }).f(({})); + ({ + z: 10, + f: this.f + }).f(({})); } C.prototype.f = function (x) { x.e; // e not found diff --git a/tests/baselines/reference/thisBinding2.js b/tests/baselines/reference/thisBinding2.js index 76b99797e16..ced47c0bc7b 100644 --- a/tests/baselines/reference/thisBinding2.js +++ b/tests/baselines/reference/thisBinding2.js @@ -40,6 +40,8 @@ var messenger = { message: "Hello World", start: function () { var _this = this; - return setTimeout(function () { var x = _this.message; }, 3000); + return setTimeout(function () { + var x = _this.message; + }, 3000); } }; diff --git a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js index 78b06d30dd2..348684fe606 100644 --- a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js +++ b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js @@ -10,7 +10,13 @@ var C = (function () { } C.prototype.foo = function () { var _this = this; - [1, 2, 3].map(function (x) { return _this; }); + [ + 1, + 2, + 3 + ].map(function (x) { + return _this; + }); }; return C; })(); diff --git a/tests/baselines/reference/thisExpressionInIndexExpression.js b/tests/baselines/reference/thisExpressionInIndexExpression.js index 1e6661386c4..45094ece936 100644 --- a/tests/baselines/reference/thisExpressionInIndexExpression.js +++ b/tests/baselines/reference/thisExpressionInIndexExpression.js @@ -6,5 +6,7 @@ function f() { //// [thisExpressionInIndexExpression.js] function f() { var _this = this; - return function (r) { return r[_this]; }; + return function (r) { + return r[_this]; + }; } diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.js b/tests/baselines/reference/thisExpressionOfGenericObject.js index e790050069e..5daa4959c6d 100644 --- a/tests/baselines/reference/thisExpressionOfGenericObject.js +++ b/tests/baselines/reference/thisExpressionOfGenericObject.js @@ -11,7 +11,9 @@ class MyClass1 { var MyClass1 = (function () { function MyClass1() { var _this = this; - (function () { return _this; }); + (function () { + return _this; + }); } return MyClass1; })(); diff --git a/tests/baselines/reference/thisInAccessors.js b/tests/baselines/reference/thisInAccessors.js index ab521649292..3d3206e11f5 100644 --- a/tests/baselines/reference/thisInAccessors.js +++ b/tests/baselines/reference/thisInAccessors.js @@ -38,7 +38,9 @@ var GetterOnly = (function () { Object.defineProperty(GetterOnly.prototype, "Value", { get: function () { var _this = this; - var fn = function () { return _this; }; + var fn = function () { + return _this; + }; return ''; }, set: function (val) { @@ -58,7 +60,9 @@ var SetterOnly = (function () { }, set: function (val) { var _this = this; - var fn = function () { return _this; }; + var fn = function () { + return _this; + }; }, enumerable: true, configurable: true @@ -72,12 +76,16 @@ var GetterAndSetter = (function () { Object.defineProperty(GetterAndSetter.prototype, "Value", { get: function () { var _this = this; - var fn = function () { return _this; }; + var fn = function () { + return _this; + }; return ''; }, set: function (val) { var _this = this; - var fn = function () { return _this; }; + var fn = function () { + return _this; + }; }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js index 03e6ddb64d9..fdfcc5d9522 100644 --- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js +++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js @@ -9,7 +9,8 @@ class Vector { } //// [thisInArrowFunctionInStaticInitializer1.js] -function log(a) { } +function log(a) { +} var Vector = (function () { function Vector() { var _this = this; diff --git a/tests/baselines/reference/thisInInnerFunctions.js b/tests/baselines/reference/thisInInnerFunctions.js index d9ba3adfdf3..09ee60fdb9b 100644 --- a/tests/baselines/reference/thisInInnerFunctions.js +++ b/tests/baselines/reference/thisInInnerFunctions.js @@ -26,7 +26,9 @@ var Foo = (function () { function inner() { var _this = this; this.y = "hi"; // 'this' should be not type to 'Foo' either - var f = function () { return _this.y; }; // 'this' should be not type to 'Foo' either + var f = function () { + return _this.y; + }; // 'this' should be not type to 'Foo' either } }; return Foo; @@ -34,7 +36,9 @@ var Foo = (function () { function test() { var _this = this; var x = function () { - (function () { return _this; })(); + (function () { + return _this; + })(); _this; }; } diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js index f21ebedc1eb..16c40a96e91 100644 --- a/tests/baselines/reference/thisInInvalidContexts.js +++ b/tests/baselines/reference/thisInInvalidContexts.js @@ -92,7 +92,8 @@ var M; //'this' as type parameter constraint // function fn() { } // Error //'this' as a type argument -function genericFunc(x) { } +function genericFunc(x) { +} genericFunc < this > (undefined); // Should be an error var ErrClass3 = (function () { function ErrClass3() { diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index e9fddd380bf..2e8e6d10c6c 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -92,7 +92,8 @@ var M; //'this' as type parameter constraint // function fn() { } // Error //'this' as a type argument -function genericFunc(x) { } +function genericFunc(x) { +} genericFunc < this > (undefined); // Should be an error var ErrClass3 = (function () { function ErrClass3() { diff --git a/tests/baselines/reference/thisInLambda.js b/tests/baselines/reference/thisInLambda.js index 94c86bd5a80..40a12d93351 100644 --- a/tests/baselines/reference/thisInLambda.js +++ b/tests/baselines/reference/thisInLambda.js @@ -26,11 +26,14 @@ var Foo = (function () { Foo.prototype.bar = function () { var _this = this; this.x; // 'this' is type 'Foo' - var f = function () { return _this.x; }; // 'this' should be type 'Foo' as well + var f = function () { + return _this.x; + }; // 'this' should be type 'Foo' as well }; return Foo; })(); -function myFn(a) { } +function myFn(a) { +} var myCls = (function () { function myCls() { var _this = this; diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js index 79e834be154..a2a6453e1aa 100644 --- a/tests/baselines/reference/thisInObjectLiterals.js +++ b/tests/baselines/reference/thisInObjectLiterals.js @@ -24,7 +24,10 @@ var MyClass = (function () { } MyClass.prototype.fn = function () { //type of 'this' in an object literal is the containing scope's this - var t = { x: this, y: this.t }; + var t = { + x: this, + y: this.t + }; var t; }; return MyClass; diff --git a/tests/baselines/reference/thisInOuterClassBody.js b/tests/baselines/reference/thisInOuterClassBody.js index 0dff441bb1e..ecbe6fc5417 100644 --- a/tests/baselines/reference/thisInOuterClassBody.js +++ b/tests/baselines/reference/thisInOuterClassBody.js @@ -28,7 +28,9 @@ var Foo = (function () { Foo.prototype.bar = function () { var _this = this; this.x; // 'this' is type 'Foo' - var f = function () { return _this.x; }; // 'this' should be type 'Foo' as well + var f = function () { + return _this.x; + }; // 'this' should be type 'Foo' as well var p = this.y; return this; }; diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.js b/tests/baselines/reference/thisInPropertyBoundDeclarations.js index e5004eed431..cba8fd2a8c2 100644 --- a/tests/baselines/reference/thisInPropertyBoundDeclarations.js +++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.js @@ -92,7 +92,9 @@ var A = (function () { function inner() { this; } - (function () { return _this; }); + (function () { + return _this; + }); }; this.prop3 = function () { function inner() { @@ -100,11 +102,15 @@ var A = (function () { } }; this.prop4 = { - a: function () { return this; } + a: function () { + return this; + } }; this.prop5 = function () { return { - a: function () { return this; } + a: function () { + return this; + } }; }; } @@ -114,19 +120,36 @@ var B = (function () { function B() { var _this = this; this.prop1 = this; - this.prop2 = function () { return _this; }; - this.prop3 = function () { return function () { return function () { return function () { return _this; }; }; }; }; - this.prop4 = ' ' + - function () { - } + - ' ' + - (function () { return function () { return function () { return _this; }; }; }); + this.prop2 = function () { + return _this; + }; + this.prop3 = function () { + return function () { + return function () { + return function () { + return _this; + }; + }; + }; + }; + this.prop4 = ' ' + function () { + } + ' ' + (function () { + return function () { + return function () { + return _this; + }; + }; + }); this.prop5 = { - a: function () { return _this; } + a: function () { + return _this; + } }; this.prop6 = function () { return { - a: function () { return _this; } + a: function () { + return _this; + } }; }; } diff --git a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.js b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.js index 99341af9f86..78467e8a22e 100644 --- a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.js +++ b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.js @@ -8,9 +8,12 @@ function test() } //// [thisReferencedInFunctionInsideArrowFunction1.js] -var foo = function (dummy) { }; +var foo = function (dummy) { +}; function test() { foo(function () { - return function () { return this; }; + return function () { + return this; + }; }); } diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js index 0b072434f33..b52926e651e 100644 --- a/tests/baselines/reference/throwInEnclosingStatements.js +++ b/tests/baselines/reference/throwInEnclosingStatements.js @@ -50,7 +50,9 @@ var aa = { function fn(x) { throw x; } -(function (x) { throw x; }); +(function (x) { + throw x; +}); var y; switch (y) { case 'a': diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js index 83663d08cc4..4ab370db0b6 100644 --- a/tests/baselines/reference/throwStatements.js +++ b/tests/baselines/reference/throwStatements.js @@ -97,7 +97,9 @@ var D = (function () { } return D; })(); -function F(x) { return 42; } +function F(x) { + return 42; +} var M; (function (M) { var A = (function () { @@ -106,7 +108,9 @@ var M; return A; })(); M.A = A; - function F2(x) { return x.toString(); } + function F2(x) { + return x.toString(); + } M.F2 = F2; })(M || (M = {})); var aNumber = 9.9; @@ -127,12 +131,16 @@ var aClass = new C(); throw aClass; var aGenericClass = new D(); throw aGenericClass; -var anObjectLiteral = { id: 12 }; +var anObjectLiteral = { + id: 12 +}; throw anObjectLiteral; var aFunction = F; throw aFunction; throw aFunction(''); -var aLambda = function (x) { return 2; }; +var aLambda = function (x) { + return 2; +}; throw aLambda; throw aLambda(1); var aModule = M; @@ -151,11 +159,23 @@ throw false; throw null; throw undefined; throw 'a string'; -throw function () { return 'a string'; }; -throw function (x) { return 42; }; -throw { x: 12, y: 13 }; +throw function () { + return 'a string'; +}; +throw function (x) { + return 42; +}; +throw { + x: 12, + y: 13 +}; throw []; -throw ['a', ['b']]; +throw [ + 'a', + [ + 'b' + ] +]; throw /[a-z]/; throw new Date(); throw new C(); diff --git a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.js b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.js index 4b00c5fd0f2..8aa23c82469 100644 --- a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.js +++ b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.js @@ -19,6 +19,10 @@ var r1b = _.map(c2, rf1); //// [tooFewArgumentsInGenericFunctionTypedArgument.js] var c2; var _; -var r1a = _.map(c2, function (x) { return x.toFixed(); }); -var rf1 = function (x) { return x.toFixed(); }; +var r1a = _.map(c2, function (x) { + return x.toFixed(); +}); +var rf1 = function (x) { + return x.toFixed(); +}; var r1b = _.map(c2, rf1); diff --git a/tests/baselines/reference/tooManyTypeParameters1.js b/tests/baselines/reference/tooManyTypeParameters1.js index 892731cbd43..3ac7dfacda3 100644 --- a/tests/baselines/reference/tooManyTypeParameters1.js +++ b/tests/baselines/reference/tooManyTypeParameters1.js @@ -12,9 +12,11 @@ interface I {} var i: I; //// [tooManyTypeParameters1.js] -function f() { } +function f() { +} f(); -var x = function () { }; +var x = function () { +}; x(); var C = (function () { function C() { diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js index 91e28b6a976..0f539310b15 100644 --- a/tests/baselines/reference/topLevelExports.js +++ b/tests/baselines/reference/topLevelExports.js @@ -8,6 +8,8 @@ void log(foo).toString(); //// [topLevelExports.js] define(["require", "exports"], function (require, exports) { exports.foo = 3; - function log(n) { return n; } + function log(n) { + return n; + } void log(exports.foo).toString(); }); diff --git a/tests/baselines/reference/topLevelLambda.js b/tests/baselines/reference/topLevelLambda.js index 3c4f1a3bc84..756a42b4340 100644 --- a/tests/baselines/reference/topLevelLambda.js +++ b/tests/baselines/reference/topLevelLambda.js @@ -8,5 +8,7 @@ module M { var M; (function (M) { var _this = this; - var f = function () { _this.window; }; + var f = function () { + _this.window; + }; })(M || (M = {})); diff --git a/tests/baselines/reference/topLevelLambda2.js b/tests/baselines/reference/topLevelLambda2.js index 10059e42efd..e5cb1fcac5a 100644 --- a/tests/baselines/reference/topLevelLambda2.js +++ b/tests/baselines/reference/topLevelLambda2.js @@ -5,5 +5,8 @@ foo(()=>this.window); //// [topLevelLambda2.js] var _this = this; -function foo(x) { } -foo(function () { return _this.window; }); +function foo(x) { +} +foo(function () { + return _this.window; +}); diff --git a/tests/baselines/reference/topLevelLambda3.js b/tests/baselines/reference/topLevelLambda3.js index 0314b356b0f..1505e38956a 100644 --- a/tests/baselines/reference/topLevelLambda3.js +++ b/tests/baselines/reference/topLevelLambda3.js @@ -3,4 +3,6 @@ var f = () => {this.window;} //// [topLevelLambda3.js] var _this = this; -var f = function () { _this.window; }; +var f = function () { + _this.window; +}; diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js index 863a0e9a103..47b238cd87f 100644 --- a/tests/baselines/reference/topLevelLambda4.js +++ b/tests/baselines/reference/topLevelLambda4.js @@ -4,5 +4,7 @@ export var x = () => this.window; //// [topLevelLambda4.js] define(["require", "exports"], function (require, exports) { var _this = this; - exports.x = function () { return _this.window; }; + exports.x = function () { + return _this.window; + }; }); diff --git a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js index 7dd59ee840e..0fdc7577088 100644 --- a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js +++ b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js @@ -13,11 +13,22 @@ class arrTest { var arrTest = (function () { function arrTest() { } - arrTest.prototype.test = function (arg1) { }; + arrTest.prototype.test = function (arg1) { + }; arrTest.prototype.callTest = function () { // these two should give the same error - this.test([1, 2, "hi", 5,]); - this.test([1, 2, "hi", 5]); + this.test([ + 1, + 2, + "hi", + 5, + ]); + this.test([ + 1, + 2, + "hi", + 5 + ]); }; return arrTest; })(); diff --git a/tests/baselines/reference/trailingCommasES3.js b/tests/baselines/reference/trailingCommasES3.js index 554390a83ea..b8b8c8ad1f0 100644 --- a/tests/baselines/reference/trailingCommasES3.js +++ b/tests/baselines/reference/trailingCommasES3.js @@ -13,13 +13,35 @@ var a5 = [1, , ]; var a6 = [, , ]; //// [trailingCommasES3.js] -var o1 = { a: 1, b: 2 }; -var o2 = { a: 1, b: 2 }; -var o3 = { a: 1 }; +var o1 = { + a: 1, + b: 2 +}; +var o2 = { + a: 1, + b: 2 +}; +var o3 = { + a: 1 +}; var o4 = {}; -var a1 = [1, 2]; -var a2 = [1, 2,]; -var a3 = [1,]; +var a1 = [ + 1, + 2 +]; +var a2 = [ + 1, + 2, +]; +var a3 = [ + 1, +]; var a4 = []; -var a5 = [1, ,]; -var a6 = [, ,]; +var a5 = [ + 1, + , +]; +var a6 = [ + , + , +]; diff --git a/tests/baselines/reference/trailingCommasES5.js b/tests/baselines/reference/trailingCommasES5.js index e54e911189a..8cd17e7519f 100644 --- a/tests/baselines/reference/trailingCommasES5.js +++ b/tests/baselines/reference/trailingCommasES5.js @@ -13,13 +13,35 @@ var a5 = [1, , ]; var a6 = [, , ]; //// [trailingCommasES5.js] -var o1 = { a: 1, b: 2 }; -var o2 = { a: 1, b: 2, }; -var o3 = { a: 1, }; +var o1 = { + a: 1, + b: 2 +}; +var o2 = { + a: 1, + b: 2, +}; +var o3 = { + a: 1, +}; var o4 = {}; -var a1 = [1, 2]; -var a2 = [1, 2,]; -var a3 = [1,]; +var a1 = [ + 1, + 2 +]; +var a2 = [ + 1, + 2, +]; +var a3 = [ + 1, +]; var a4 = []; -var a5 = [1, ,]; -var a6 = [, ,]; +var a5 = [ + 1, + , +]; +var a6 = [ + , + , +]; diff --git a/tests/baselines/reference/tryCatchFinally.js b/tests/baselines/reference/tryCatchFinally.js index b93f248c031..aeda61faca4 100644 --- a/tests/baselines/reference/tryCatchFinally.js +++ b/tests/baselines/reference/tryCatchFinally.js @@ -6,10 +6,17 @@ try {} catch(e) {} try {} finally {} //// [tryCatchFinally.js] -try { } -catch (e) { } -finally { } -try { } -catch (e) { } -try { } -finally { } +try { +} +catch (e) { +} +finally { +} +try { +} +catch (e) { +} +try { +} +finally { +} diff --git a/tests/baselines/reference/tryStatements.js b/tests/baselines/reference/tryStatements.js index 723014c1b52..01d55308d19 100644 --- a/tests/baselines/reference/tryStatements.js +++ b/tests/baselines/reference/tryStatements.js @@ -18,9 +18,14 @@ function fn() { catch (x) { var x; } - try { } - finally { } - try { } - catch (z) { } - finally { } + try { + } + finally { + } + try { + } + catch (z) { + } + finally { + } } diff --git a/tests/baselines/reference/tupleTypes.js b/tests/baselines/reference/tupleTypes.js index 451aeb5eb09..ba0aaa9d8b4 100644 --- a/tests/baselines/reference/tupleTypes.js +++ b/tests/baselines/reference/tupleTypes.js @@ -67,15 +67,40 @@ var t1; var t2 = t[2]; // number|string var t2; t = []; // Error -t = [1]; // Error -t = [1, "hello"]; // Ok -t = ["hello", 1]; // Error -t = [1, "hello", 2]; // Ok -var tf = ["hello", function (x) { return x.length; }]; -var ff1 = ff("hello", ["foo", function (x) { return x.length; }]); +t = [ + 1 +]; // Error +t = [ + 1, + "hello" +]; // Ok +t = [ + "hello", + 1 +]; // Error +t = [ + 1, + "hello", + 2 +]; // Ok +var tf = [ + "hello", + function (x) { + return x.length; + } +]; +var ff1 = ff("hello", [ + "foo", + function (x) { + return x.length; + } +]); var ff1; function tuple2(item0, item1) { - return [item0, item1]; + return [ + item0, + item1 + ]; } var tt = tuple2(1, "string"); var tt0 = tt[0]; @@ -85,8 +110,14 @@ var tt1; var tt2 = tt[2]; var tt2; tt = tuple2(1, undefined); -tt = [1, undefined]; -tt = [undefined, undefined]; +tt = [ + 1, + undefined +]; +tt = [ + undefined, + undefined +]; tt = []; // Error var a; var a1; diff --git a/tests/baselines/reference/twoAccessorsWithSameName.js b/tests/baselines/reference/twoAccessorsWithSameName.js index 1e447ea1205..7ae4d3bd1f9 100644 --- a/tests/baselines/reference/twoAccessorsWithSameName.js +++ b/tests/baselines/reference/twoAccessorsWithSameName.js @@ -39,7 +39,9 @@ var C = (function () { function C() { } Object.defineProperty(C.prototype, "x", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); @@ -49,7 +51,8 @@ var D = (function () { function D() { } Object.defineProperty(D.prototype, "x", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -62,7 +65,8 @@ var E = (function () { get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -81,5 +85,6 @@ var y = { get x() { return 1; }, - set x(v) { } + set x(v) { + } }; diff --git a/tests/baselines/reference/twoAccessorsWithSameName2.js b/tests/baselines/reference/twoAccessorsWithSameName2.js index 847f83e6a70..437fe16cea5 100644 --- a/tests/baselines/reference/twoAccessorsWithSameName2.js +++ b/tests/baselines/reference/twoAccessorsWithSameName2.js @@ -21,7 +21,9 @@ var C = (function () { function C() { } Object.defineProperty(C, "x", { - get: function () { return 1; }, + get: function () { + return 1; + }, enumerable: true, configurable: true }); @@ -31,7 +33,8 @@ var D = (function () { function D() { } Object.defineProperty(D, "x", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); @@ -44,7 +47,8 @@ var E = (function () { get: function () { return 1; }, - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/typeAliases.js b/tests/baselines/reference/typeAliases.js index 0cf0dd92402..7f1597939ea 100644 --- a/tests/baselines/reference/typeAliases.js +++ b/tests/baselines/reference/typeAliases.js @@ -122,5 +122,8 @@ var E; f15(10 /* x */).toLowerCase(); var x; f16(x); -var y = ["1", false]; +var y = [ + "1", + false +]; y[0].toLowerCase(); diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js index cf5ddb23ccd..be252fe345b 100644 --- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js +++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.js @@ -29,7 +29,8 @@ var menuData = [ "type": "image", "link": "", "icon": "modules/menu/logo.svg" - }, { + }, + { "id": "productName", "type": "default", "link": "", diff --git a/tests/baselines/reference/typeArgInference.js b/tests/baselines/reference/typeArgInference.js index 7ac36fa2580..624c357cbc4 100644 --- a/tests/baselines/reference/typeArgInference.js +++ b/tests/baselines/reference/typeArgInference.js @@ -16,13 +16,32 @@ var t4: { c: number; d: string }; //// [typeArgInference.js] -var o = { a: 3, b: "test" }; +var o = { + a: 3, + b: "test" +}; var x; -var t1 = x.f([o], [o]); +var t1 = x.f([ + o +], [ + o +]); var t1; -var t2 = x.f([o], [o]); +var t2 = x.f([ + o +], [ + o +]); var t2; -var t3 = x.g([o], [o]); +var t3 = x.g([ + o +], [ + o +]); var t3; -var t4 = x.g([o], [o]); +var t4 = x.g([ + o +], [ + o +]); var t4; diff --git a/tests/baselines/reference/typeArgInference2.js b/tests/baselines/reference/typeArgInference2.js index 193345cdeb3..1af776c1197 100644 --- a/tests/baselines/reference/typeArgInference2.js +++ b/tests/baselines/reference/typeArgInference2.js @@ -15,7 +15,20 @@ var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 }); // error //// [typeArgInference2.js] var z1 = foo(null); // any var z2 = foo(); // Item -var z3 = foo({ name: null }); // { name: any } -var z4 = foo({ name: "abc" }); // { name: string } -var z5 = foo({ name: "abc", a: 5 }); // { name: string; a: number } -var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 }); // error +var z3 = foo({ + name: null +}); // { name: any } +var z4 = foo({ + name: "abc" +}); // { name: string } +var z5 = foo({ + name: "abc", + a: 5 +}); // { name: string; a: number } +var z6 = foo({ + name: "abc", + a: 5 +}, { + name: "def", + b: 5 +}); // error diff --git a/tests/baselines/reference/typeArgInferenceWithNull.js b/tests/baselines/reference/typeArgInferenceWithNull.js index ed7a50780aa..78b0dd238fe 100644 --- a/tests/baselines/reference/typeArgInferenceWithNull.js +++ b/tests/baselines/reference/typeArgInferenceWithNull.js @@ -13,9 +13,19 @@ fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally wou //// [typeArgInferenceWithNull.js] // All legal -function fn4(n) { } +function fn4(n) { +} fn4(null); -function fn5(n) { } -fn5({ x: null }); -function fn6(n, fun, n2) { } -fn6({ x: null }, function (y) { }, { x: "" }); // y has type { x: any }, but ideally would have type { x: string } +function fn5(n) { +} +fn5({ + x: null +}); +function fn6(n, fun, n2) { +} +fn6({ + x: null +}, function (y) { +}, { + x: "" +}); // y has type { x: any }, but ideally would have type { x: string } diff --git a/tests/baselines/reference/typeArgumentConstraintResolution1.js b/tests/baselines/reference/typeArgumentConstraintResolution1.js index fd661dd812c..b7476ad2abd 100644 --- a/tests/baselines/reference/typeArgumentConstraintResolution1.js +++ b/tests/baselines/reference/typeArgumentConstraintResolution1.js @@ -13,7 +13,10 @@ foo2(""); // Type Date does not satisfy the constraint 'Number' for type p //// [typeArgumentConstraintResolution1.js] -function foo1(test) { } +function foo1(test) { +} foo1(""); // should error -function foo2(test) { return null; } +function foo2(test) { + return null; +} foo2(""); // Type Date does not satisfy the constraint 'Number' for type parameter 'T extends Number' diff --git a/tests/baselines/reference/typeArgumentInference.js b/tests/baselines/reference/typeArgumentInference.js index 1d10562ac7c..6de9a5951b4 100644 --- a/tests/baselines/reference/typeArgumentInference.js +++ b/tests/baselines/reference/typeArgumentInference.js @@ -102,55 +102,129 @@ var arr: any[]; //// [typeArgumentInference.js] // Generic call with no parameters -function noParams() { } +function noParams() { +} noParams(); noParams(); noParams(); // Generic call with parameters but none use type parameter type -function noGenericParams(n) { } +function noGenericParams(n) { +} noGenericParams(''); noGenericParams(''); noGenericParams(''); // Generic call with multiple type parameters and only one used in parameter type annotation -function someGenerics1(n, m) { } +function someGenerics1(n, m) { +} someGenerics1(3, 4); someGenerics1(3, 4); // Generic call with argument of function type whose parameter is of type parameter type -function someGenerics2a(n) { } -someGenerics2a(function (n) { return n; }); -someGenerics2a(function (n) { return n; }); -someGenerics2a(function (n) { return n.substr(0); }); -function someGenerics2b(n) { } -someGenerics2b(function (n, x) { return n; }); -someGenerics2b(function (n, t) { return n; }); -someGenerics2b(function (n, t) { return n.substr(t * t); }); +function someGenerics2a(n) { +} +someGenerics2a(function (n) { + return n; +}); +someGenerics2a(function (n) { + return n; +}); +someGenerics2a(function (n) { + return n.substr(0); +}); +function someGenerics2b(n) { +} +someGenerics2b(function (n, x) { + return n; +}); +someGenerics2b(function (n, t) { + return n; +}); +someGenerics2b(function (n, t) { + return n.substr(t * t); +}); // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter -function someGenerics3(producer) { } -someGenerics3(function () { return ''; }); -someGenerics3(function () { return undefined; }); -someGenerics3(function () { return 3; }); +function someGenerics3(producer) { +} +someGenerics3(function () { + return ''; +}); +someGenerics3(function () { + return undefined; +}); +someGenerics3(function () { + return 3; +}); // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type -function someGenerics4(n, f) { } -someGenerics4(4, function () { return null; }); -someGenerics4('', function () { return 3; }); +function someGenerics4(n, f) { +} +someGenerics4(4, function () { + return null; +}); +someGenerics4('', function () { + return 3; +}); someGenerics4(null, null); // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type -function someGenerics5(n, f) { } -someGenerics5(4, function () { return null; }); -someGenerics5('', function () { return 3; }); +function someGenerics5(n, f) { +} +someGenerics5(4, function () { + return null; +}); +someGenerics5('', function () { + return 3; +}); someGenerics5(null, null); // Generic call with multiple arguments of function types that each have parameters of the same generic type -function someGenerics6(a, b, c) { } -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +function someGenerics6(a, b, c) { +} +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Generic call with multiple arguments of function types that each have parameters of different generic type -function someGenerics7(a, b, c) { } -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +function someGenerics7(a, b, c) { +} +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Generic call with argument of generic function type -function someGenerics8(n) { return n; } +function someGenerics8(n) { + return n; +} var x = someGenerics8(someGenerics7); x(null, null, null); // Generic call with multiple parameters of generic type passed arguments with no best common type @@ -159,14 +233,36 @@ function someGenerics9(a, b, c) { } var a9a = someGenerics9('', 0, []); var a9a; -var a9b = someGenerics9({ a: 0 }, { b: '' }, null); +var a9b = someGenerics9({ + a: 0 +}, { + b: '' +}, null); var a9b; -var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }); +var a9e = someGenerics9(undefined, { + x: 6, + z: new Date() +}, { + x: 6, + y: '' +}); var a9e; -var a9f = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }); +var a9f = someGenerics9(undefined, { + x: 6, + z: new Date() +}, { + x: 6, + y: '' +}); var a9f; // Generic call with multiple parameters of generic type passed arguments with a single best common type -var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 }); +var a9d = someGenerics9({ + x: 3 +}, { + x: 6 +}, { + x: 6 +}); var a9d; // Generic call with multiple parameters of generic type where one argument is of type 'any' var anyVar; diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js index 148ec81c441..a2346cc28a7 100644 --- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js +++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.js @@ -152,50 +152,144 @@ new someGenerics1(3, 4); new someGenerics1(3, 4); // Error new someGenerics1(3, 4); var someGenerics2a; -new someGenerics2a(function (n) { return n; }); -new someGenerics2a(function (n) { return n; }); -new someGenerics2a(function (n) { return n.substr(0); }); +new someGenerics2a(function (n) { + return n; +}); +new someGenerics2a(function (n) { + return n; +}); +new someGenerics2a(function (n) { + return n.substr(0); +}); var someGenerics2b; -new someGenerics2b(function (n, x) { return n; }); -new someGenerics2b(function (n, t) { return n; }); -new someGenerics2b(function (n, t) { return n.substr(t * t); }); +new someGenerics2b(function (n, x) { + return n; +}); +new someGenerics2b(function (n, t) { + return n; +}); +new someGenerics2b(function (n, t) { + return n.substr(t * t); +}); var someGenerics3; -new someGenerics3(function () { return ''; }); -new someGenerics3(function () { return undefined; }); -new someGenerics3(function () { return 3; }); +new someGenerics3(function () { + return ''; +}); +new someGenerics3(function () { + return undefined; +}); +new someGenerics3(function () { + return 3; +}); var someGenerics4; -new someGenerics4(4, function () { return null; }); -new someGenerics4('', function () { return 3; }); -new someGenerics4('', function (x) { return ''; }); // Error +new someGenerics4(4, function () { + return null; +}); +new someGenerics4('', function () { + return 3; +}); +new someGenerics4('', function (x) { + return ''; +}); // Error new someGenerics4(null, null); var someGenerics5; -new someGenerics5(4, function () { return null; }); -new someGenerics5('', function () { return 3; }); -new someGenerics5('', function (x) { return ''; }); // Error +new someGenerics5(4, function () { + return null; +}); +new someGenerics5('', function () { + return 3; +}); +new someGenerics5('', function (x) { + return ''; +}); // Error new someGenerics5(null, null); var someGenerics6; -new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Error -new someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +new someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +new someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +new someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Error +new someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); var someGenerics7; -new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -new someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +new someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +new someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +new someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); var someGenerics8; var x = new someGenerics8(someGenerics7); new x(null, null, null); var someGenerics9; var a9a = new someGenerics9('', 0, []); var a9a; -var a9b = new someGenerics9({ a: 0 }, { b: '' }, null); +var a9b = new someGenerics9({ + a: 0 +}, { + b: '' +}, null); var a9b; -var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' }); +var a9e = new someGenerics9(undefined, { + x: 6, + z: window +}, { + x: 6, + y: '' +}); var a9e; -var a9f = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' }); +var a9f = new someGenerics9(undefined, { + x: 6, + z: window +}, { + x: 6, + y: '' +}); var a9f; // Generic call with multiple parameters of generic type passed arguments with a single best common type -var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 }); +var a9d = new someGenerics9({ + x: 3 +}, { + x: 6 +}, { + x: 6 +}); var a9d; // Generic call with multiple parameters of generic type where one argument is of type 'any' var anyVar; diff --git a/tests/baselines/reference/typeArgumentInferenceErrors.js b/tests/baselines/reference/typeArgumentInferenceErrors.js index 7ec612d2c7c..97dfce01a1d 100644 --- a/tests/baselines/reference/typeArgumentInferenceErrors.js +++ b/tests/baselines/reference/typeArgumentInferenceErrors.js @@ -18,14 +18,28 @@ someGenerics6((n: number) => n, (n: string) => n, (n: number) => n); // //// [typeArgumentInferenceErrors.js] // Generic call with multiple type parameters and only one used in parameter type annotation -function someGenerics1(n, m) { } +function someGenerics1(n, m) { +} someGenerics1(3, 4); // Error // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type -function someGenerics4(n, f) { } -someGenerics4('', function (x) { return ''; }); // Error +function someGenerics4(n, f) { +} +someGenerics4('', function (x) { + return ''; +}); // Error // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type -function someGenerics5(n, f) { } -someGenerics5('', function (x) { return ''; }); // Error +function someGenerics5(n, f) { +} +someGenerics5('', function (x) { + return ''; +}); // Error // Generic call with multiple arguments of function types that each have parameters of the same generic type -function someGenerics6(a, b, c) { } -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Error +function someGenerics6(a, b, c) { +} +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Error diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.js b/tests/baselines/reference/typeArgumentInferenceOrdering.js index 96978bfd489..53917844f66 100644 --- a/tests/baselines/reference/typeArgumentInferenceOrdering.js +++ b/tests/baselines/reference/typeArgumentInferenceOrdering.js @@ -16,7 +16,9 @@ interface Goo { //// [typeArgumentInferenceOrdering.js] -function foo(f) { return null; } +function foo(f) { + return null; +} var x = foo(new C()).x; // was Error that property x does not exist on type {} var C = (function () { function C() { diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.js b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.js index 003ae4af535..5a470de46da 100644 --- a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.js +++ b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.js @@ -10,7 +10,11 @@ var d: Date[]; // Should be OK (d should be Date[]) //// [typeArgumentInferenceTransitiveConstraints.js] function fn(a, b, c) { - return [a, b, c]; + return [ + a, + b, + c + ]; } var d = fn(new Date(), new Date(), new Date()); var d; // Should be OK (d should be Date[]) diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js index 941c9330a5f..50d7767b5db 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js +++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.js @@ -8,7 +8,9 @@ var e: Elephant; f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal //// [typeArgumentInferenceWithConstraintAsCommonRoot.js] -function f(x, y) { return undefined; } +function f(x, y) { + return undefined; +} var g; var e; f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.js b/tests/baselines/reference/typeArgumentInferenceWithConstraints.js index b8c051f0c37..ce0d3cb82e3 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.js +++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.js @@ -107,60 +107,144 @@ var arr: any[]; //// [typeArgumentInferenceWithConstraints.js] // Generic call with no parameters -function noParams() { } +function noParams() { +} noParams(); noParams(); noParams(); // Generic call with parameters but none use type parameter type -function noGenericParams(n) { } +function noGenericParams(n) { +} noGenericParams(''); // Valid noGenericParams(''); noGenericParams(''); // Error // Generic call with multiple type parameters and only one used in parameter type annotation -function someGenerics1(n, m) { } +function someGenerics1(n, m) { +} someGenerics1(3, 4); // Valid someGenerics1(3, 4); // Error someGenerics1(3, 4); // Error someGenerics1(3, 4); // Generic call with argument of function type whose parameter is of type parameter type -function someGenerics2a(n) { } -someGenerics2a(function (n) { return n; }); -someGenerics2a(function (n) { return n; }); -someGenerics2a(function (n) { return n.substr(0); }); -function someGenerics2b(n) { } -someGenerics2b(function (n, x) { return n; }); -someGenerics2b(function (n, t) { return n; }); -someGenerics2b(function (n, t) { return n.substr(t * t); }); +function someGenerics2a(n) { +} +someGenerics2a(function (n) { + return n; +}); +someGenerics2a(function (n) { + return n; +}); +someGenerics2a(function (n) { + return n.substr(0); +}); +function someGenerics2b(n) { +} +someGenerics2b(function (n, x) { + return n; +}); +someGenerics2b(function (n, t) { + return n; +}); +someGenerics2b(function (n, t) { + return n.substr(t * t); +}); // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter -function someGenerics3(producer) { } -someGenerics3(function () { return ''; }); // Error -someGenerics3(function () { return undefined; }); -someGenerics3(function () { return 3; }); // Error +function someGenerics3(producer) { +} +someGenerics3(function () { + return ''; +}); // Error +someGenerics3(function () { + return undefined; +}); +someGenerics3(function () { + return 3; +}); // Error // 2 parameter generic call with argument 1 of type parameter type and argument 2 of function type whose parameter is of type parameter type -function someGenerics4(n, f) { } -someGenerics4(4, function () { return null; }); // Valid -someGenerics4('', function () { return 3; }); -someGenerics4('', function (x) { return ''; }); // Error +function someGenerics4(n, f) { +} +someGenerics4(4, function () { + return null; +}); // Valid +someGenerics4('', function () { + return 3; +}); +someGenerics4('', function (x) { + return ''; +}); // Error someGenerics4(null, null); // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type -function someGenerics5(n, f) { } -someGenerics5(4, function () { return null; }); // Valid -someGenerics5('', function () { return 3; }); -someGenerics5('', function (x) { return ''; }); // Error +function someGenerics5(n, f) { +} +someGenerics5(4, function () { + return null; +}); // Valid +someGenerics5('', function () { + return 3; +}); +someGenerics5('', function (x) { + return ''; +}); // Error someGenerics5(null, null); // Error // Generic call with multiple arguments of function types that each have parameters of the same generic type -function someGenerics6(a, b, c) { } -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Valid -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Error -someGenerics6(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +function someGenerics6(a, b, c) { +} +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Valid +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Error +someGenerics6(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Generic call with multiple arguments of function types that each have parameters of different generic type -function someGenerics7(a, b, c) { } -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); // Valid, types of n are respectively -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); -someGenerics7(function (n) { return n; }, function (n) { return n; }, function (n) { return n; }); +function someGenerics7(a, b, c) { +} +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Valid, types of n are respectively +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); +someGenerics7(function (n) { + return n; +}, function (n) { + return n; +}, function (n) { + return n; +}); // Generic call with argument of generic function type -function someGenerics8(n) { return n; } +function someGenerics8(n) { + return n; +} var x = someGenerics8(someGenerics7); // Error x(null, null, null); // Error // Generic call with multiple parameters of generic type passed arguments with no best common type @@ -169,14 +253,36 @@ function someGenerics9(a, b, c) { } var a9a = someGenerics9('', 0, []); var a9a; -var a9b = someGenerics9({ a: 0 }, { b: '' }, null); +var a9b = someGenerics9({ + a: 0 +}, { + b: '' +}, null); var a9b; -var a9e = someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' }); +var a9e = someGenerics9(undefined, { + x: 6, + z: window +}, { + x: 6, + y: '' +}); var a9e; -var a9f = someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' }); +var a9f = someGenerics9(undefined, { + x: 6, + z: window +}, { + x: 6, + y: '' +}); var a9f; // Generic call with multiple parameters of generic type passed arguments with a single best common type -var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 }); +var a9d = someGenerics9({ + x: 3 +}, { + x: 6 +}, { + x: 6 +}); var a9d; // Generic call with multiple parameters of generic type where one argument is of type 'any' var anyVar; diff --git a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js index 8e2445d249c..7b0708c38a9 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js +++ b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js @@ -37,16 +37,25 @@ var v3 = f1({ w: x => x, r: () => E1.X }, E2.X); // Error //// [typeArgumentInferenceWithObjectLiteral.js] -function foo(x) { } +function foo(x) { +} var s; // Calls below should infer string for T and then assign that type to the value parameter foo({ - read: function () { return s; }, - write: function (value) { return s = value; } + read: function () { + return s; + }, + write: function (value) { + return s = value; + } }); foo({ - write: function (value) { return s = value; }, - read: function () { return s; } + write: function (value) { + return s = value; + }, + read: function () { + return s; + } }); var E1; (function (E1) { @@ -57,9 +66,44 @@ var E2; E2[E2["X"] = 0] = "X"; })(E2 || (E2 = {})); var v1; -var v1 = f1({ w: function (x) { return x; }, r: function () { return 0; } }, 0); -var v1 = f1({ w: function (x) { return x; }, r: function () { return 0; } }, 0 /* X */); -var v1 = f1({ w: function (x) { return x; }, r: function () { return 0 /* X */; } }, 0); +var v1 = f1({ + w: function (x) { + return x; + }, + r: function () { + return 0; + } +}, 0); +var v1 = f1({ + w: function (x) { + return x; + }, + r: function () { + return 0; + } +}, 0 /* X */); +var v1 = f1({ + w: function (x) { + return x; + }, + r: function () { + return 0 /* X */; + } +}, 0); var v2; -var v2 = f1({ w: function (x) { return x; }, r: function () { return 0 /* X */; } }, 0 /* X */); -var v3 = f1({ w: function (x) { return x; }, r: function () { return 0 /* X */; } }, 0 /* X */); // Error +var v2 = f1({ + w: function (x) { + return x; + }, + r: function () { + return 0 /* X */; + } +}, 0 /* X */); +var v3 = f1({ + w: function (x) { + return x; + }, + r: function () { + return 0 /* X */; + } +}, 0 /* X */); // Error diff --git a/tests/baselines/reference/typeAssertionToGenericFunctionType.js b/tests/baselines/reference/typeAssertionToGenericFunctionType.js index 15e5cf82f26..4f7d30dfbdd 100644 --- a/tests/baselines/reference/typeAssertionToGenericFunctionType.js +++ b/tests/baselines/reference/typeAssertionToGenericFunctionType.js @@ -8,8 +8,12 @@ x.b(); // error //// [typeAssertionToGenericFunctionType.js] var x = { - a: (function (x) { return 1; }), - b: function (x) { x; } + a: (function (x) { + return 1; + }), + b: function (x) { + x; + } }; x.a(1); // bug was that this caused 'Could not find symbol T' on return type T in the type assertion on x.a's definition x.b(); // error diff --git a/tests/baselines/reference/typeAssertions.js b/tests/baselines/reference/typeAssertions.js index 01acf58227b..c964ae94958 100644 --- a/tests/baselines/reference/typeAssertions.js +++ b/tests/baselines/reference/typeAssertions.js @@ -50,8 +50,10 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; // Function call whose argument is a 1 arg generic function call with explicit type arguments -function fn1(t) { } -function fn2(t) { } +function fn1(t) { +} +function fn2(t) { +} fn1(fn2(4)); // Error var a; var s; diff --git a/tests/baselines/reference/typeCheckTypeArgument.js b/tests/baselines/reference/typeCheckTypeArgument.js index bec33393f92..720ee92a966 100644 --- a/tests/baselines/reference/typeCheckTypeArgument.js +++ b/tests/baselines/reference/typeCheckTypeArgument.js @@ -23,11 +23,14 @@ var Foo = (function () { } return Foo; })(); -function bar() { } +function bar() { +} var Foo2 = (function () { function Foo2() { } - Foo2.prototype.method = function () { }; + Foo2.prototype.method = function () { + }; return Foo2; })(); -(function (a) { }); +(function (a) { +}); diff --git a/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js b/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js index 9dad9fb671f..3ea78c7a3d8 100644 --- a/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js +++ b/tests/baselines/reference/typeCheckingInsideFunctionExpressionInArray.js @@ -8,9 +8,15 @@ var functions = [function () { //// [typeCheckingInsideFunctionExpressionInArray.js] -var functions = [function () { +var functions = [ + function () { var k = 10; k = new Object(); - [1, 2, 3].NonexistantMethod(); + [ + 1, + 2, + 3 + ].NonexistantMethod(); derp(); - }]; + } +]; diff --git a/tests/baselines/reference/typeGuardsDefeat.js b/tests/baselines/reference/typeGuardsDefeat.js index 9670c260b57..bb70c2db825 100644 --- a/tests/baselines/reference/typeGuardsDefeat.js +++ b/tests/baselines/reference/typeGuardsDefeat.js @@ -69,7 +69,9 @@ function foo3(x) { return x.length; // string } else { - var f = function () { return x * x; }; + var f = function () { + return x * x; + }; } x = "hello"; f(); diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.js b/tests/baselines/reference/typeGuardsInConditionalExpression.js index 118ebbc02c0..ebe84879d2b 100644 --- a/tests/baselines/reference/typeGuardsInConditionalExpression.js +++ b/tests/baselines/reference/typeGuardsInConditionalExpression.js @@ -105,92 +105,73 @@ function foo12(x: number | string | boolean) { // the type of a variable or parameter is narrowed by any type guard in the condition when false, // provided the false expression contains no assignments to the variable or parameter. function foo(x) { - return typeof x === "string" - ? x.length // string - : x++; // number + return typeof x === "string" ? x.length // string + : x++; // number } function foo2(x) { // x is assigned in the if true branch, the type is not narrowed - return typeof x === "string" - ? (x = 10 && x) // string | number - : x; // string | number + return typeof x === "string" ? (x = 10 && x) // string | number + : x; // string | number } function foo3(x) { // x is assigned in the if false branch, the type is not narrowed // even though assigned using same type as narrowed expression - return typeof x === "string" - ? (x = "Hello" && x) // string | number - : x; // string | number + return typeof x === "string" ? (x = "Hello" && x) // string | number + : x; // string | number } function foo4(x) { // false branch updates the variable - so here it is not number // even though assigned using same type as narrowed expression - return typeof x === "string" - ? x // string | number - : (x = 10 && x); // string | number + return typeof x === "string" ? x // string | number + : (x = 10 && x); // string | number } function foo5(x) { // false branch updates the variable - so here it is not number - return typeof x === "string" - ? x // string | number - : (x = "hello" && x); // string | number + return typeof x === "string" ? x // string | number + : (x = "hello" && x); // string | number } function foo6(x) { // Modify in both branches - return typeof x === "string" - ? (x = 10 && x) // string | number - : (x = "hello" && x); // string | number + return typeof x === "string" ? (x = 10 && x) // string | number + : (x = "hello" && x); // string | number } function foo7(x) { - return typeof x === "string" - ? x === "hello" // string - : typeof x === "boolean" - ? x // boolean - : x == 10; // number + return typeof x === "string" ? x === "hello" // string + : typeof x === "boolean" ? x // boolean + : x == 10; // number } function foo8(x) { var b; - return typeof x === "string" - ? x === "hello" - : ((b = x) && - (typeof x === "boolean" - ? x // boolean - : x == 10)); // number + return typeof x === "string" ? x === "hello" : ((b = x) && (typeof x === "boolean" ? x // boolean + : x == 10)); // number } function foo9(x) { var y = 10; // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop - return typeof x === "string" - ? ((y = x.length) && x === "hello") // string - : x === 10; // number + return typeof x === "string" ? ((y = x.length) && x === "hello") // string + : x === 10; // number } function foo10(x) { // Mixing typeguards var b; - return typeof x === "string" - ? x // string - : ((b = x) // x is number | boolean - && typeof x === "number" - && x.toString()); // x is number + return typeof x === "string" ? x // string + : ((b = x) // x is number | boolean + && typeof x === "number" && x.toString()); // x is number } function foo11(x) { // Mixing typeguards // Assigning value to x deep inside another guard stops narrowing of type too var b; - return typeof x === "string" - ? x // number | boolean | string - changed in the false branch - : ((b = x) // x is number | boolean | string - because the assignment changed it - && typeof x === "number" - && (x = 10) // assignment to x - && x); // x is number | boolean | string + return typeof x === "string" ? x // number | boolean | string - changed in the false branch + : ((b = x) // x is number | boolean | string - because the assignment changed it + && typeof x === "number" && (x = 10) // assignment to x + && x); // x is number | boolean | string } function foo12(x) { // Mixing typeguards // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression var b; - return typeof x === "string" - ? (x = 10 && x.toString().length) // number | boolean | string - changed here - : ((b = x) // x is number | boolean | string - changed in true branch - && typeof x === "number" - && x); // x is number + return typeof x === "string" ? (x = 10 && x.toString().length) // number | boolean | string - changed here + : ((b = x) // x is number | boolean | string - changed in true branch + && typeof x === "number" && x); // x is number } diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js index 7cf19dac0ad..239eeb4bfe7 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js @@ -82,44 +82,32 @@ module m1 { //// [typeGuardsInFunctionAndModuleBlock.js] // typeguards are scoped in function/module block function foo(x) { - return typeof x === "string" - ? x - : function f() { - var b = x; // number | boolean - return typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number - }(); + return typeof x === "string" ? x : function f() { + var b = x; // number | boolean + return typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number + }(); } function foo2(x) { - return typeof x === "string" - ? x - : function f(a) { - var b = x; // new scope - number | boolean - return typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number - }(x); // x here is narrowed to number | boolean + return typeof x === "string" ? x : function f(a) { + var b = x; // new scope - number | boolean + return typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number + }(x); // x here is narrowed to number | boolean } function foo3(x) { - return typeof x === "string" - ? x - : (function () { - var b = x; // new scope - number | boolean - return typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number - })(); + return typeof x === "string" ? x : (function () { + var b = x; // new scope - number | boolean + return typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number + })(); } function foo4(x) { - return typeof x === "string" - ? x - : (function (a) { - var b = x; // new scope - number | boolean - return typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number - })(x); // x here is narrowed to number | boolean + return typeof x === "string" ? x : (function (a) { + var b = x; // new scope - number | boolean + return typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number + })(x); // x here is narrowed to number | boolean } // Type guards affect nested function expressions, but not nested function declarations function foo5(x) { @@ -141,9 +129,8 @@ var m; y = x; // string; } else { - y = typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number + y = typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number } })(m2 || (m2 = {})); })(m || (m = {})); @@ -160,9 +147,8 @@ var m1; y = x; // string; } else { - y = typeof x === "boolean" - ? x.toString() // boolean - : x.toString(); // number + y = typeof x === "boolean" ? x.toString() // boolean + : x.toString(); // number } })(m3 = m2.m3 || (m2.m3 = {})); })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/typeGuardsInIfStatement.js b/tests/baselines/reference/typeGuardsInIfStatement.js index 820d205bc65..c228c038579 100644 --- a/tests/baselines/reference/typeGuardsInIfStatement.js +++ b/tests/baselines/reference/typeGuardsInIfStatement.js @@ -258,9 +258,8 @@ function foo10(x) { else { var y; var b = x; // number | boolean - return typeof x === "number" - ? x === 10 // number - : x; // x should be boolean + return typeof x === "number" ? x === 10 // number + : x; // x should be boolean } } function foo11(x) { @@ -272,15 +271,13 @@ function foo11(x) { else { var y; var b = x; // number | boolean | string - because below we are changing value of x in if statement - return typeof x === "number" - ? ( - // change value of x - x = 10 && x.toString() // number | boolean | string - ) - : ( - // do not change value - y = x && x.toString() // number | boolean | string - ); + return typeof x === "number" ? ( + // change value of x + x = 10 && x.toString() // number | boolean | string + ) : ( + // do not change value + y = x && x.toString() // number | boolean | string + ); } } function foo12(x) { @@ -292,8 +289,7 @@ function foo12(x) { else { x = 10; var b = x; // number | boolean | string - return typeof x === "number" - ? x.toString() // number - : x.toString(); // boolean | string + return typeof x === "number" ? x.toString() // number + : x.toString(); // boolean | string } } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js index e3f1a8c72c2..ffba829c37d 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.js @@ -72,40 +72,36 @@ function foo3(x) { } function foo4(x) { return typeof x !== "string" // string | number | boolean - && typeof x !== "number" // number | boolean - && x; // boolean + && typeof x !== "number" // number | boolean + && x; // boolean } function foo5(x) { // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop var b; return typeof x !== "string" // string | number | boolean - && ((b = x) && (typeof x !== "number" // number | boolean - && x)); // boolean + && ((b = x) && (typeof x !== "number" // number | boolean + && x)); // boolean } function foo6(x) { // Mixing typeguard narrowing in if statement with conditional expression typeguard return typeof x !== "string" // string | number | boolean - && (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + && (typeof x !== "number" // number | boolean + ? x // boolean + : x === 10); // number } function foo7(x) { var y; var z; // Mixing typeguard narrowing // Assigning value to x deep inside another guard stops narrowing of type too - return typeof x !== "string" - && ((z = x) // string | number | boolean - x changed deeper in conditional expression - && (typeof x === "number" - ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + return typeof x !== "string" && ((z = x) // string | number | boolean - x changed deeper in conditional expression + && (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression - return typeof x !== "string" - && (x = 10) // change x - number| string - && (typeof x === "number" - ? x // number - : x.length); // string + return typeof x !== "string" && (x = 10) // change x - number| string + && (typeof x === "number" ? x // number + : x.length); // string } diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js index 188d226da13..5f5880a4947 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js +++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.js @@ -72,40 +72,36 @@ function foo3(x) { } function foo4(x) { return typeof x === "string" // string | number | boolean - || typeof x === "number" // number | boolean - || x; // boolean + || typeof x === "number" // number | boolean + || x; // boolean } function foo5(x) { // usage of x or assignment to separate variable shouldn't cause narrowing of type to stop var b; return typeof x === "string" // string | number | boolean - || ((b = x) || (typeof x === "number" // number | boolean - || x)); // boolean + || ((b = x) || (typeof x === "number" // number | boolean + || x)); // boolean } function foo6(x) { // Mixing typeguard return typeof x === "string" // string | number | boolean - || (typeof x !== "number" // number | boolean - ? x // boolean - : x === 10); // number + || (typeof x !== "number" // number | boolean + ? x // boolean + : x === 10); // number } function foo7(x) { var y; var z; // Mixing typeguard narrowing // Assigning value to x deep inside another guard stops narrowing of type too - return typeof x === "string" - || ((z = x) // string | number | boolean - x changed deeper in conditional expression - || (typeof x === "number" - ? (x = 10 && x.toString()) // number | boolean | string - : (y = x && x.toString()))); // number | boolean | string + return typeof x === "string" || ((z = x) // string | number | boolean - x changed deeper in conditional expression + || (typeof x === "number" ? (x = 10 && x.toString()) // number | boolean | string + : (y = x && x.toString()))); // number | boolean | string } function foo8(x) { // Mixing typeguard // Assigning value to x in outer guard shouldn't stop narrowing in the inner expression - return typeof x === "string" - || (x = 10) // change x - number| string - || (typeof x === "number" - ? x // number - : x.length); // string + return typeof x === "string" || (x = 10) // change x - number| string + || (typeof x === "number" ? x // number + : x.length); // string } diff --git a/tests/baselines/reference/typeGuardsWithAny.js b/tests/baselines/reference/typeGuardsWithAny.js index be3d64b806f..08aed91edd8 100644 --- a/tests/baselines/reference/typeGuardsWithAny.js +++ b/tests/baselines/reference/typeGuardsWithAny.js @@ -38,7 +38,9 @@ else { //// [typeGuardsWithAny.js] -var x = { p: 0 }; +var x = { + p: 0 +}; if (x instanceof Object) { x.p; // No error, type any unaffected by instanceof type guard } diff --git a/tests/baselines/reference/typeIdentityConsidersBrands.js b/tests/baselines/reference/typeIdentityConsidersBrands.js index 2398033c2c6..002364a2e03 100644 --- a/tests/baselines/reference/typeIdentityConsidersBrands.js +++ b/tests/baselines/reference/typeIdentityConsidersBrands.js @@ -53,13 +53,15 @@ var Y_1 = (function () { } return Y_1; })(); -function foo(arg) { } +function foo(arg) { +} var a = new Y(); var b = new X(); a = b; // ok foo(a); // ok var a2 = new Y_1(); var b2 = new X_1(); -function foo2(arg) { } +function foo2(arg) { +} a2 = b2; // should error foo2(a2); // should error diff --git a/tests/baselines/reference/typeInfer1.js b/tests/baselines/reference/typeInfer1.js index f9613298838..bab1ebf930c 100644 --- a/tests/baselines/reference/typeInfer1.js +++ b/tests/baselines/reference/typeInfer1.js @@ -15,9 +15,13 @@ var yyyyyyyy: ITextWriter2 = { //// [typeInfer1.js] var x = { - Write: function (s) { }, - WriteLine: function (s) { } + Write: function (s) { + }, + WriteLine: function (s) { + } }; var yyyyyyyy = { - Moo: function () { return "cow"; } + Moo: function () { + return "cow"; + } }; diff --git a/tests/baselines/reference/typeInferenceConflictingCandidates.js b/tests/baselines/reference/typeInferenceConflictingCandidates.js index 2033c3b6b22..ea7834a0769 100644 --- a/tests/baselines/reference/typeInferenceConflictingCandidates.js +++ b/tests/baselines/reference/typeInferenceConflictingCandidates.js @@ -4,4 +4,6 @@ declare function g(a: T, b: T, c: (t: T) => T): T; g("", 3, a => a); //// [typeInferenceConflictingCandidates.js] -g("", 3, function (a) { return a; }); +g("", 3, function (a) { + return a; +}); diff --git a/tests/baselines/reference/typeInferenceFixEarly.js b/tests/baselines/reference/typeInferenceFixEarly.js index 58b8824c8b1..820f381e7ad 100644 --- a/tests/baselines/reference/typeInferenceFixEarly.js +++ b/tests/baselines/reference/typeInferenceFixEarly.js @@ -4,4 +4,6 @@ declare function f(p: (t: T) => T): T; f(n => 3); //// [typeInferenceFixEarly.js] -f(function (n) { return 3; }); +f(function (n) { + return 3; +}); diff --git a/tests/baselines/reference/typeInferenceWithTupleType.js b/tests/baselines/reference/typeInferenceWithTupleType.js index 10a18274c73..bc504b30b35 100644 --- a/tests/baselines/reference/typeInferenceWithTupleType.js +++ b/tests/baselines/reference/typeInferenceWithTupleType.js @@ -27,22 +27,39 @@ var zipResultEleEle = zipResult[0][0]; // string //// [typeInferenceWithTupleType.js] function combine(x, y) { - return [x, y]; + return [ + x, + y + ]; } var combineResult = combine("string", 10); var combineEle1 = combineResult[0]; // string var combineEle2 = combineResult[1]; // number function zip(array1, array2) { if (array1.length != array2.length) { - return [[undefined, undefined]]; + return [ + [ + undefined, + undefined + ] + ]; } var length = array1.length; var zipResult; for (var i = 0; i < length; ++i) { - zipResult.push([array1[i], array2[i]]); + zipResult.push([ + array1[i], + array2[i] + ]); } return zipResult; } -var zipResult = zip(["foo", "bar"], [5, 6]); +var zipResult = zip([ + "foo", + "bar" +], [ + 5, + 6 +]); var zipResultEle = zipResult[0]; // [string, number] var zipResultEleEle = zipResult[0][0]; // string diff --git a/tests/baselines/reference/typeInferenceWithTypeAnnotation.js b/tests/baselines/reference/typeInferenceWithTypeAnnotation.js index 119773f6e31..164be34cd29 100644 --- a/tests/baselines/reference/typeInferenceWithTypeAnnotation.js +++ b/tests/baselines/reference/typeInferenceWithTypeAnnotation.js @@ -4,4 +4,6 @@ declare function f(p: (t: T) => T): T; f((n: number) => n); //// [typeInferenceWithTypeAnnotation.js] -f(function (n) { return n; }); +f(function (n) { + return n; +}); diff --git a/tests/baselines/reference/typeLiteralCallback.js b/tests/baselines/reference/typeLiteralCallback.js index 82c8b37e454..8f940581916 100644 --- a/tests/baselines/reference/typeLiteralCallback.js +++ b/tests/baselines/reference/typeLiteralCallback.js @@ -17,5 +17,9 @@ test.fail2(arg => foo.reject(arg)); // Should be OK. Was: Error: Supplied para //// [typeLiteralCallback.js] var foo; var test; -test.fail(function (arg) { return foo.reject(arg); }); -test.fail2(function (arg) { return foo.reject(arg); }); // Should be OK. Was: Error: Supplied parameters do not match any signature of call target +test.fail(function (arg) { + return foo.reject(arg); +}); +test.fail2(function (arg) { + return foo.reject(arg); +}); // Should be OK. Was: Error: Supplied parameters do not match any signature of call target diff --git a/tests/baselines/reference/typeMatch2.js b/tests/baselines/reference/typeMatch2.js index 1fd624e4e5b..c59bfad8b13 100644 --- a/tests/baselines/reference/typeMatch2.js +++ b/tests/baselines/reference/typeMatch2.js @@ -52,11 +52,23 @@ var __extends = this.__extends || function (d, b) { d.prototype = new __(); }; function f1() { - var a = { x: 1, y: 2 }; + var a = { + x: 1, + y: 2 + }; a = {}; // error - a = { x: 1 }; // error - a = { x: 1, y: 2, z: 3 }; - a = { x: 1, z: 3 }; // error + a = { + x: 1 + }; // error + a = { + x: 1, + y: 2, + z: 3 + }; + a = { + x: 1, + z: 3 + }; // error } var Animal = (function () { function Animal() { @@ -73,12 +85,26 @@ var Giraffe = (function (_super) { function f2() { var a = new Animal(); var g = new Giraffe(); - var aa = [a, a, a]; - var gg = [g, g, g]; + var aa = [ + a, + a, + a + ]; + var gg = [ + g, + g, + g + ]; aa = gg; gg = aa; // error - var xa = { f1: 5, f2: aa }; - var xb = { f1: 5, f2: gg }; + var xa = { + f1: 5, + f2: aa + }; + var xb = { + f1: 5, + f2: gg + }; xa = xb; // Should be ok xb = xa; // Not ok } @@ -87,14 +113,36 @@ function f4() { var i = 5; i = null; i = undefined; - var a = { x: 1, y: 1 }; - a = { x: 1, y: null }; - a = { x: 1, y: undefined }; - a = { x: 1, y: _any }; - a = { x: 1, y: _any, z: 1 }; - a = { x: 1 }; // error - var mf = function m(n) { return false; }; - var zf = function z(n) { return true; }; + var a = { + x: 1, + y: 1 + }; + a = { + x: 1, + y: null + }; + a = { + x: 1, + y: undefined + }; + a = { + x: 1, + y: _any + }; + a = { + x: 1, + y: _any, + z: 1 + }; + a = { + x: 1 + }; // error + var mf = function m(n) { + return false; + }; + var zf = function z(n) { + return true; + }; mf = zf; mf(_any); zf(_any); diff --git a/tests/baselines/reference/typeOfOnTypeArg.js b/tests/baselines/reference/typeOfOnTypeArg.js index 199233065b4..ff304c05697 100644 --- a/tests/baselines/reference/typeOfOnTypeArg.js +++ b/tests/baselines/reference/typeOfOnTypeArg.js @@ -9,7 +9,9 @@ fill(32); //// [typeOfOnTypeArg.js] -var A = { '': 3 }; +var A = { + '': 3 +}; function fill(f) { } fill(32); diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.js b/tests/baselines/reference/typeOfThisInInstanceMember.js index 5e4b4f2970d..7d88d98cf74 100644 --- a/tests/baselines/reference/typeOfThisInInstanceMember.js +++ b/tests/baselines/reference/typeOfThisInInstanceMember.js @@ -59,7 +59,11 @@ var r = c.x; var ra = c.x.x.x; var r2 = c.y; var r3 = c.foo(); -var rs = [r, r2, r3]; +var rs = [ + r, + r2, + r3 +]; rs.forEach(function (x) { x.foo; x.x; diff --git a/tests/baselines/reference/typeOfThisInInstanceMember2.js b/tests/baselines/reference/typeOfThisInInstanceMember2.js index b2b81ce3a23..e094e232ec1 100644 --- a/tests/baselines/reference/typeOfThisInInstanceMember2.js +++ b/tests/baselines/reference/typeOfThisInInstanceMember2.js @@ -64,7 +64,11 @@ var ra = c.x.x.x; var r2 = c.y; var r3 = c.foo(); var r4 = c.z; -var rs = [r, r2, r3]; +var rs = [ + r, + r2, + r3 +]; rs.forEach(function (x) { x.foo; x.x; diff --git a/tests/baselines/reference/typeParameterAsElementType.js b/tests/baselines/reference/typeParameterAsElementType.js index a934f3d0330..ce4364e7407 100644 --- a/tests/baselines/reference/typeParameterAsElementType.js +++ b/tests/baselines/reference/typeParameterAsElementType.js @@ -7,5 +7,8 @@ function fee() { //// [typeParameterAsElementType.js] function fee() { var t; - var arr = [t, ""]; + var arr = [ + t, + "" + ]; } diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.js b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.js index 9266f520867..f432358a1ca 100644 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.js +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.js @@ -29,16 +29,32 @@ foo2(1, ['']); //// [typeParameterAsTypeParameterConstraint.js] // using a type parameter as a constraint for a type parameter is valid // no errors expected except illegal constraints -function foo(x, y) { return y; } +function foo(x, y) { + return y; +} var r = foo(1, 2); var r = foo({}, 1); var a; var b; var r2 = foo(a, b); -var r3 = foo({ x: 1 }, { x: 2, y: 3 }); -function foo2(x, y) { return y; } +var r3 = foo({ + x: 1 +}, { + x: 2, + y: 3 +}); +function foo2(x, y) { + return y; +} foo2(1, ''); -foo2({}, { length: 2 }); -foo2(1, { width: 3, length: 2 }); +foo2({}, { + length: 2 +}); +foo2(1, { + width: 3, + length: 2 +}); foo2(1, []); -foo2(1, ['']); +foo2(1, [ + '' +]); diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.js b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.js index e8066b9ebfa..a3f4d8d5259 100644 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.js +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.js @@ -21,12 +21,22 @@ foo2([], ['']); //// [typeParameterAsTypeParameterConstraint2.js] // using a type parameter as a constraint for a type parameter is invalid // these should be errors unless otherwise noted -function foo(x, y) { return y; } // this is now an error +function foo(x, y) { + return y; +} // this is now an error foo(1, ''); foo(1, {}); var n; var r3 = foo(1, n); -function foo2(x, y) { return y; } // this is now an error -foo2(1, { length: '' }); -foo2(1, { length: {} }); -foo2([], ['']); +function foo2(x, y) { + return y; +} // this is now an error +foo2(1, { + length: '' +}); +foo2(1, { + length: {} +}); +foo2([], [ + '' +]); diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.js b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.js index bc50363036d..669139058ed 100644 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.js +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.js @@ -30,15 +30,39 @@ foo(b, b, { foo: 1, bar: '', hm: '' }); var a; var b; var c; -function foo(x, y, z) { return z; } +function foo(x, y, z) { + return z; +} //function foo(x: T, y: U, z: V): V { return z; } foo(1, 2, 3); -foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true }); +foo({ + x: 1 +}, { + x: 1, + y: '' +}, { + x: 2, + y: '', + z: true +}); foo(a, b, c); -foo(a, b, { foo: 1, bar: '', hm: true }); -foo(function (x, y) { }, function (x) { }, function () { }); -function foo2(x, y, z) { return z; } +foo(a, b, { + foo: 1, + bar: '', + hm: true +}); +foo(function (x, y) { +}, function (x) { +}, function () { +}); +function foo2(x, y, z) { + return z; +} //function foo2(x: T, y: U, z: V): V { return z; } foo(a, a, a); foo(a, b, c); -foo(b, b, { foo: 1, bar: '', hm: '' }); +foo(b, b, { + foo: 1, + bar: '', + hm: '' +}); diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.js b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.js index 6541cfaa231..32bad4dc3c3 100644 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.js +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.js @@ -29,14 +29,34 @@ foo(c, c, a); var a; var b; var c; -function foo(x, y, z) { return z; } +function foo(x, y, z) { + return z; +} //function foo(x: T, y: U, z: V): V { return z; } foo(1, 2, ''); -foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true }); +foo({ + x: 1 +}, { + x: 1, + y: '' +}, { + x: 2, + y: 2, + z: true +}); foo(a, b, a); -foo(a, { foo: 1, bar: '', hm: true }, b); -foo(function (x, y) { }, function (x, y) { }, function () { }); -function foo2(x, y, z) { return z; } +foo(a, { + foo: 1, + bar: '', + hm: true +}, b); +foo(function (x, y) { +}, function (x, y) { +}, function () { +}); +function foo2(x, y, z) { + return z; +} //function foo2(x: T, y: U, z: V): V { return z; } foo(b, a, c); foo(c, c, a); diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js index 7e923941386..04fb7b1dc25 100644 --- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js +++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js @@ -25,10 +25,14 @@ i2 = a2; // no error //// [typeParameterCompatibilityAccrossDeclarations.js] define(["require", "exports"], function (require, exports) { var a = { - x: function (y) { return null; } + x: function (y) { + return null; + } }; var a2 = { - x: function (y) { return null; } + x: function (y) { + return null; + } }; var i; var i2; diff --git a/tests/baselines/reference/typeParameterConstraints1.js b/tests/baselines/reference/typeParameterConstraints1.js index 6ffefbcf8f1..49d347f576b 100644 --- a/tests/baselines/reference/typeParameterConstraints1.js +++ b/tests/baselines/reference/typeParameterConstraints1.js @@ -14,16 +14,29 @@ function foo12(test: T) { } function foo13(test: T) { } //// [typeParameterConstraints1.js] -function foo1(test) { } -function foo2(test) { } -function foo3(test) { } -function foo4(test) { } // valid -function foo5(test) { } // valid -function foo6(test) { } -function foo7(test) { } // valid -function foo8(test) { } -function foo9(test) { } -function foo10(test) { } -function foo11(test) { } -function foo12(test) { } -function foo13(test) { } +function foo1(test) { +} +function foo2(test) { +} +function foo3(test) { +} +function foo4(test) { +} // valid +function foo5(test) { +} // valid +function foo6(test) { +} +function foo7(test) { +} // valid +function foo8(test) { +} +function foo9(test) { +} +function foo10(test) { +} +function foo11(test) { +} +function foo12(test) { +} +function foo13(test) { +} diff --git a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js index a14e010515b..85f86f7de76 100644 --- a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js +++ b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js @@ -30,8 +30,12 @@ var C2 = (function () { } return C2; })(); -function f() { } -function f2() { } +function f() { +} +function f2() { +} var a; -var b = function () { }; -var b2 = function () { }; +var b = function () { +}; +var b2 = function () { +}; diff --git a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js index 3cdb735adfb..fc0e10d41c9 100644 --- a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js +++ b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js @@ -29,11 +29,15 @@ var C2 = (function () { } return C2; })(); -function f() { } -function f2() { } +function f() { +} +function f2() { +} var a; -var b = function () { }; -var b2 = function () { }; +var b = function () { +}; +var b2 = function () { +}; var D = (function () { function D() { } diff --git a/tests/baselines/reference/typeParameterOrderReversal.js b/tests/baselines/reference/typeParameterOrderReversal.js index 40df6db0034..8c9185ba57c 100644 --- a/tests/baselines/reference/typeParameterOrderReversal.js +++ b/tests/baselines/reference/typeParameterOrderReversal.js @@ -15,8 +15,10 @@ tFirst(z); //// [typeParameterOrderReversal.js] // Only difference here is order of type parameters -function uFirst(x) { } -function tFirst(x) { } +function uFirst(x) { +} +function tFirst(x) { +} var z = null; // Both of these should be allowed uFirst(z); diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.js b/tests/baselines/reference/typeParameterUsedAsConstraint.js index b1c55343aa0..4649a53f8fc 100644 --- a/tests/baselines/reference/typeParameterUsedAsConstraint.js +++ b/tests/baselines/reference/typeParameterUsedAsConstraint.js @@ -66,18 +66,30 @@ var C6 = (function () { } return C6; })(); -function f() { } -function f2() { } -function f3() { } -function f4() { } -function f5() { } -function f6() { } -var e = function () { }; -var e2 = function () { }; -var e3 = function () { }; -var e4 = function () { }; -var e5 = function () { }; -var e6 = function () { }; +function f() { +} +function f2() { +} +function f3() { +} +function f4() { +} +function f5() { +} +function f6() { +} +var e = function () { +}; +var e2 = function () { +}; +var e3 = function () { +}; +var e4 = function () { +}; +var e5 = function () { +}; +var e6 = function () { +}; var a; var a2; var a3; diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js index c6c624f7e2b..a2f8aa2f9b7 100644 --- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js +++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js @@ -78,26 +78,37 @@ interface I2 { //// [typeParametersAreIdenticalToThemselves.js] // type parameters from the same declaration are identical to themself -function foo1(x) { } -function foo2(x) { } +function foo1(x) { +} +function foo2(x) { +} function foo3(x, y) { - function inner(x) { } - function inner2(x) { } + function inner(x) { + } + function inner2(x) { + } } var C = (function () { function C() { } - C.prototype.foo1 = function (x) { }; - C.prototype.foo2 = function (a, x) { }; - C.prototype.foo3 = function (x) { }; - C.prototype.foo4 = function (x) { }; + C.prototype.foo1 = function (x) { + }; + C.prototype.foo2 = function (a, x) { + }; + C.prototype.foo3 = function (x) { + }; + C.prototype.foo4 = function (x) { + }; return C; })(); var C2 = (function () { function C2() { } - C2.prototype.foo1 = function (x) { }; - C2.prototype.foo2 = function (a, x) { }; - C2.prototype.foo3 = function (x) { }; + C2.prototype.foo1 = function (x) { + }; + C2.prototype.foo2 = function (a, x) { + }; + C2.prototype.foo3 = function (x) { + }; return C2; })(); diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.js b/tests/baselines/reference/typeParametersInStaticAccessors.js index c621de910bc..411a4eac69d 100644 --- a/tests/baselines/reference/typeParametersInStaticAccessors.js +++ b/tests/baselines/reference/typeParametersInStaticAccessors.js @@ -9,12 +9,15 @@ var foo = (function () { function foo() { } Object.defineProperty(foo, "Foo", { - get: function () { return null; }, + get: function () { + return null; + }, enumerable: true, configurable: true }); Object.defineProperty(foo, "Bar", { - set: function (v) { }, + set: function (v) { + }, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/typeQueryOnClass.js b/tests/baselines/reference/typeQueryOnClass.js index 1c8b2424a7e..a3ae0bd02c1 100644 --- a/tests/baselines/reference/typeQueryOnClass.js +++ b/tests/baselines/reference/typeQueryOnClass.js @@ -62,10 +62,14 @@ var C = (function () { var _this = this; this.x = x; this.ia = 1; - this.ib = function () { return _this.ia; }; + this.ib = function () { + return _this.ia; + }; } - C.foo = function (x) { }; - C.bar = function (x) { }; + C.foo = function (x) { + }; + C.bar = function (x) { + }; Object.defineProperty(C, "sc", { get: function () { return 1; @@ -82,7 +86,9 @@ var C = (function () { enumerable: true, configurable: true }); - C.prototype.baz = function (x) { return ''; }; + C.prototype.baz = function (x) { + return ''; + }; Object.defineProperty(C.prototype, "ic", { get: function () { return 1; @@ -100,7 +106,9 @@ var C = (function () { configurable: true }); C.sa = 1; - C.sb = function () { return 1; }; + C.sb = function () { + return 1; + }; return C; })(); var c; @@ -111,7 +119,8 @@ var D = (function () { function D(y) { this.y = y; } - D.prototype.foo = function () { }; + D.prototype.foo = function () { + }; return D; })(); var d; diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index 55a6beeceba..74102f5a0fd 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -224,21 +224,24 @@ define(["require", "exports"], function (require, exports) { var ClassA = (function () { function ClassA() { } - ClassA.prototype.AisIn1_2_2 = function () { }; + ClassA.prototype.AisIn1_2_2 = function () { + }; return ClassA; })(); SubSubModule2.ClassA = ClassA; var ClassB = (function () { function ClassB() { } - ClassB.prototype.BisIn1_2_2 = function () { }; + ClassB.prototype.BisIn1_2_2 = function () { + }; return ClassB; })(); SubSubModule2.ClassB = ClassB; var ClassC = (function () { function ClassC() { } - ClassC.prototype.CisIn1_2_2 = function () { }; + ClassC.prototype.CisIn1_2_2 = function () { + }; return ClassC; })(); SubSubModule2.ClassC = ClassC; @@ -247,7 +250,8 @@ define(["require", "exports"], function (require, exports) { var ClassA = (function () { function ClassA() { } - ClassA.prototype.AisIn1 = function () { }; + ClassA.prototype.AisIn1 = function () { + }; return ClassA; })(); var NotExportedModule; @@ -267,7 +271,8 @@ define(["require", "exports"], function (require, exports) { var ClassA = (function () { function ClassA() { } - ClassA.prototype.AisIn2_3 = function () { }; + ClassA.prototype.AisIn2_3 = function () { + }; return ClassA; })(); SubModule3.ClassA = ClassA; diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index 8bbff8aa760..b4aa7040531 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,2 +1,2 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.ClassA.AisIn1","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor","TopLevelModule2.SubModule3.ClassA.AisIn2_3"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBAEIE,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAG/CA,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAGzDA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BAEIC,AADAA,uCAAuCA;gCACnCA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAGDA,AADAA,0EAA0EA;;gBAEtEW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBAEzBC,AADAA,6DAA6DA;;oBAC7DC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAI;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CJ,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAO;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CP,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAA0B;YAEAC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBE,CAACA;YACvBF,aAACA;QAADA,CAACA,AAFD1B,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtB6B;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFM7B,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpBgC,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBE,CAACA;gBACzBF,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.ClassA.AisIn1","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor","TopLevelModule2.SubModule3.ClassA.AisIn2_3"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBAEIE,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAG/CA,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAGzDA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BAEIC,AADAA,uCAAuCA;gCACnCA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAGDA,AADAA,0EAA0EA;;gBAEtEW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBAEzBC,AADAA,6DAA6DA;;oBAC7DC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA;oBAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAI;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA;oBAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CJ,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAO;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA;oBAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CP,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAA0B;YAEAC,CAACA;YADUD,uBAAMA,GAAbA;YAAkBE,CAACA;YACvBF,aAACA;QAADA,CAACA,AAFD1B,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtB6B;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFM7B,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpBgC,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA;gBAAoBE,CAACA;gBACzBF,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index a7d8bd170f1..54b2c44eae6 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -2176,36 +2176,39 @@ sourceFile:typeResolution.ts >>> } 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassA { public AisIn1_2_2() { } 2 > } 1->Emitted(113, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) 2 >Emitted(113, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) --- ->>> ClassA.prototype.AisIn1_2_2 = function () { }; +>>> ClassA.prototype.AisIn1_2_2 = function () { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ 1-> 2 > AisIn1_2_2 3 > -4 > public AisIn1_2_2() { -5 > } 1->Emitted(114, 21) Source(79, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) 2 >Emitted(114, 48) Source(79, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) 3 >Emitted(114, 51) Source(79, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -4 >Emitted(114, 65) Source(79, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) -5 >Emitted(114, 66) Source(79, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^-> +1 >public AisIn1_2_2() { +2 > } +1 >Emitted(115, 21) Source(79, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) +2 >Emitted(115, 22) Source(79, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) --- >>> return ClassA; -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ -1 > +1-> 2 > } -1 >Emitted(115, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(115, 34) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1->Emitted(116, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2217,10 +2220,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { public AisIn1_2_2() { } } -1 >Emitted(116, 17) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(116, 18) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(116, 18) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(116, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(117, 17) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +2 >Emitted(117, 18) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +3 >Emitted(117, 18) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(117, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -2231,57 +2234,60 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { public AisIn1_2_2() { } } 4 > -1->Emitted(117, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(117, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(118, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(118, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(118, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(118, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(118, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(119, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(119, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1->Emitted(120, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassB { public BisIn1_2_2() { } 2 > } -1->Emitted(120, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) -2 >Emitted(120, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +1->Emitted(121, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +2 >Emitted(121, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) --- ->>> ClassB.prototype.BisIn1_2_2 = function () { }; +>>> ClassB.prototype.BisIn1_2_2 = function () { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ 1-> 2 > BisIn1_2_2 3 > -4 > public BisIn1_2_2() { -5 > } -1->Emitted(121, 21) Source(80, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(121, 48) Source(80, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(121, 51) Source(80, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -4 >Emitted(121, 65) Source(80, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) -5 >Emitted(121, 66) Source(80, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) +1->Emitted(122, 21) Source(80, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(122, 48) Source(80, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +3 >Emitted(122, 51) Source(80, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^-> +1 >public BisIn1_2_2() { +2 > } +1 >Emitted(123, 21) Source(80, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) +2 >Emitted(123, 22) Source(80, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) --- >>> return ClassB; -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ -1 > +1-> 2 > } -1 >Emitted(122, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(122, 34) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1->Emitted(124, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(124, 34) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2293,10 +2299,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassB { public BisIn1_2_2() { } } -1 >Emitted(123, 17) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(123, 18) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(123, 18) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(123, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(125, 17) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(125, 18) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +3 >Emitted(125, 18) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(125, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -2307,57 +2313,60 @@ sourceFile:typeResolution.ts 2 > ClassB 3 > { public BisIn1_2_2() { } } 4 > -1->Emitted(124, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(124, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(126, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(126, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(126, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(126, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassC = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(125, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(127, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassC() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(126, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1->Emitted(128, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassC { public CisIn1_2_2() { } 2 > } -1->Emitted(127, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) -2 >Emitted(127, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +1->Emitted(129, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +2 >Emitted(129, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) --- ->>> ClassC.prototype.CisIn1_2_2 = function () { }; +>>> ClassC.prototype.CisIn1_2_2 = function () { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ 1-> 2 > CisIn1_2_2 3 > -4 > public CisIn1_2_2() { -5 > } -1->Emitted(128, 21) Source(81, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(128, 48) Source(81, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(128, 51) Source(81, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -4 >Emitted(128, 65) Source(81, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) -5 >Emitted(128, 66) Source(81, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) +1->Emitted(130, 21) Source(81, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(130, 48) Source(81, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +3 >Emitted(130, 51) Source(81, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^-> +1 >public CisIn1_2_2() { +2 > } +1 >Emitted(131, 21) Source(81, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) +2 >Emitted(131, 22) Source(81, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) --- >>> return ClassC; -1 >^^^^^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ -1 > +1-> 2 > } -1 >Emitted(129, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(129, 34) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1->Emitted(132, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(132, 34) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2369,10 +2378,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassC { public CisIn1_2_2() { } } -1 >Emitted(130, 17) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(130, 18) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(130, 18) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(130, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(133, 17) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(133, 18) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +3 >Emitted(133, 18) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(133, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassC = ClassC; 1->^^^^^^^^^^^^^^^^ @@ -2384,10 +2393,10 @@ sourceFile:typeResolution.ts 2 > ClassC 3 > { public CisIn1_2_2() { } } 4 > -1->Emitted(131, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(131, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(134, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(134, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(134, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(134, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); 1->^^^^^^^^^^^^^^^^ @@ -2420,16 +2429,16 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1->Emitted(132, 17) Source(83, 48) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(132, 13) Source(84, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(132, 14) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(132, 16) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -5 >Emitted(132, 29) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -6 >Emitted(132, 32) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -7 >Emitted(132, 56) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -8 >Emitted(132, 61) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -9 >Emitted(132, 85) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -10>Emitted(132, 93) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1->Emitted(135, 17) Source(83, 48) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(135, 13) Source(84, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(135, 14) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(135, 16) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +5 >Emitted(135, 29) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +6 >Emitted(135, 32) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +7 >Emitted(135, 56) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +8 >Emitted(135, 61) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +9 >Emitted(135, 85) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +10>Emitted(135, 93) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) --- >>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); 1 >^^^^^^^^^^^^ @@ -2466,16 +2475,16 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(133, 13) Source(86, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(133, 9) Source(87, 5) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(133, 10) Source(87, 6) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(133, 12) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(133, 22) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(133, 25) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(133, 51) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -8 >Emitted(133, 56) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -9 >Emitted(133, 82) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -10>Emitted(133, 90) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(136, 13) Source(86, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2) +2 >Emitted(136, 9) Source(87, 5) + SourceIndex(0) name (TopLevelModule1.SubModule2) +3 >Emitted(136, 10) Source(87, 6) + SourceIndex(0) name (TopLevelModule1.SubModule2) +4 >Emitted(136, 12) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(136, 22) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +6 >Emitted(136, 25) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +7 >Emitted(136, 51) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +8 >Emitted(136, 56) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +9 >Emitted(136, 82) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +10>Emitted(136, 90) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> var ClassA = (function () { 1 >^^^^^^^^ @@ -2483,50 +2492,53 @@ sourceFile:typeResolution.ts 1 > > > -1 >Emitted(134, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(137, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(135, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +1->Emitted(138, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) --- >>> } 1->^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->class ClassA { > public AisIn1() { } > 2 > } -1->Emitted(136, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) -2 >Emitted(136, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +1->Emitted(139, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +2 >Emitted(139, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) --- ->>> ClassA.prototype.AisIn1 = function () { }; +>>> ClassA.prototype.AisIn1 = function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ 1-> 2 > AisIn1 3 > -4 > public AisIn1() { -5 > } -1->Emitted(137, 13) Source(90, 16) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(137, 36) Source(90, 22) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(137, 39) Source(90, 9) + SourceIndex(0) name (TopLevelModule1.ClassA) -4 >Emitted(137, 53) Source(90, 27) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) -5 >Emitted(137, 54) Source(90, 28) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) +1->Emitted(140, 13) Source(90, 16) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(140, 36) Source(90, 22) + SourceIndex(0) name (TopLevelModule1.ClassA) +3 >Emitted(140, 39) Source(90, 9) + SourceIndex(0) name (TopLevelModule1.ClassA) +--- +>>> }; +1 >^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^-> +1 >public AisIn1() { +2 > } +1 >Emitted(141, 13) Source(90, 27) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) +2 >Emitted(141, 14) Source(90, 28) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) --- >>> return ClassA; -1 >^^^^^^^^^^^^ +1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ -1 > +1-> > 2 > } -1 >Emitted(138, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(138, 26) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) +1->Emitted(142, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(142, 26) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) --- >>> })(); 1 >^^^^^^^^ @@ -2540,10 +2552,10 @@ sourceFile:typeResolution.ts 4 > class ClassA { > public AisIn1() { } > } -1 >Emitted(139, 9) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(139, 10) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(139, 10) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(139, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(143, 9) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(143, 10) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) +3 >Emitted(143, 10) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(143, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> var NotExportedModule; 1->^^^^^^^^ @@ -2563,10 +2575,10 @@ sourceFile:typeResolution.ts 4 > { > export class ClassA { } > } -1->Emitted(140, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(140, 13) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(140, 30) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(140, 31) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(144, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(144, 13) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(144, 30) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(144, 31) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> (function (NotExportedModule) { 1->^^^^^^^^ @@ -2580,24 +2592,24 @@ sourceFile:typeResolution.ts 3 > NotExportedModule 4 > 5 > { -1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(141, 20) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(141, 37) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(141, 39) Source(97, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(141, 40) Source(97, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(145, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(145, 20) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(145, 37) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(145, 39) Source(97, 30) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(145, 40) Source(97, 31) + SourceIndex(0) name (TopLevelModule1) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(142, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(146, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(143, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(147, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2605,16 +2617,16 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^-> 1->export class ClassA { 2 > } -1->Emitted(144, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) -2 >Emitted(144, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +1->Emitted(148, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +2 >Emitted(148, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(145, 30) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(149, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +2 >Emitted(149, 30) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2626,10 +2638,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { } -1 >Emitted(146, 13) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(146, 14) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -3 >Emitted(146, 14) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(146, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1 >Emitted(150, 13) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +2 >Emitted(150, 14) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +3 >Emitted(150, 14) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +4 >Emitted(150, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> NotExportedModule.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2641,10 +2653,10 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { } 4 > -1->Emitted(147, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(147, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(151, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +2 >Emitted(151, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +3 >Emitted(151, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +4 >Emitted(151, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> })(NotExportedModule || (NotExportedModule = {})); 1->^^^^^^^^ @@ -2665,13 +2677,13 @@ sourceFile:typeResolution.ts 7 > { > export class ClassA { } > } -1->Emitted(148, 9) Source(99, 5) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(148, 10) Source(99, 6) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(148, 12) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(148, 29) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(148, 34) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(148, 51) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(148, 59) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(152, 9) Source(99, 5) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +2 >Emitted(152, 10) Source(99, 6) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +3 >Emitted(152, 12) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(152, 29) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(152, 34) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +6 >Emitted(152, 51) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +7 >Emitted(152, 59) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); 1->^^^^ @@ -2792,15 +2804,15 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -1->Emitted(149, 5) Source(100, 1) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(149, 6) Source(100, 2) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(149, 8) Source(1, 15) + SourceIndex(0) -4 >Emitted(149, 23) Source(1, 30) + SourceIndex(0) -5 >Emitted(149, 26) Source(1, 15) + SourceIndex(0) -6 >Emitted(149, 49) Source(1, 30) + SourceIndex(0) -7 >Emitted(149, 54) Source(1, 15) + SourceIndex(0) -8 >Emitted(149, 77) Source(1, 30) + SourceIndex(0) -9 >Emitted(149, 85) Source(100, 2) + SourceIndex(0) +1->Emitted(153, 5) Source(100, 1) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(153, 6) Source(100, 2) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(153, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(153, 23) Source(1, 30) + SourceIndex(0) +5 >Emitted(153, 26) Source(1, 15) + SourceIndex(0) +6 >Emitted(153, 49) Source(1, 30) + SourceIndex(0) +7 >Emitted(153, 54) Source(1, 15) + SourceIndex(0) +8 >Emitted(153, 77) Source(1, 30) + SourceIndex(0) +9 >Emitted(153, 85) Source(100, 2) + SourceIndex(0) --- >>> var TopLevelModule2; 1 >^^^^ @@ -2820,10 +2832,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(150, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(150, 9) Source(102, 8) + SourceIndex(0) -3 >Emitted(150, 24) Source(102, 23) + SourceIndex(0) -4 >Emitted(150, 25) Source(108, 2) + SourceIndex(0) +1 >Emitted(154, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(154, 9) Source(102, 8) + SourceIndex(0) +3 >Emitted(154, 24) Source(102, 23) + SourceIndex(0) +4 >Emitted(154, 25) Source(108, 2) + SourceIndex(0) --- >>> (function (TopLevelModule2) { 1->^^^^ @@ -2836,11 +2848,11 @@ sourceFile:typeResolution.ts 3 > TopLevelModule2 4 > 5 > { -1->Emitted(151, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(151, 16) Source(102, 8) + SourceIndex(0) -3 >Emitted(151, 31) Source(102, 23) + SourceIndex(0) -4 >Emitted(151, 33) Source(102, 24) + SourceIndex(0) -5 >Emitted(151, 34) Source(102, 25) + SourceIndex(0) +1->Emitted(155, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(155, 16) Source(102, 8) + SourceIndex(0) +3 >Emitted(155, 31) Source(102, 23) + SourceIndex(0) +4 >Emitted(155, 33) Source(102, 24) + SourceIndex(0) +5 >Emitted(155, 34) Source(102, 25) + SourceIndex(0) --- >>> var SubModule3; 1 >^^^^^^^^ @@ -2857,10 +2869,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1 >Emitted(152, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(152, 13) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(152, 23) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(152, 24) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1 >Emitted(156, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(156, 13) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(156, 23) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(156, 24) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) --- >>> (function (SubModule3) { 1->^^^^^^^^ @@ -2874,61 +2886,64 @@ sourceFile:typeResolution.ts 3 > SubModule3 4 > 5 > { -1->Emitted(153, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(153, 20) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(153, 30) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(153, 32) Source(103, 30) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(153, 33) Source(103, 31) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(157, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(157, 20) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(157, 30) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(157, 32) Source(103, 30) + SourceIndex(0) name (TopLevelModule2) +5 >Emitted(157, 33) Source(103, 31) + SourceIndex(0) name (TopLevelModule2) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(154, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(158, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(155, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1->Emitted(159, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassA { > public AisIn2_3() { } > 2 > } -1->Emitted(156, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) -2 >Emitted(156, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +1->Emitted(160, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +2 >Emitted(160, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) --- ->>> ClassA.prototype.AisIn2_3 = function () { }; +>>> ClassA.prototype.AisIn2_3 = function () { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ 1-> 2 > AisIn2_3 3 > -4 > public AisIn2_3() { -5 > } -1->Emitted(157, 17) Source(105, 20) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(157, 42) Source(105, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(157, 45) Source(105, 13) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -4 >Emitted(157, 59) Source(105, 33) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) -5 >Emitted(157, 60) Source(105, 34) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) +1->Emitted(161, 17) Source(105, 20) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(161, 42) Source(105, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +3 >Emitted(161, 45) Source(105, 13) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +--- +>>> }; +1 >^^^^^^^^^^^^^^^^ +2 > ^ +3 > ^^^^^^^^^^^^^^-> +1 >public AisIn2_3() { +2 > } +1 >Emitted(162, 17) Source(105, 33) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) +2 >Emitted(162, 18) Source(105, 34) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) --- >>> return ClassA; -1 >^^^^^^^^^^^^^^^^ +1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ -1 > +1-> > 2 > } -1 >Emitted(158, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(158, 30) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1->Emitted(163, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(163, 30) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2942,10 +2957,10 @@ sourceFile:typeResolution.ts 4 > export class ClassA { > public AisIn2_3() { } > } -1 >Emitted(159, 13) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(159, 14) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(159, 14) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(159, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1 >Emitted(164, 13) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(164, 14) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +3 >Emitted(164, 14) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) +4 >Emitted(164, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> SubModule3.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2959,10 +2974,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } 4 > -1->Emitted(160, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(160, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(165, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) +2 >Emitted(165, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) +3 >Emitted(165, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +4 >Emitted(165, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); 1->^^^^^^^^ @@ -2988,15 +3003,15 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1->Emitted(161, 9) Source(107, 5) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(161, 10) Source(107, 6) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(161, 12) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(161, 22) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(161, 25) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -6 >Emitted(161, 51) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -7 >Emitted(161, 56) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -8 >Emitted(161, 82) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -9 >Emitted(161, 90) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(166, 9) Source(107, 5) + SourceIndex(0) name (TopLevelModule2.SubModule3) +2 >Emitted(166, 10) Source(107, 6) + SourceIndex(0) name (TopLevelModule2.SubModule3) +3 >Emitted(166, 12) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(166, 22) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +5 >Emitted(166, 25) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +6 >Emitted(166, 51) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +7 >Emitted(166, 56) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +8 >Emitted(166, 82) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +9 >Emitted(166, 90) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) --- >>> })(TopLevelModule2 || (TopLevelModule2 = {})); 1 >^^^^ @@ -3020,13 +3035,13 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(162, 5) Source(108, 1) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(162, 6) Source(108, 2) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(162, 8) Source(102, 8) + SourceIndex(0) -4 >Emitted(162, 23) Source(102, 23) + SourceIndex(0) -5 >Emitted(162, 28) Source(102, 8) + SourceIndex(0) -6 >Emitted(162, 43) Source(102, 23) + SourceIndex(0) -7 >Emitted(162, 51) Source(108, 2) + SourceIndex(0) +1 >Emitted(167, 5) Source(108, 1) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(167, 6) Source(108, 2) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(167, 8) Source(102, 8) + SourceIndex(0) +4 >Emitted(167, 23) Source(102, 23) + SourceIndex(0) +5 >Emitted(167, 28) Source(102, 8) + SourceIndex(0) +6 >Emitted(167, 43) Source(102, 23) + SourceIndex(0) +7 >Emitted(167, 51) Source(108, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeVal.js b/tests/baselines/reference/typeVal.js index 264b40c5f16..7c1d506fbdc 100644 --- a/tests/baselines/reference/typeVal.js +++ b/tests/baselines/reference/typeVal.js @@ -9,5 +9,7 @@ I.I=4; //// [typeVal.js] -var I = { I: 3 }; +var I = { + I: 3 +}; I.I = 4; diff --git a/tests/baselines/reference/typedGenericPrototypeMember.js b/tests/baselines/reference/typedGenericPrototypeMember.js index e5ba2e0e75f..866bf500ded 100644 --- a/tests/baselines/reference/typedGenericPrototypeMember.js +++ b/tests/baselines/reference/typedGenericPrototypeMember.js @@ -10,7 +10,8 @@ List.prototype.add("abc"); // Valid because T is instantiated to any var List = (function () { function List() { } - List.prototype.add = function (item) { }; + 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 bb41ddfab7a..7ce08d5f93a 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -54,7 +54,9 @@ export var r13: typeof foo; //// [typeofANonExportedType.js] var x = 1; exports.r1; -var y = { foo: '' }; +var y = { + foo: '' +}; exports.r2; var C = (function () { function C() { @@ -91,7 +93,8 @@ var E; exports.r10; exports.r11; exports.r12; -function foo() { } +function foo() { +} var foo; (function (foo) { foo.y = 1; diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index af6c405a3cf..20a0fe754e2 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -54,7 +54,9 @@ export var r13: typeof foo; //// [typeofAnExportedType.js] exports.x = 1; exports.r1; -exports.y = { foo: '' }; +exports.y = { + foo: '' +}; exports.r2; var C = (function () { function C() { @@ -93,7 +95,8 @@ var E = exports.E; exports.r10; exports.r11; exports.r12; -function foo() { } +function foo() { +} exports.foo = foo; var foo; (function (foo) { diff --git a/tests/baselines/reference/typeofClass2.js b/tests/baselines/reference/typeofClass2.js index 1cef22bf2eb..cbad0068372 100644 --- a/tests/baselines/reference/typeofClass2.js +++ b/tests/baselines/reference/typeofClass2.js @@ -31,8 +31,10 @@ var __extends = this.__extends || function (d, b) { var C = (function () { function C(x) { } - C.foo = function (x) { }; - C.bar = function (x) { }; + C.foo = function (x) { + }; + C.bar = function (x) { + }; return C; })(); var D = (function (_super) { @@ -40,8 +42,10 @@ var D = (function (_super) { function D() { _super.apply(this, arguments); } - D.baz = function (x) { }; - D.prototype.foo = function () { }; + D.baz = function (x) { + }; + D.prototype.foo = function () { + }; return D; })(C); var d; diff --git a/tests/baselines/reference/typeofInterface.js b/tests/baselines/reference/typeofInterface.js index 1f0bf72eebe..49e194db7fe 100644 --- a/tests/baselines/reference/typeofInterface.js +++ b/tests/baselines/reference/typeofInterface.js @@ -12,4 +12,6 @@ var j: typeof k.foo = { a: "hello" }; //// [typeofInterface.js] var I; var k; -var j = { a: "hello" }; +var j = { + a: "hello" +}; diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js index a497519f249..422d49ae11e 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js @@ -78,9 +78,16 @@ z: typeof obj1.x; // typeof operator on any type var ANY; var ANY1; -var ANY2 = ["", ""]; +var ANY2 = [ + "", + "" +]; var obj; -var obj1 = { x: "a", y: function () { } }; +var obj1 = { + x: "a", + y: function () { + } +}; function foo() { var a; return a; diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js index 82af3eac26f..884371f9440 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.js +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js @@ -53,11 +53,15 @@ z: typeof M.n; //// [typeofOperatorWithBooleanType.js] // typeof operator on boolean type var BOOLEAN; -function foo() { return true; } +function foo() { + return true; +} var A = (function () { function A() { } - A.foo = function () { return false; }; + A.foo = function () { + return false; + }; return A; })(); var M; @@ -69,7 +73,10 @@ var objA = new A(); var ResultIsString1 = typeof BOOLEAN; // boolean type literal var ResultIsString2 = typeof true; -var ResultIsString3 = typeof { x: true, y: false }; +var ResultIsString3 = typeof { + x: true, + y: false +}; // boolean type expressions var ResultIsString4 = typeof objA.a; var ResultIsString5 = typeof M.n; @@ -90,7 +97,10 @@ var x; var r; z: typeof BOOLEAN; r: typeof foo; -var y = { a: true, b: false }; +var y = { + a: true, + b: false +}; z: typeof y.a; z: typeof objA.a; z: typeof A.foo; diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js index 14b45ab518f..51e657e4019 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.js +++ b/tests/baselines/reference/typeofOperatorWithNumberType.js @@ -60,12 +60,19 @@ z: typeof M.n; //// [typeofOperatorWithNumberType.js] // typeof operator on number type var NUMBER; -var NUMBER1 = [1, 2]; -function foo() { return 1; } +var NUMBER1 = [ + 1, + 2 +]; +function foo() { + return 1; +} var A = (function () { function A() { } - A.foo = function () { return 1; }; + A.foo = function () { + return 1; + }; return A; })(); var M; @@ -78,8 +85,16 @@ var ResultIsString1 = typeof NUMBER; var ResultIsString2 = typeof NUMBER1; // number type literal var ResultIsString3 = typeof 1; -var ResultIsString4 = typeof { x: 1, y: 2 }; -var ResultIsString5 = typeof { x: 1, y: function (n) { return n; } }; +var ResultIsString4 = typeof { + x: 1, + y: 2 +}; +var ResultIsString5 = typeof { + x: 1, + y: function (n) { + return n; + } +}; // number type expressions var ResultIsString6 = typeof objA.a; var ResultIsString7 = typeof M.n; @@ -104,7 +119,10 @@ var x; z: typeof NUMBER; x: typeof NUMBER1; r: typeof foo; -var y = { a: 1, b: 2 }; +var y = { + a: 1, + b: 2 +}; z: typeof y.a; z: typeof objA.a; z: typeof A.foo; diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js index 381205ff8c1..d5272844520 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.js +++ b/tests/baselines/reference/typeofOperatorWithStringType.js @@ -60,12 +60,19 @@ z: typeof M.n; //// [typeofOperatorWithStringType.js] // typeof operator on string type var STRING; -var STRING1 = ["", "abc"]; -function foo() { return "abc"; } +var STRING1 = [ + "", + "abc" +]; +function foo() { + return "abc"; +} var A = (function () { function A() { } - A.foo = function () { return ""; }; + A.foo = function () { + return ""; + }; return A; })(); var M; @@ -78,8 +85,16 @@ var ResultIsString1 = typeof STRING; var ResultIsString2 = typeof STRING1; // string type literal var ResultIsString3 = typeof ""; -var ResultIsString4 = typeof { x: "", y: "" }; -var ResultIsString5 = typeof { x: "", y: function (s) { return s; } }; +var ResultIsString4 = typeof { + x: "", + y: "" +}; +var ResultIsString5 = typeof { + x: "", + y: function (s) { + return s; + } +}; // string type expressions var ResultIsString6 = typeof objA.a; var ResultIsString7 = typeof M.n; @@ -104,7 +119,10 @@ var r; z: typeof STRING; x: typeof STRING1; r: typeof foo; -var y = { a: "", b: "" }; +var y = { + a: "", + b: "" +}; z: typeof y.a; z: typeof objA.a; z: typeof A.foo; diff --git a/tests/baselines/reference/typesWithDuplicateTypeParameters.js b/tests/baselines/reference/typesWithDuplicateTypeParameters.js index cc80d4d57b4..f81f59d5307 100644 --- a/tests/baselines/reference/typesWithDuplicateTypeParameters.js +++ b/tests/baselines/reference/typesWithDuplicateTypeParameters.js @@ -19,5 +19,7 @@ var C2 = (function () { } return C2; })(); -function f() { } -function f2() { } +function f() { +} +function f2() { +} diff --git a/tests/baselines/reference/typesWithOptionalProperty.js b/tests/baselines/reference/typesWithOptionalProperty.js index 7c791cd599f..2056fab37e3 100644 --- a/tests/baselines/reference/typesWithOptionalProperty.js +++ b/tests/baselines/reference/typesWithOptionalProperty.js @@ -33,9 +33,20 @@ a = i; //// [typesWithOptionalProperty.js] // basic uses of optional properties without errors var a; -var b = { foo: '' }; -var c = { foo: '', bar: 3 }; -var d = { foo: '', bar: 3, baz: function () { return ''; } }; +var b = { + foo: '' +}; +var c = { + foo: '', + bar: 3 +}; +var d = { + foo: '', + bar: 3, + baz: function () { + return ''; + } +}; var i; i = b; i = c; diff --git a/tests/baselines/reference/uncaughtCompilerError1.js b/tests/baselines/reference/uncaughtCompilerError1.js index a09f8c949d5..39369c8e899 100644 --- a/tests/baselines/reference/uncaughtCompilerError1.js +++ b/tests/baselines/reference/uncaughtCompilerError1.js @@ -18,10 +18,16 @@ function f() { function f() { if (lineTokens[index].trim() === '=' && index > 0 && token.type === '' && tokens[index - 1].type === 'attribute.name.html') { if (index === (tokens.length - 1)) { - return { appendText: '\"\"', advanceCount: 1 }; + return { + appendText: '\"\"', + advanceCount: 1 + }; } else if (tokens[index + 1].type !== 'attribute.value.html' && tokens[index + 1].type !== '') { - return { appendText: '\"\"', advanceCount: 1 }; + return { + appendText: '\"\"', + advanceCount: 1 + }; } return null; } diff --git a/tests/baselines/reference/undeclaredMethod.js b/tests/baselines/reference/undeclaredMethod.js index 2cef06cc593..b2795938632 100644 --- a/tests/baselines/reference/undeclaredMethod.js +++ b/tests/baselines/reference/undeclaredMethod.js @@ -19,7 +19,8 @@ var M; var C = (function () { function C() { } - C.prototype.salt = function () { }; + C.prototype.salt = function () { + }; return C; })(); M.C = C; diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js index 0764840cadf..e7e9b70ee7b 100644 --- a/tests/baselines/reference/undeclaredModuleError.js +++ b/tests/baselines/reference/undeclaredModuleError.js @@ -17,7 +17,8 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat //// [undeclaredModuleError.js] define(["require", "exports", 'fs'], function (require, exports, fs) { - function readdir(path, accept, callback) { } + function readdir(path, accept, callback) { + } function join() { var paths = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/undefinedArgumentInference.js b/tests/baselines/reference/undefinedArgumentInference.js index 2e7501f23f0..ad74e9ebeb4 100644 --- a/tests/baselines/reference/undefinedArgumentInference.js +++ b/tests/baselines/reference/undefinedArgumentInference.js @@ -12,4 +12,7 @@ var z1 = foo1({ x: undefined, y: undefined }); function foo1(f1) { return undefined; } -var z1 = foo1({ x: undefined, y: undefined }); +var z1 = foo1({ + x: undefined, + y: undefined +}); diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js index b1ef3e19edd..df87e7b0ad6 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js @@ -250,7 +250,8 @@ var D11 = (function (_super) { } return D11; })(Base); -function f() { } +function f() { +} var f; (function (f) { f.bar = 1; diff --git a/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js b/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js index f314f9ad111..61f248e56e7 100644 --- a/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js +++ b/tests/baselines/reference/undefinedSymbolReferencedInArrayLiteral1.js @@ -9,8 +9,18 @@ var functions = [function() { //// [undefinedSymbolReferencedInArrayLiteral1.js] -var tokens = [{ startIndex: deltaOffset }]; -var functions = [function () { - [1, 2, 3].NonexistantMethod(); +var tokens = [ + { + startIndex: deltaOffset + } +]; +var functions = [ + function () { + [ + 1, + 2, + 3 + ].NonexistantMethod(); anotherNonExistingMethod(); - }]; + } +]; diff --git a/tests/baselines/reference/underscoreTest1.js b/tests/baselines/reference/underscoreTest1.js index ddd5201b858..bc6bf9b615a 100644 --- a/tests/baselines/reference/underscoreTest1.js +++ b/tests/baselines/reference/underscoreTest1.js @@ -904,73 +904,428 @@ _.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'da //// [underscoreTest1_underscore.js] //// [underscoreTest1_underscoreTests.js] /// -_.each([1, 2, 3], function (num) { return alert(num.toString()); }); -_.each({ one: 1, two: 2, three: 3 }, function (value, key) { return alert(value.toString()); }); -_.map([1, 2, 3], function (num) { return num * 3; }); -_.map({ one: 1, two: 2, three: 3 }, function (value, key) { return value * 3; }); -var sum = _.reduce([1, 2, 3], function (memo, num) { return memo + num; }, 0); -var list = [[0, 1], [2, 3], [4, 5]]; -var flat = _.reduceRight(list, function (a, b) { return a.concat(b); }, []); -var even = _.find([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; }); -var evens = _.filter([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; }); -var listOfPlays = [{ title: "Cymbeline", author: "Shakespeare", year: 1611 }, { title: "The Tempest", author: "Shakespeare", year: 1611 }, { title: "Other", author: "Not Shakespeare", year: 2012 }]; -_.where(listOfPlays, { author: "Shakespeare", year: 1611 }); -var odds = _.reject([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; }); -_.all([true, 1, null, 'yes'], _.identity); -_.any([null, 0, 'yes', false]); -_.contains([1, 2, 3], 3); -_.invoke([[5, 1, 7], [3, 2, 1]], 'sort'); -var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'curly', age: 60 }]; +_.each([ + 1, + 2, + 3 +], function (num) { + return alert(num.toString()); +}); +_.each({ + one: 1, + two: 2, + three: 3 +}, function (value, key) { + return alert(value.toString()); +}); +_.map([ + 1, + 2, + 3 +], function (num) { + return num * 3; +}); +_.map({ + one: 1, + two: 2, + three: 3 +}, function (value, key) { + return value * 3; +}); +var sum = _.reduce([ + 1, + 2, + 3 +], function (memo, num) { + return memo + num; +}, 0); +var list = [ + [ + 0, + 1 + ], + [ + 2, + 3 + ], + [ + 4, + 5 + ] +]; +var flat = _.reduceRight(list, function (a, b) { + return a.concat(b); +}, []); +var even = _.find([ + 1, + 2, + 3, + 4, + 5, + 6 +], function (num) { + return num % 2 == 0; +}); +var evens = _.filter([ + 1, + 2, + 3, + 4, + 5, + 6 +], function (num) { + return num % 2 == 0; +}); +var listOfPlays = [ + { + title: "Cymbeline", + author: "Shakespeare", + year: 1611 + }, + { + title: "The Tempest", + author: "Shakespeare", + year: 1611 + }, + { + title: "Other", + author: "Not Shakespeare", + year: 2012 + } +]; +_.where(listOfPlays, { + author: "Shakespeare", + year: 1611 +}); +var odds = _.reject([ + 1, + 2, + 3, + 4, + 5, + 6 +], function (num) { + return num % 2 == 0; +}); +_.all([ + true, + 1, + null, + 'yes' +], _.identity); +_.any([ + null, + 0, + 'yes', + false +]); +_.contains([ + 1, + 2, + 3 +], 3); +_.invoke([ + [ + 5, + 1, + 7 + ], + [ + 3, + 2, + 1 + ] +], 'sort'); +var stooges = [ + { + name: 'moe', + age: 40 + }, + { + name: 'larry', + age: 50 + }, + { + name: 'curly', + age: 60 + } +]; _.pluck(stooges, 'name'); -_.max(stooges, function (stooge) { return stooge.age; }); -var numbers = [10, 5, 100, 2, 1000]; +_.max(stooges, function (stooge) { + return stooge.age; +}); +var numbers = [ + 10, + 5, + 100, + 2, + 1000 +]; _.min(numbers); -_.sortBy([1, 2, 3, 4, 5, 6], function (num) { return Math.sin(num); }); +_.sortBy([ + 1, + 2, + 3, + 4, + 5, + 6 +], function (num) { + return Math.sin(num); +}); // not sure how this is typechecking at all.. Math.floor(e) is number not string..? -_([1.3, 2.1, 2.4]).groupBy(function (e, i, list) { return Math.floor(e); }); -_.groupBy([1.3, 2.1, 2.4], function (num) { return Math.floor(num); }); -_.groupBy(['one', 'two', 'three'], 'length'); -_.countBy([1, 2, 3, 4, 5], function (num) { return num % 2 == 0 ? 'even' : 'odd'; }); -_.shuffle([1, 2, 3, 4, 5, 6]); +_([ + 1.3, + 2.1, + 2.4 +]).groupBy(function (e, i, list) { + return Math.floor(e); +}); +_.groupBy([ + 1.3, + 2.1, + 2.4 +], function (num) { + return Math.floor(num); +}); +_.groupBy([ + 'one', + 'two', + 'three' +], 'length'); +_.countBy([ + 1, + 2, + 3, + 4, + 5 +], function (num) { + return num % 2 == 0 ? 'even' : 'odd'; +}); +_.shuffle([ + 1, + 2, + 3, + 4, + 5, + 6 +]); // (function(){ return _.toArray(arguments).slice(1); })(1, 2, 3, 4); -_.size({ one: 1, two: 2, three: 3 }); +_.size({ + one: 1, + two: 2, + three: 3 +}); /////////////////////////////////////////////////////////////////////////////////////// -_.first([5, 4, 3, 2, 1]); -_.initial([5, 4, 3, 2, 1]); -_.last([5, 4, 3, 2, 1]); -_.rest([5, 4, 3, 2, 1]); -_.compact([0, 1, false, 2, '', 3]); -_.flatten([1, 2, 3, 4]); -_.flatten([1, [2]]); +_.first([ + 5, + 4, + 3, + 2, + 1 +]); +_.initial([ + 5, + 4, + 3, + 2, + 1 +]); +_.last([ + 5, + 4, + 3, + 2, + 1 +]); +_.rest([ + 5, + 4, + 3, + 2, + 1 +]); +_.compact([ + 0, + 1, + false, + 2, + '', + 3 +]); +_.flatten([ + 1, + 2, + 3, + 4 +]); +_.flatten([ + 1, + [ + 2 + ] +]); // typescript doesn't like the elements being different -_.flatten([1, [2], [3, [[4]]]]); -_.flatten([1, [2], [3, [[4]]]], true); -_.without([1, 2, 1, 0, 3, 1, 4], 0, 1); -_.union([1, 2, 3], [101, 2, 1, 10], [2, 1]); -_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]); -_.difference([1, 2, 3, 4, 5], [5, 2, 10]); -_.uniq([1, 2, 1, 3, 1, 4]); -_.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]); -_.object(['moe', 'larry', 'curly'], [30, 40, 50]); -_.object([['moe', 30], ['larry', 40], ['curly', 50]]); -_.indexOf([1, 2, 3], 2); -_.lastIndexOf([1, 2, 3, 1, 2, 3], 2); -_.sortedIndex([10, 20, 30, 40, 50], 35); +_.flatten([ + 1, + [ + 2 + ], + [ + 3, + [ + [ + 4 + ] + ] + ] +]); +_.flatten([ + 1, + [ + 2 + ], + [ + 3, + [ + [ + 4 + ] + ] + ] +], true); +_.without([ + 1, + 2, + 1, + 0, + 3, + 1, + 4 +], 0, 1); +_.union([ + 1, + 2, + 3 +], [ + 101, + 2, + 1, + 10 +], [ + 2, + 1 +]); +_.intersection([ + 1, + 2, + 3 +], [ + 101, + 2, + 1, + 10 +], [ + 2, + 1 +]); +_.difference([ + 1, + 2, + 3, + 4, + 5 +], [ + 5, + 2, + 10 +]); +_.uniq([ + 1, + 2, + 1, + 3, + 1, + 4 +]); +_.zip([ + 'moe', + 'larry', + 'curly' +], [ + 30, + 40, + 50 +], [ + true, + false, + false +]); +_.object([ + 'moe', + 'larry', + 'curly' +], [ + 30, + 40, + 50 +]); +_.object([ + [ + 'moe', + 30 + ], + [ + 'larry', + 40 + ], + [ + 'curly', + 50 + ] +]); +_.indexOf([ + 1, + 2, + 3 +], 2); +_.lastIndexOf([ + 1, + 2, + 3, + 1, + 2, + 3 +], 2); +_.sortedIndex([ + 10, + 20, + 30, + 40, + 50 +], 35); _.range(10); _.range(1, 11); _.range(0, 30, 5); _.range(0, 30, 5); _.range(0); /////////////////////////////////////////////////////////////////////////////////////// -var func = function (greeting) { return greeting + ': ' + this.name; }; +var func = function (greeting) { + return greeting + ': ' + this.name; +}; // need a second var otherwise typescript thinks func signature is the above func type, // instead of the newly returned _bind => func type. -var func2 = _.bind(func, { name: 'moe' }, 'hi'); +var func2 = _.bind(func, { + name: 'moe' +}, 'hi'); func2(); var buttonView = { label: 'underscore', - onClick: function () { alert('clicked: ' + this.label); }, - onHover: function () { alert('hovering: ' + this.label); } + onClick: function () { + alert('clicked: ' + this.label); + }, + onHover: function () { + alert('hovering: ' + this.label); + } }; _.bindAll(buttonView); $('#underscore_button').bind('click', buttonView.onClick); @@ -984,59 +1339,153 @@ var log = _.bind(function (message) { } }, Date); _.delay(log, 1000, 'logged later'); -_.defer(function () { alert('deferred'); }); -var updatePosition = function () { return alert('updating position...'); }; +_.defer(function () { + alert('deferred'); +}); +var updatePosition = function () { + return alert('updating position...'); +}; var throttled = _.throttle(updatePosition, 100); $(null).scroll(throttled); -var calculateLayout = function () { return alert('calculating layout...'); }; +var calculateLayout = function () { + return alert('calculating layout...'); +}; var lazyLayout = _.debounce(calculateLayout, 300); $(null).resize(lazyLayout); -var createApplication = function () { return alert('creating application...'); }; +var createApplication = function () { + return alert('creating application...'); +}; var initialize = _.once(createApplication); initialize(); initialize(); var notes; -var render = function () { return alert("rendering..."); }; +var render = function () { + return alert("rendering..."); +}; var renderNotes = _.after(notes.length, render); -_.each(notes, function (note) { return note.asyncSave({ success: renderNotes }); }); -var hello = function (name) { return "hello: " + name; }; -hello = _.wrap(hello, function (func, arg) { return "before, " + func(arg) + ", after"; }); +_.each(notes, function (note) { + return note.asyncSave({ + success: renderNotes + }); +}); +var hello = function (name) { + return "hello: " + name; +}; +hello = _.wrap(hello, function (func, arg) { + return "before, " + func(arg) + ", after"; +}); hello("moe"); -var greet = function (name) { return "hi: " + name; }; -var exclaim = function (statement) { return statement + "!"; }; +var greet = function (name) { + return "hi: " + name; +}; +var exclaim = function (statement) { + return statement + "!"; +}; var welcome = _.compose(exclaim, greet); welcome('moe'); /////////////////////////////////////////////////////////////////////////////////////// -_.keys({ one: 1, two: 2, three: 3 }); -_.values({ one: 1, two: 2, three: 3 }); -_.pairs({ one: 1, two: 2, three: 3 }); -_.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" }); +_.keys({ + one: 1, + two: 2, + three: 3 +}); +_.values({ + one: 1, + two: 2, + three: 3 +}); +_.pairs({ + one: 1, + two: 2, + three: 3 +}); +_.invert({ + Moe: "Moses", + Larry: "Louis", + Curly: "Jerome" +}); _.functions(_); -_.extend({ name: 'moe' }, { age: 50 }); -_.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age'); -_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid'); -var iceCream = { flavor: "chocolate" }; -_.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" }); -_.clone({ name: 'moe' }); -_.chain([1, 2, 3, 200]) - .filter(function (num) { return num % 2 == 0; }) - .tap(alert) - .map(function (num) { return num * num; }) - .value(); -_.has({ a: 1, b: 2, c: 3 }, "b"); -var moe = { name: 'moe', luckyNumbers: [13, 27, 34] }; -var clone = { name: 'moe', luckyNumbers: [13, 27, 34] }; +_.extend({ + name: 'moe' +}, { + age: 50 +}); +_.pick({ + name: 'moe', + age: 50, + userid: 'moe1' +}, 'name', 'age'); +_.omit({ + name: 'moe', + age: 50, + userid: 'moe1' +}, 'userid'); +var iceCream = { + flavor: "chocolate" +}; +_.defaults(iceCream, { + flavor: "vanilla", + sprinkles: "lots" +}); +_.clone({ + name: 'moe' +}); +_.chain([ + 1, + 2, + 3, + 200 +]).filter(function (num) { + return num % 2 == 0; +}).tap(alert).map(function (num) { + return num * num; +}).value(); +_.has({ + a: 1, + b: 2, + c: 3 +}, "b"); +var moe = { + name: 'moe', + luckyNumbers: [ + 13, + 27, + 34 + ] +}; +var clone = { + name: 'moe', + luckyNumbers: [ + 13, + 27, + 34 + ] +}; moe == clone; _.isEqual(moe, clone); -_.isEmpty([1, 2, 3]); +_.isEmpty([ + 1, + 2, + 3 +]); _.isEmpty({}); _.isElement($('body')[0]); -(function () { return _.isArray(arguments); })(); -_.isArray([1, 2, 3]); +(function () { + return _.isArray(arguments); +})(); +_.isArray([ + 1, + 2, + 3 +]); _.isObject({}); _.isObject(1); // (() => { return _.isArguments(arguments); })(1, 2, 3); -_.isArguments([1, 2, 3]); +_.isArguments([ + 1, + 2, + 3 +]); _.isFunction(alert); _.isString("moe"); _.isNumber(8.4 * 5); @@ -1053,10 +1502,14 @@ _.isNull(undefined); _.isUndefined(null.missingVariable); /////////////////////////////////////////////////////////////////////////////////////// var underscore = _.noConflict(); -var moe2 = { name: 'moe' }; +var moe2 = { + name: 'moe' +}; moe2 === _.identity(moe); var genie; -_.times(3, function (n) { genie.grantWishNumber(n); }); +_.times(3, function (n) { + genie.grantWishNumber(n); +}); _.random(0, 100); _.mixin({ capitalize: function (string) { @@ -1066,20 +1519,43 @@ _.mixin({ _("fabio").capitalize(); _.uniqueId('contact_'); _.escape('Curly, Larry & Moe'); -var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } }; +var object = { + cheese: 'crumpets', + stuff: function () { + return 'nonsense'; + } +}; _.result(object, 'cheese'); _.result(object, 'stuff'); var compiled = _.template("hello: <%= name %>"); -compiled({ name: 'moe' }); +compiled({ + name: 'moe' +}); var list2 = "<% _.each(people, function(name) { %>
  • <%= name %>
    • <% }); %>"; -_.template(list2, { people: ['moe', 'curly', 'larry'] }); +_.template(list2, { + people: [ + 'moe', + 'curly', + 'larry' + ] +}); var template = _.template("<%- value %>"); -template({ value: '